Allow VPATH builds to succeed when configured from an empty directory.

(Justin removed some unneeded changes in Makefile.in.)

Submitted by:	Thom May <thom@planetarytramp.net>
Reviewed by:	Justin Erenkrantz

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94697 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index 50a9acbf57d8cdd0f4015e4ba7ad163602be9497..8398dd0144f306db98d2c2d3ee797aa349567eb4 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,8 @@
 Changes with Apache 2.0.36
 
+  *) Allow VPATH builds to succeed when configured from an empty
+     directory.  [Thom May <thom@planetarytramp.net>]
+
   *) Fix 'control reaches end of non-void function' warning in
      server/log.c.  [Ben Collins-Sussman <sussman@collab.net>]
 

diff --git a/acinclude.m4 b/acinclude.m4
index 488cf5bd509f2217323254d7d25c9fd6abe35c1b..5828c035c9cf8baeb9d4d5977213b4aa2efc7d2d 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -28,8 +28,10 @@ AC_DEFUN(APACHE_MKDIR_P_CHECK,[
     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 @@ AC_DEFUN(APACHE_GEN_CONFIG_VARS,[
 
   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

diff --git a/configure.in b/configure.in
index 8d40221cf07097d440813ecc3e44f349bb75f6f5..1e95b49e29a5af5857f66ee0ae06e7fab2ec0fc0 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -47,6 +47,8 @@ APR_CONFIG_NICE(config.nice)
 
 nl='
 '
+dnl Check that mkdir -p works
+APACHE_MKDIR_P_CHECK
 
 dnl ## Run configure for packages Apache uses
 
@@ -480,6 +482,9 @@ case $host in
     ;;
 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
 ])