Mailing-List: contact apache-cvs-help@apache.org; run by ezmlm
Precedence: bulk
Reply-To: new-httpd@apache.org
Date: 17 Feb 2001 11:22:01 -0000
Message-ID: <20010217112201.31306.qmail@apache.org>
From: fielding@apache.org
To: httpd-2.0-cvs@apache.org
Subject: cvs commit: httpd-2.0/build build.mk build2.mk

fielding    01/02/17 03:22:01

  Modified:    .        acinclude.m4
               build    build.mk build2.mk
  Log:
  Use new locations for APR autoconf macros and remove unneeded dependencies.
  
  Revision  Changes    Path
  1.65      +4 -2      httpd-2.0/acinclude.m4
  
  Index: acinclude.m4
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/acinclude.m4,v
  retrieving revision 1.64
  retrieving revision 1.65
  diff -u -r1.64 -r1.65
  --- acinclude.m4	2001/02/06 21:47:50	1.64
  +++ acinclude.m4	2001/02/17 11:21:53	1.65
  @@ -180,8 +180,10 @@
     fi
   ])
   
  -sinclude(srclib/apr/apr_common.m4)
  -sinclude(srclib/apr/hints.m4)
  +sinclude(srclib/apr/build/apr_common.m4)
  +sinclude(srclib/apr/build/apr_network.m4)
  +sinclude(srclib/apr/build/apr_threads.m4)
  +sinclude(srclib/apr/build/apr_hints.m4)
   sinclude(hints.m4)
   
   AC_DEFUN(APACHE_CHECK_SIGWAIT_ONE_ARG,[
  
  
  
  1.20      +1 -1      httpd-2.0/build/build.mk
  
  Index: build.mk
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/build/build.mk,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- build.mk	2001/02/16 04:26:27	1.19
  +++ build.mk	2001/02/17 11:21:58	1.20
  @@ -61,7 +61,7 @@
   STAMP = buildmk.stamp
   
   all: $(STAMP) generated_lists
  -	@if [ ! -d srclib/apr -o ! -f srclib/apr/apr_common.m4 ]; then \
  +	@if [ ! -d srclib/apr -o ! -f srclib/apr/build/apr_common.m4 ]; then \
   	    echo "" ; \
   	    echo "You don't have a srclib/apr/ subdirectory.  Please get one:" ; \
   	    echo "" ; \
  
  
  
  1.29      +2 -2      httpd-2.0/build/build2.mk
  
  Index: build2.mk
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/build/build2.mk,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- build2.mk	2001/02/16 04:26:27	1.28
  +++ build2.mk	2001/02/17 11:21:59	1.29
  @@ -84,7 +84,7 @@
   
   libtool_m4 = $(libtool_prefix)/share/aclocal/libtool.m4
   
  -aclocal.m4: acinclude.m4 srclib/apr/apr_common.m4 srclib/apr/hints.m4 $(libtool_m4)
  +aclocal.m4: acinclude.m4 $(libtool_m4)
   	@echo rebuilding $@
   	@echo "dnl THIS FILE IS AUTOMATICALLY GENERATED BY buildconf" >$@
   	@echo "dnl edits here will be lost" >>$@
  @@ -122,7 +122,7 @@
   	(cd srclib/apr-util && ./buildconf.sh)
   
   ### we shouldn't (have to) know what goes into the configure script!
  -$(apr_configure): srclib/apr/helpers/apr-conf.m4 srclib/apr/configure.in srclib/apr/apr_common.m4 srclib/apr/hints.m4
  +$(apr_configure): srclib/apr/configure.in
   	@echo rebuilding $@
   	(cd srclib/apr && ./buildconf)