From cvs-return-3313-apmail-apr-cvs-archive=apr.apache.org@apr.apache.org Thu Apr 18 09:01:34 2002 Return-Path: Delivered-To: apmail-apr-cvs-archive@apr.apache.org Received: (qmail 47136 invoked by uid 500); 18 Apr 2002 09:01:34 -0000 Mailing-List: contact cvs-help@apr.apache.org; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: Reply-To: dev@apr.apache.org Delivered-To: mailing list cvs@apr.apache.org Received: (qmail 47125 invoked from network); 18 Apr 2002 09:01:34 -0000 Date: 18 Apr 2002 09:01:32 -0000 Message-ID: <20020418090132.65487.qmail@icarus.apache.org> From: jerenkrantz@apache.org To: apr-cvs@apache.org Subject: cvs commit: apr/build apr_common.m4 X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N jerenkrantz 02/04/18 02:01:32 Modified: . CHANGES acinclude.m4 configure.in build apr_common.m4 Log: Allow VPATH builds to succeed when configured from an empty directory. (Justin removed some unneeded changes in Makefile.in.) Submitted by: Thom May Reviewed by: Justin Erenkrantz Revision Changes Path 1.715 +3 -0 httpd-2.0/CHANGES Index: CHANGES =================================================================== RCS file: /home/cvs/httpd-2.0/CHANGES,v retrieving revision 1.714 retrieving revision 1.715 diff -u -r1.714 -r1.715 --- CHANGES 18 Apr 2002 08:27:27 -0000 1.714 +++ CHANGES 18 Apr 2002 09:01:31 -0000 1.715 @@ -1,5 +1,8 @@ Changes with Apache 2.0.36 + *) Allow VPATH builds to succeed when configured from an empty + directory. [Thom May ] + *) Fix 'control reaches end of non-void function' warning in server/log.c. [Ben Collins-Sussman ] 1.123 +2 -6 httpd-2.0/acinclude.m4 Index: acinclude.m4 =================================================================== RCS file: /home/cvs/httpd-2.0/acinclude.m4,v retrieving revision 1.122 retrieving revision 1.123 diff -u -r1.122 -r1.123 --- acinclude.m4 6 Apr 2002 22:00:56 -0000 1.122 +++ acinclude.m4 18 Apr 2002 09:01:31 -0000 1.123 @@ -28,8 +28,10 @@ mkdir -p conftestdir/somedir >/dev/null 2>&1 if test -d conftestdir/somedir; then ac_cv_mkdir_p=yes + mkdir_p="mkdir -p" else ac_cv_mkdir_p=no + mkdir_p="$top_srcdir/build/mkdir.sh" fi rm -rf conftestdir ]) @@ -103,13 +105,7 @@ abs_srcdir="`(cd $srcdir && pwd)`" - APACHE_MKDIR_P_CHECK echo creating config_vars.mk - if test "$ac_cv_mkdir_p" = "yes"; then - mkdir_p="mkdir -p" - else - mkdir_p="$top_srcdir/build/mkdir.sh" - fi test -d build || $mkdir_p build > build/config_vars.mk for i in $APACHE_VAR_SUBST; do 1.216 +5 -0 httpd-2.0/configure.in Index: configure.in =================================================================== RCS file: /home/cvs/httpd-2.0/configure.in,v retrieving revision 1.215 retrieving revision 1.216 diff -u -r1.215 -r1.216 --- configure.in 12 Apr 2002 03:37:01 -0000 1.215 +++ configure.in 18 Apr 2002 09:01:31 -0000 1.216 @@ -47,6 +47,8 @@ nl=' ' +dnl Check that mkdir -p works +APACHE_MKDIR_P_CHECK dnl ## Run configure for packages Apache uses @@ -479,6 +481,9 @@ fi ;; esac + +dnl Ensure that docs/conf is created. +test -d docs/conf||$mkdir_p docs/conf AC_OUTPUT($APACHE_OUTPUT_FILES docs/conf/httpd-std.conf include/ap_config_layout.h support/apxs support/apachectl support/dbmmanage support/envvars-std support/log_server_status support/logresolve.pl support/phf_abuse_log.cgi support/split-logfile build/rules.mk,[true],[ APACHE_GEN_MAKEFILES 1.30 +2 -2 apr/build/apr_common.m4 Index: apr_common.m4 =================================================================== RCS file: /home/cvs/apr/build/apr_common.m4,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- apr_common.m4 23 Mar 2002 16:18:35 -0000 1.29 +++ apr_common.m4 18 Apr 2002 09:01:32 -0000 1.30 @@ -58,9 +58,9 @@ echo "configuring package in $1 now" ac_popdir=`pwd` - ac_abs_srcdir=`(cd $srcdir/$1 && pwd)` apr_config_subdirs="$1" - test -d $1 || $MKDIR $1 + test -d $1 || $mkdir_p $1 + ac_abs_srcdir=`(cd $srcdir/$1 && pwd)` cd $1 changequote(, )dnl