jerenkrantz 02/03/09 11:34:44
Modified: flood CHANGES configure.in
flood/build config_vars.mk.in
Log:
Sync up with recent changes to APR and its libtool.
(This fixes a problem we've seen with how flood can get to APR's libtool
without having libtool.m4 files all over the place.)
Revision Changes Path
1.29 +2 -0 httpd-test/flood/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/httpd-test/flood/CHANGES,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- CHANGES 17 Jan 2002 01:07:46 -0000 1.28
+++ CHANGES 9 Mar 2002 19:34:44 -0000 1.29
@@ -1,5 +1,7 @@
Changes since milestone-03:
+* Properly detect and use APR's libtool. [Justin Erenkrantz]
+
* Reworked build system to ease integration with APR/apr-util.
[Justin Erenkrantz]
1.19 +2 -7 httpd-test/flood/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/httpd-test/flood/configure.in,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- configure.in 27 Feb 2002 04:44:50 -0000 1.18
+++ configure.in 9 Mar 2002 19:34:44 -0000 1.19
@@ -108,14 +108,9 @@
CFLAGS="$CFLAGS `$apr_config --cflags`"
CPPFLAGS="$CPPFLAGS `$apr_config --cppflags --includes`"
LDFLAGS="$LDFLAGS `$apr_config --ldflags`"
+LIBTOOL="`$apr_config --apr-libtool`"
LIBTOOL_LIBS="$LIBTOOL_LIBS `$apr_config --link-libtool --libs`"
-if test -x "`$apr_config --prefix`/build/libtool"; then
- LIBTOOL_PATH="`$apr_config --prefix`/build/libtool"
-else
- AC_ERROR([flood requires a libtool-enabled APR.])
-fi
-
APR_FIND_APU(./apr-util)
if test "$apu_found" = "no"; then
@@ -160,7 +155,7 @@
AC_SUBST(RANDFILE)
AC_SUBST(CAPATH)
AC_SUBST(FLOOD_SUBDIRS)
-AC_SUBST(LIBTOOL_PATH)
+AC_SUBST(LIBTOOL)
AC_SUBST(LIBTOOL_LDFLAGS)
AC_SUBST(LIBTOOL_LIBS)
AC_SUBST(prngrand)
1.2 +1 -1 httpd-test/flood/build/config_vars.mk.in
Index: config_vars.mk.in
===================================================================
RCS file: /home/cvs/httpd-test/flood/build/config_vars.mk.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- config_vars.mk.in 17 Jan 2002 01:06:27 -0000 1.1
+++ config_vars.mk.in 9 Mar 2002 19:34:44 -0000 1.2
@@ -4,6 +4,6 @@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@ @LIBTOOL_LDFLAGS@
[EMAIL PROTECTED]@ @LIBTOOL_LIBS@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
