[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

forwarded patch for neon/macros/neon-xml-parser.m4

From: Karl Fogel <kfogel_at_floss>
Date: 2002-04-24 21:42:14 CEST

Joe et al, you may have seen this patch on the Subversion list
already. In case not, here's a formal submission. We're hoping it
(or something like it) can be in the next release of Neon, and that
that release will be soon :-). A warning: it may need Autoconf 2.52d
or higher; I used 2.53 myself.

To Subversion people using this patch: don't forget to run
"neon/autogen.sh; neon/configure; etc" first before building
Subversion, until the next Neon comes out.

This applies to the head of neon CVS. The patch is Brane's, I only
wrote the log message:

   Wed Apr 24 14:19:12 2002 Branko Cibej

   * neon/macros/neon-xml-parser.m4 (NEON_XML_EXTERNAL_EXPAT): Test
     for xmlparse.h and expat.h separately.

--- neon-xml-parser.m4.orig Sun Jan 6 15:35:35 2002
+++ neon-xml-parser.m4 Wed Apr 24 13:48:23 2002
@@ -35,13 +35,21 @@
 # FIXME: needs to take second arg for VPATH builds
 
 AC_DEFUN([NEON_XML_EXTERNAL_EXPAT], [
+ne_found_hdr=no
 case $neon_expat_dir in
 */libexpat.la)
         neon_using_libtool_expat=yes
         neon_expat_dir=`echo $neon_expat_dir | sed 's:/libexpat.la$::'`
 esac
 if test -r "$neon_expat_dir/xmlparse.h"; then
+ ne_found_hdr=yes
         AC_DEFINE(HAVE_XMLPARSE_H, 1, [Define if you have xmlparse.h])
+fi
+if test -r "$neon_expat_dir/expat.h"; then
+ ne_found_hdr=yes
+ AC_DEFINE(HAVE_EXPAT_H, 1, [Define if you have expat.h])
+fi
+if test "$ne_found_hdr" = "yes"; then
         AC_DEFINE(HAVE_EXPAT, 1, [Define if you have expat])
         CFLAGS="$CFLAGS -I$neon_expat_dir"
         dnl add the library (if it isn't a libtool library)

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Apr 25 01:13:44 2002

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.