gstein 01/03/09 06:37:24
Modified: build apu-conf.m4
xml Makefile.in
Log:
apr-util/xml/ should recurse into xml/expat only if we choose to use it. If
we use one that has been installed on the system, then we don't want to
recurse into our bundled Expat.
Revision Changes Path
1.6 +2 -0 apr-util/build/apu-conf.m4
Index: apu-conf.m4
===================================================================
RCS file: /home/cvs/apr-util/build/apu-conf.m4,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -u -r1.5 -r1.6
--- apu-conf.m4 2001/02/28 15:18:37 1.5
+++ apu-conf.m4 2001/03/09 14:37:20 1.6
@@ -372,7 +372,9 @@
APU_SUBDIR_CONFIG($bundled_subdir)
expat_include_dir=$srcdir/$bundled_subdir/lib
expat_libs=$top_builddir/$bundled_subdir/lib/libexpat.la
+ APR_XML_SUBDIRS="`echo $bundled_subdir | sed -e 's%xml/%%'`"
fi
+AC_SUBST(APR_XML_SUBDIRS)
INCLUDES="$INCLUDES -I$expat_include_dir"
LIBS="$LIBS $expat_libs"
1.6 +1 -1 apr-util/xml/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apr-util/xml/Makefile.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -u -r1.5 -r1.6
--- Makefile.in 2001/03/08 18:30:20 1.5
+++ Makefile.in 2001/03/09 14:37:23 1.6
@@ -1,7 +1,7 @@
TARGETS = apr_xml.lo
-SUBDIRS=expat
+SUBDIRS = @APR_XML_SUBDIRS@
# bring in rules.mk for standard functionality
@INCLUDE_RULES@
