[Expat-checkins] expat MANIFEST,1.10,1.11 Makefile.in,1.29,1.30 acconfig.h,1.1,1.2 configure.in,1.27,1.28
gstein@users.sourceforge.net
gstein@users.sourceforge.net
Fri May 17 14:31:02 2002
Update of /cvsroot/expat/expat
In directory usw-pr-cvs1:/tmp/cvs-serv21322
Modified Files:
MANIFEST Makefile.in acconfig.h configure.in
Log Message:
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
Index: MANIFEST
===================================================================
RCS file: /cvsroot/expat/expat/MANIFEST,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** MANIFEST 16 Apr 2002 03:24:48 -0000 1.10
--- MANIFEST 17 May 2002 21:30:06 -0000 1.11
***************
*** 4,10 ****
Makefile.in
README
- config.h.in
configure
configure.in
conftools/PrintPath
conftools/ac_c_bigendian_cross.m4
--- 4,10 ----
Makefile.in
README
configure
configure.in
+ expat_config.h.in
conftools/PrintPath
conftools/ac_c_bigendian_cross.m4
Index: Makefile.in
===================================================================
RCS file: /cvsroot/expat/expat/Makefile.in,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** Makefile.in 17 May 2002 14:12:25 -0000 1.29
--- Makefile.in 17 May 2002 21:30:06 -0000 1.30
***************
*** 67,75 ****
distclean: clean
! rm -f config.h config.status config.log config.cache libtool
rm -f Makefile
extraclean: distclean
! rm -f config.h.in configure
rm -f conftools/config.guess conftools/config.sub
rm -f conftools/ltconfig conftools/ltmain.sh
--- 67,75 ----
distclean: clean
! rm -f expat_config.h config.status config.log config.cache libtool
rm -f Makefile
extraclean: distclean
! rm -f expat_config.h.in configure
rm -f conftools/config.guess conftools/config.sub
rm -f conftools/ltconfig conftools/ltmain.sh
Index: acconfig.h
===================================================================
RCS file: /cvsroot/expat/expat/acconfig.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** acconfig.h 10 Mar 2001 15:41:49 -0000 1.1
--- acconfig.h 17 May 2002 21:30:06 -0000 1.2
***************
*** 6,23 ****
#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
--- 6,7 ----
Index: configure.in
===================================================================
RCS file: /cvsroot/expat/expat/configure.in,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** configure.in 20 Apr 2002 21:14:48 -0000 1.27
--- configure.in 17 May 2002 21:30:06 -0000 1.28
***************
*** 11,14 ****
--- 11,17 ----
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)
***************
*** 30,34 ****
LIBAGE=1
! AC_CONFIG_HEADER(config.h)
sinclude(conftools/libtool.m4)
--- 33,37 ----
LIBAGE=1
! AC_CONFIG_HEADER(expat_config.h)
sinclude(conftools/libtool.m4)
***************
*** 87,90 ****
--- 90,101 ----
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)