Return-Path: 
 <test-cvs-return-689-apmail-httpd-test-cvs-archive=httpd.apache.org@httpd.apache.org>
Delivered-To: apmail-httpd-test-cvs-archive@httpd.apache.org
Received: (qmail 41889 invoked by uid 500); 3 Dec 2001 22:17:00 -0000
Mailing-List: contact test-cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: test-dev@httpd.apache.org
list-help: <mailto:test-cvs-help@httpd.apache.org>
list-unsubscribe: <mailto:test-cvs-unsubscribe@httpd.apache.org>
list-post: <mailto:test-cvs@httpd.apache.org>
Delivered-To: mailing list test-cvs@httpd.apache.org
Received: (qmail 41878 invoked from network); 3 Dec 2001 22:17:00 -0000
Date: 3 Dec 2001 21:58:43 -0000
Message-ID: <20011203215843.63737.qmail@icarus.apache.org>
From: jerenkrantz@apache.org
To: httpd-test-cvs@apache.org
Subject: cvs commit: httpd-test/flood Makefile.in configure.in
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N

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)