Make it possible to avoid the import of expat_config.h. This makes it

easier to compile Expat without the autoconf support.
This closes SF patch #458907.

expat/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?

expat/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"

expat/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"

expat/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"

expat/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

expat/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

expat/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"