You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by je...@apache.org on 2001/08/01 23:20:06 UTC
cvs commit: apr-util/build apu-conf.m4
jerenkrantz 01/08/01 14:20:06
Modified: . CHANGES Makefile.in
build apu-conf.m4
Log:
Install our bundled Expat when we install APR-util.
I believe this will work when we don't use the bundled expat (i.e. we won't
install anything), but I don't have a unbundled Expat to try this with.
Revision Changes Path
1.25 +2 -0 apr-util/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/apr-util/CHANGES,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- CHANGES 2001/08/01 20:47:12 1.24
+++ CHANGES 2001/08/01 21:20:06 1.25
@@ -1,5 +1,7 @@
Changes with APR-util b1
+ *) Install Expat when installing APR-util. [Justin Erenkrantz]
+
*) Make APR-util configure script rely on APR. This removes the locally
generated copy of libtool and uses the one in APR. Fix up how we
call the expat configure script. Generate config.nice file.
1.39 +7 -1 apr-util/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apr-util/Makefile.in,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- Makefile.in 2001/08/01 13:55:26 1.38
+++ Makefile.in 2001/08/01 21:20:06 1.39
@@ -4,6 +4,7 @@
TARGET_LIB = libaprutil.la
TARGET_EXPORTS = aprutil.exports
+INSTALL_SUBDIRS = @APR_XML_DIR@
TARGETS = delete-lib $(TARGET_LIB) delete-exports $(TARGET_EXPORTS)
@@ -42,7 +43,12 @@
if [ ! -d $(libdir) ]; then \
@APR_SOURCE_DIR@/build/mkdir.sh $(libdir); \
fi; \
- $(LIBTOOL) --mode=install cp $(TARGET_LIB) $(libdir)
+ $(LIBTOOL) --mode=install cp $(TARGET_LIB) $(libdir); \
+ if test -n "$(INSTALL_SUBDIRS)"; then \
+ for i in $(INSTALL_SUBDIRS); do \
+ ( cd $$i ; $(MAKE) install ); \
+ done \
+ fi
$(TARGET_LIB):
@objects="`find $(SUBDIRS) -name expat -prune -o -name '*.@so_ext@' -print`"; \
1.12 +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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- apu-conf.m4 2001/08/01 20:47:13 1.11
+++ apu-conf.m4 2001/08/01 21:20:06 1.12
@@ -404,7 +404,9 @@
APR_XML_SUBDIRS="`echo $bundled_subdir | sed -e 's%xml/%%'`"
fi
fi
+APR_XML_DIR=$bundled_subdir
AC_SUBST(APR_XML_SUBDIRS)
+AC_SUBST(APR_XML_DIR)
APR_ADDTO(INCLUDES, [-I$expat_include_dir])
APR_ADDTO(LIBS, [$expat_libs])