jerenkrantz 01/12/03 13:58:43
Modified: flood Makefile.in configure.in
Log:
Fix to source in the apr-util variables. (The DBM changes force us to do
this in order to link apr-util.)
FWIW, I think export_vars.sh is completely bogus right now. It contains
the full source path to the expat library. Bad, bad, bad, bad. It needs
to be relativized somehow.
Revision Changes Path
1.10 +1 -1 httpd-test/flood/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/httpd-test/flood/Makefile.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Makefile.in 2001/11/20 23:08:07 1.9
+++ Makefile.in 2001/12/03 21:58:43 1.10
@@ -12,7 +12,7 @@
PROGRAM_LDADD = $(EXTRA_LDFLAGS) $(PROGRAM_DEPENDENCIES) $(EXTRA_LIBS)
PROGRAM_DEPENDENCIES = @APU_SOURCE@/libaprutil.la \
- @APR_SOURCE@/libapr.la @APU_SOURCE@/xml/expat/lib/libexpat.la
+ @APR_SOURCE@/libapr.la
include $(top_srcdir)/build/rules.mk
1.13 +2 -1 httpd-test/flood/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/httpd-test/flood/configure.in,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- configure.in 2001/11/20 23:09:12 1.12
+++ configure.in 2001/12/03 21:58:43 1.13
@@ -84,6 +84,7 @@
[APU_SOURCE="$HTTPD_SOURCE/srclib/apr-util"])
. $APR_SOURCE/APRVARS
+. $APU_SOURCE/export_vars.sh
AC_CHECK_FUNC(strtoll, hasstrtoll="1", hasstrtoll="0")
AC_CHECK_FUNC(strtoq, hasstrtoq="1", hasstrtoq="0")
@@ -112,7 +113,7 @@
EXTRA_CFLAGS="$CFLAGS $EXTRA_CFLAGS"
EXTRA_CPPFLAGS="$CPPFLAGS $EXTRA_CPPFLAGS"
EXTRA_LDFLAGS="$LDFLAGS $EXTRA_LDFLAGS"
-EXTRA_LIBS="$LIBS $EXTRA_LIBS"
+EXTRA_LIBS="$LIBS $EXTRA_LIBS $APRUTIL_EXPORT_LIBS"
AC_SUBST(OPENSSL_PREFIX)
AC_SUBST(RANDFILE)
