You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Karl Fogel <kf...@floss> on 2002/04/24 19:42:14 UTC

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

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

Re: [neon] forwarded patch for neon/macros/neon-xml-parser.m4

Posted by Karl Fogel <kf...@newton.ch.collab.net>.
Joe Orton <jo...@manyfish.co.uk> writes:
> Thanks for sending it across, I released 0.19.4 with this change.

Wow.  I dreamed you were doing that, then I woke up and you really had!

Thanks,
-K

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

Re: [neon] forwarded patch for neon/macros/neon-xml-parser.m4

Posted by Joe Orton <jo...@manyfish.co.uk>.
On Wed, Apr 24, 2002 at 02:42:14PM -0500, Karl Fogel wrote:
> 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.

Thanks for sending it across, I released 0.19.4 with this change.

Regards,

joe

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org