Various configuration fixes, focused primarily around expat_config.h
(which used to be called config.h)
* configure.in:
- change the header name to expat_config.h to prevent any possible
conflict with some other packages 'config.h'
- add a prerequisite on autoconf 2.50 or newer
- shift some acconfig.h values to AC_DEFINE() values
* MANIFEST:
- rename config.h.in to expat_config.h.in
* Makefile.in:
- clean out expat_config.h* instead of config.h*
* acconfig.h:
- remove the XML_NS, XML_DTD, and XML_CONTEXT_BYTES symbols; they
are now defined directly by configure.in
- shift the memmove() compatibility to xmlparse.c, its only consumer
- remove the @BOTTOM@ part since there are no more values to put at
the bottom of expat_config.h.in via acconfig.h
* xmlparse.c:
- switch from config.h to expat_config.h
- insert macro to define memmove() if it isn't available, but
bcopy() is available. also, changed one branch to #error rather
than insert bogus code.
* xmlrole.c:
- tweak the copyright header, per Fred-ism
- remove the unused RCSId[] variable (no other file has these)
- switch from config.h to expat_config.h
* xmltok.c:
- switch from config.h to expat_config.h
diff --git a/expat/MANIFEST b/expat/MANIFEST
index 7e52184..5107dbd 100644
--- a/expat/MANIFEST
+++ b/expat/MANIFEST
@@ -3,9 +3,9 @@
MANIFEST
Makefile.in
README
-config.h.in
configure
configure.in
+expat_config.h.in
conftools/PrintPath
conftools/ac_c_bigendian_cross.m4
conftools/config.guess
diff --git a/expat/Makefile.in b/expat/Makefile.in
index 2c5765e..c6061a6 100644
--- a/expat/Makefile.in
+++ b/expat/Makefile.in
@@ -66,11 +66,11 @@
find . -name core | xargs rm -f
distclean: clean
- rm -f config.h config.status config.log config.cache libtool
+ rm -f expat_config.h config.status config.log config.cache libtool
rm -f Makefile
extraclean: distclean
- rm -f config.h.in configure
+ rm -f expat_config.h.in configure
rm -f conftools/config.guess conftools/config.sub
rm -f conftools/ltconfig conftools/ltmain.sh
diff --git a/expat/acconfig.h b/expat/acconfig.h
index 1283ad6..ce186c4 100644
--- a/expat/acconfig.h
+++ b/expat/acconfig.h
@@ -5,19 +5,3 @@
#else
#define XML_BYTE_ORDER 12
#endif
-
-@BOTTOM@
-
-#define XML_NS
-#define XML_DTD
-
-#define XML_CONTEXT_BYTES 1024
-
-#ifndef HAVE_MEMMOVE
-#ifdef HAVE_BCOPY
-#define memmove(d,s,l) bcopy((s),(d),(l))
-#else
-#define memmove(d,s,l) ;punting on memmove;
-#endif
-
-#endif
diff --git a/expat/configure.in b/expat/configure.in
index 12ab407..1cd9e7a 100644
--- a/expat/configure.in
+++ b/expat/configure.in
@@ -10,6 +10,9 @@
dnl in the file COPYING that comes with this distribution.
dnl
+dnl Ensure that subversion is configured with autoconf 2.50 or newer
+AC_PREREQ(2.50)
+
AC_INIT(Makefile.in)
AC_CONFIG_AUX_DIR(conftools)
@@ -29,7 +32,7 @@
LIBREVISION=0
LIBAGE=1
-AC_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADER(expat_config.h)
sinclude(conftools/libtool.m4)
sinclude(conftools/ac_c_bigendian_cross.m4)
@@ -87,6 +90,14 @@
AC_CHECK_FUNCS(memmove bcopy)
+dnl some basic configuration
+AC_DEFINE([XML_NS], 1,
+ [Define to make XML Namespaces functionality available.])
+AC_DEFINE([XML_DTD], 1,
+ [Define to make parameter entity parsing functionality available.])
+AC_DEFINE([XML_CONTEXT_BYTES], 1024,
+ [Define to specify how much context to retain around the current parse point.])
+
AC_OUTPUT(Makefile)
abs_srcdir="`cd $srcdir && pwd`"
diff --git a/expat/lib/xmlparse.c b/expat/lib/xmlparse.c
index 16f4921..23b48a6 100644
--- a/expat/lib/xmlparse.c
+++ b/expat/lib/xmlparse.c
@@ -1,6 +1,5 @@
-/*
-Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd
-See the file COPYING for copying permission.
+/* Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd
+ See the file COPYING for copying permission.
*/
#ifdef COMPILED_FROM_DSP
@@ -9,7 +8,7 @@
# include "expat.h"
# undef XMLPARSEAPI
#else
-#include <config.h>
+#include <expat_config.h>
#ifdef __declspec
# define XMLPARSEAPI(type) __declspec(dllexport) type __cdecl
@@ -74,6 +73,15 @@
/* Round up n to be a multiple of sz, where sz is a power of 2. */
#define ROUND_UP(n, sz) (((n) + ((sz) - 1)) & ~((sz) - 1))
+/* Handle the case where memmove() doesn't exist. */
+#ifndef HAVE_MEMMOVE
+#ifdef HAVE_BCOPY
+#define memmove(d,s,l) bcopy((s),(d),(l))
+#else
+#error memmove does not exist on this platform, nor is a substitute available
+#endif /* HAVE_BCOPY */
+#endif /* HAVE_MEMMOVE */
+
#include "xmltok.h"
#include "xmlrole.h"
diff --git a/expat/lib/xmlrole.c b/expat/lib/xmlrole.c
index c263b89..55cf3ae 100644
--- a/expat/lib/xmlrole.c
+++ b/expat/lib/xmlrole.c
@@ -1,15 +1,11 @@
-/*
-Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
-See the file COPYING for copying permission.
+/* Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
+ See the file COPYING for copying permission.
*/
-static char RCSId[]
- = "$Header: /cvsroot/expat/expat/lib/xmlrole.c,v 1.4 2000/09/29 14:57:45 coopercc Exp $";
-
#ifdef COMPILED_FROM_DSP
# include "winconfig.h"
#else
-# include <config.h>
+# include <expat_config.h>
#endif /* ndef COMPILED_FROM_DSP */
#include "xmlrole.h"
diff --git a/expat/lib/xmltok.c b/expat/lib/xmltok.c
index 9995556..5d63236 100644
--- a/expat/lib/xmltok.c
+++ b/expat/lib/xmltok.c
@@ -5,7 +5,7 @@
#ifdef COMPILED_FROM_DSP
# include "winconfig.h"
#else
-# include <config.h>
+# include <expat_config.h>
#endif /* ndef COMPILED_FROM_DSP */
#include "xmltok.h"
