Take care of expat.h being unavailable

diff --git a/configure.in b/configure.in
index e92c7d3..0c738ce 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
 dnl Zebra, Index Data Aps, 1995-2004
 dnl Zebra, Index Data Aps, 1995-2004

-dnl $Id: configure.in,v 1.101 2004-09-27 10:44:47 adam Exp $
+dnl $Id: configure.in,v 1.102 2004-09-28 08:44:48 adam Exp $

 dnl
 AC_INIT(include/idzebra/version.h)
 AM_INIT_AUTOMAKE(idzebra,1.4.0)
 dnl
 AC_INIT(include/idzebra/version.h)
 AM_INIT_AUTOMAKE(idzebra,1.4.0)

@@ -263,7 +263,12 @@ ZEBRA_MODULE(grs-sgml,static,[  --enable-mod-grs-sgml   Simple SGML/XML filter])
 ZEBRA_MODULE(grs-regx,shared,[  --enable-mod-grs-regx   REGX/TCL filter])
 ZEBRA_MODULE(grs-marc,shared,[  --enable-mod-grs-marc   MARC filter])
 ZEBRA_MODULE(grs-danbib,shared,[  --enable-mod-grs-danbib DanBib filter (DBC)])
 ZEBRA_MODULE(grs-regx,shared,[  --enable-mod-grs-regx   REGX/TCL filter])
 ZEBRA_MODULE(grs-marc,shared,[  --enable-mod-grs-marc   MARC filter])
 ZEBRA_MODULE(grs-danbib,shared,[  --enable-mod-grs-danbib DanBib filter (DBC)])

-ZEBRA_MODULE(grs-xml,shared, [  --enable-mod-grs-xml    XML filter (Expat based)])
+if test "$ac_cv_header_expat_h" = "yes"; then
+   def="shared"
+else
+   def="no"
+fi
+ZEBRA_MODULE(grs-xml,[$def], [  --enable-mod-grs-xml    XML filter (Expat based)])

 ZEBRA_MODULE(grs-perl,no,    [  --enable-mod-grs-perl   Perl filter])
 PERL_XS_INIT="NULL"
 PERL_XS_INIT_INCLUDE=''
 ZEBRA_MODULE(grs-perl,no,    [  --enable-mod-grs-perl   Perl filter])
 PERL_XS_INIT="NULL"
 PERL_XS_INIT_INCLUDE=''

diff --git a/recctrl/recctrl.c b/recctrl/recctrl.c
index 2870cf3..ddbfc64 100644 (file)
--- a/recctrl/recctrl.c
+++ b/recctrl/recctrl.c
@@ -1,4 +1,4 @@
-/* $Id: recctrl.c,v 1.7 2004-09-27 10:44:50 adam Exp $
+/* $Id: recctrl.c,v 1.8 2004-09-28 08:44:48 adam Exp $

    Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
    Index Data Aps
 
    Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
    Index Data Aps
 

@@ -64,9 +64,11 @@ RecTypeClass recTypeClass_create (Res res, NMEM nmem)
     recTypeClass_add (&rts, idzebra_filter_text, nmem, 0);
 #endif
 #ifdef IDZEBRA_STATIC_GRS_XML
     recTypeClass_add (&rts, idzebra_filter_text, nmem, 0);
 #endif
 #ifdef IDZEBRA_STATIC_GRS_XML

+#if HAVE_EXPAT_H

     extern RecType idzebra_filter_grs_xml[];
     recTypeClass_add (&rts, idzebra_filter_grs_xml, nmem, 0);
 #endif
     extern RecType idzebra_filter_grs_xml[];
     recTypeClass_add (&rts, idzebra_filter_grs_xml, nmem, 0);
 #endif

+#endif

 #ifdef IDZEBRA_STATIC_GRS_REGX
     extern RecType idzebra_filter_grs_regx[];
     recTypeClass_add (&rts, idzebra_filter_grs_regx, nmem, 0);
 #ifdef IDZEBRA_STATIC_GRS_REGX
     extern RecType idzebra_filter_grs_regx[];
     recTypeClass_add (&rts, idzebra_filter_grs_regx, nmem, 0);