summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.in2
-rw-r--r--lib/xmlparse.c2
-rw-r--r--lib/xmlrole.c2
-rw-r--r--lib/xmltok.c2
-rw-r--r--tests/chardata.c2
-rw-r--r--tests/runtests.c3
-rwxr-xr-xxmlwf/xmlfile.c2
7 files changed, 14 insertions, 1 deletions
diff --git a/Makefile.in b/Makefile.in
index 4c78a6c..5330f93 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -102,7 +102,7 @@ LIBTOOL = @LIBTOOL@
INCLUDES = -I$(srcdir)/lib -I.
LDFLAGS = @LDFLAGS@
CPPFLAGS = @CPPFLAGS@
-CFLAGS = @CFLAGS@
+CFLAGS = @CFLAGS@ -DHAVE_EXPAT_CONFIG_H
VSNFLAG = -version-info @LIBCURRENT@:@LIBREVISION@:@LIBAGE@
### autoconf this?
diff --git a/lib/xmlparse.c b/lib/xmlparse.c
index d1839c6..6b056c1 100644
--- a/lib/xmlparse.c
+++ b/lib/xmlparse.c
@@ -12,7 +12,9 @@
#elif defined(MACOS_CLASSIC)
#include "macconfig.h"
#else
+#ifdef HAVE_EXPAT_CONFIG_H
#include <expat_config.h>
+#endif
#endif /* ndef COMPILED_FROM_DSP */
#include "expat.h"
diff --git a/lib/xmlrole.c b/lib/xmlrole.c
index 8ef185d..83c0d71 100644
--- a/lib/xmlrole.c
+++ b/lib/xmlrole.c
@@ -7,7 +7,9 @@
#elif defined(MACOS_CLASSIC)
#include "macconfig.h"
#else
+#ifdef HAVE_EXPAT_CONFIG_H
#include <expat_config.h>
+#endif
#endif /* ndef COMPILED_FROM_DSP */
#include "internal.h"
diff --git a/lib/xmltok.c b/lib/xmltok.c
index 5f101af..962df0e 100644
--- a/lib/xmltok.c
+++ b/lib/xmltok.c
@@ -7,7 +7,9 @@
#elif defined(MACOS_CLASSIC)
#include "macconfig.h"
#else
+#ifdef HAVE_EXPAT_CONFIG_H
#include <expat_config.h>
+#endif
#endif /* ndef COMPILED_FROM_DSP */
#include "internal.h"
diff --git a/tests/chardata.c b/tests/chardata.c
index 4351f4c..5736afc 100644
--- a/tests/chardata.c
+++ b/tests/chardata.c
@@ -4,7 +4,9 @@
chardata.c
*/
+#ifdef HAVE_EXPAT_CONFIG_H
#include <expat_config.h>
+#endif
#ifdef HAVE_CHECK_H
#include <check.h>
#else
diff --git a/tests/runtests.c b/tests/runtests.c
index f5bc3d1..ac968a9 100644
--- a/tests/runtests.c
+++ b/tests/runtests.c
@@ -4,7 +4,10 @@
runtest.c : run the Expat test suite
*/
+#ifdef HAVE_EXPAT_CONFIG_H
#include <expat_config.h>
+#endif
+
#ifdef HAVE_CHECK_H
#include <check.h>
#else
diff --git a/xmlwf/xmlfile.c b/xmlwf/xmlfile.c
index 690be52..6cb0715 100755
--- a/xmlwf/xmlfile.c
+++ b/xmlwf/xmlfile.c
@@ -10,8 +10,10 @@
#ifdef COMPILED_FROM_DSP
#include "winconfig.h"
#else
+#ifdef HAVE_EXPAT_CONFIG_H
#include "expat_config.h"
#endif
+#endif
#include "expat.h"
#include "xmlfile.h"
#include "xmltchar.h"