trawick 2003/05/09 03:55:01
Modified: . CHANGES
build apu-conf.m4
Log:
Fix a problem preventing the use of the bundled Expat when APR-util
is built stand-alone.
Revision Changes Path
1.111 +3 -0 apr-util/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/apr-util/CHANGES,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- CHANGES 28 Apr 2003 12:10:41 -0000 1.110
+++ CHANGES 9 May 2003 10:55:00 -0000 1.111
@@ -1,5 +1,8 @@
Changes with APR-util 0.9.4
+ *) Fix a problem preventing the use of the bundled Expat when APR-util
+ is built stand-alone. [Jeff Trawick]
+
*) Use the same compiler and preprocessor for the APR-util config tests
which were used by APR. The user can override this via CC and CPP.
This was done all along for the actual build, but not necessarily
1.54 +1 -1 apr-util/build/apu-conf.m4
Index: apu-conf.m4
===================================================================
RCS file: /home/cvs/apr-util/build/apu-conf.m4,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- apu-conf.m4 5 Mar 2003 22:44:39 -0000 1.53
+++ apu-conf.m4 9 May 2003 10:55:01 -0000 1.54
@@ -635,7 +635,7 @@
APR_XML_SUBDIRS="`echo $bundled_subdir | sed -e 's%xml/%%'`"
APR_ADDTO(APRUTIL_EXPORT_LIBS, [$expat_libtool])
else
-if test "$expat_include_dir" = "$srcdir/xml/expat/include" -o
"$expat_include_dir" = "$srcdir/xml/expat/lib"; then
+if test "$expat_include_dir" = "$abs_srcdir/xml/expat/include" -o
"$expat_include_dir" = "$abs_srcdir/xml/expat/lib"; then
dnl This is a bit of a hack. This only works because we know that
dnl we are working with the bundled version of the software.
bundled_subdir="xml/expat"
