httpd-test-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jerenkra...@apache.org
Subject cvs commit: httpd-test/flood/build config_vars.mk.in rules.mk.in
Date Mon, 02 Aug 2004 23:55:38 GMT
jerenkrantz    2004/08/02 16:55:38

  Modified:    flood    CHANGES Makefile.in configure.in
               flood/build config_vars.mk.in rules.mk.in
  Log:
  Allow VPATH builds; also use APR's bundled mkdir.sh instead of one we bundle.
  
  Revision  Changes    Path
  1.53      +4 -0      httpd-test/flood/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-test/flood/CHANGES,v
  retrieving revision 1.52
  retrieving revision 1.53
  diff -u -u -r1.52 -r1.53
  --- CHANGES	18 Mar 2004 18:31:11 -0000	1.52
  +++ CHANGES	2 Aug 2004 23:55:38 -0000	1.53
  @@ -1,5 +1,9 @@
   Changes since 1.0:
   
  +* Use APR's bundled mkdir script.  [Justin Erenkrantz]
  +
  +* Support VPATH builds again.  [Justin Erenkrantz]
  +
   * Added the "content-type" parameter for URLs using the POST method.
     [Philippe Marzouk <phil@ozigo.org>]
   
  
  
  
  1.14      +2 -2      httpd-test/flood/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/httpd-test/flood/Makefile.in,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -u -r1.13 -r1.14
  --- Makefile.in	11 Sep 2002 14:45:23 -0000	1.13
  +++ Makefile.in	2 Aug 2004 23:55:38 -0000	1.14
  @@ -16,9 +16,9 @@
   
   SUBDIRS = @FLOOD_SUBDIRS@
   
  -include $(top_srcdir)/build/rules.mk
  +include $(top_builddir)/build/rules.mk
   
  -INCLUDES=-I$(srcdir)
  +INCLUDES=-I$(srcdir) -I$(builddir)
   
   all: $(SUBDIRS) $(PROGRAMS)
   FLOOD_OBJS = flood_round_robin.lo flood_profile.lo flood_config.lo \
  
  
  
  1.29      +5 -0      httpd-test/flood/configure.in
  
  Index: configure.in
  ===================================================================
  RCS file: /home/cvs/httpd-test/flood/configure.in,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -u -r1.28 -r1.29
  --- configure.in	6 Sep 2003 03:06:11 -0000	1.28
  +++ configure.in	2 Aug 2004 23:55:38 -0000	1.29
  @@ -125,6 +125,7 @@
   LDFLAGS="$LDFLAGS `$apr_config --ldflags`"
   LIBTOOL="`$apr_config --apr-libtool`"
   LIBTOOL_LIBS="$LIBTOOL_LIBS `$apr_config --link-libtool --libs`"
  +APR_CONFIG="$apr_config"
   
   APR_FIND_APU(./apr-util)
   
  @@ -142,6 +143,7 @@
   LIBTOOL_LDFLAGS="$LIBTOOL_LDFLAGS `$apu_config --ldflags`"
   dnl Since libaprutil relies on libapr, it *must* appear before -lapr.
   LIBTOOL_LIBS="`$apu_config --link-libtool --libs` $LIBTOOL_LIBS"
  +APU_CONFIG="$apu_config"
   
   AC_CHECK_FUNC(strtoll, hasstrtoll="1", hasstrtoll="0")
   AC_CHECK_FUNC(strtoq, hasstrtoq="1", hasstrtoq="0")
  @@ -184,6 +186,9 @@
   AC_SUBST(flood_has_openssl)
   AC_SUBST(flood_has_devrand)
   AC_SUBST(abs_builddir)
  +
  +AC_SUBST(APR_CONFIG)
  +AC_SUBST(APU_CONFIG)
   
   dnl Required for source compatibility with build/rules.mk of httpd-2.0
   LTFLAGS="--silent"
  
  
  
  1.3       +3 -0      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.2
  retrieving revision 1.3
  diff -u -u -r1.2 -r1.3
  --- config_vars.mk.in	9 Mar 2002 19:34:44 -0000	1.2
  +++ config_vars.mk.in	2 Aug 2004 23:55:38 -0000	1.3
  @@ -1,5 +1,8 @@
   CC=@CC@
   
  +APR_CONFIG=@APR_CONFIG@
  +APU_CONFIG=@APU_CONFIG@
  +
   CPPFLAGS=@CPPFLAGS@
   CFLAGS=@CFLAGS@
   LDFLAGS=@LDFLAGS@ @LIBTOOL_LDFLAGS@
  
  
  
  1.8       +1 -1      httpd-test/flood/build/rules.mk.in
  
  Index: rules.mk.in
  ===================================================================
  RCS file: /home/cvs/httpd-test/flood/build/rules.mk.in,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -u -r1.7 -r1.8
  --- rules.mk.in	9 Feb 2004 08:08:44 -0000	1.7
  +++ rules.mk.in	2 Aug 2004 23:55:38 -0000	1.8
  @@ -50,7 +50,7 @@
   
   # Helper programs
   
  -MKINSTALLDIRS = $(top_srcdir)/build/mkdir.sh
  +MKINSTALLDIRS = `$(APR_CONFIG) --installbuilddir`/mkdir.sh
   INSTALL = $(LIBTOOL) --mode=install $(top_srcdir)/build/install.sh -c
   INSTALL_DATA = $(INSTALL) -m 644
   INSTALL_PROGRAM = $(INSTALL) -m 755 $(INSTALL_PROG_FLAGS)
  
  
  

Mime
View raw message