Fix --enable-layout to work again.

Fix bug where --sysconfdir and --localstatedir were being ignored by APR.

Caution: When specifying --enable-layout, common arguments like --prefix,
--exec-prefix, etc. will be ignored and the settings from the layout
will be used instead.

PR: 9124, 9888, 9873, 9885
Submitted by:	Thom May <thom@planetarytramp.net>, Aaron Bannert
Reviewed by:    Justin Erenkrantz

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

diff --git a/acinclude.m4 b/acinclude.m4
index 3f7286c16f51ea8274e8a4020d89a9176db663e9..abf2fe0aafd5b218fb870d87f0c7137367efdb7c 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -325,23 +325,6 @@ AC_DEFUN(APACHE_LAYOUT,[
   done
   changequote([,])
 ])dnl
-dnl
-dnl APACHE_ENABLE_LAYOUT
-dnl
-AC_DEFUN(APACHE_ENABLE_LAYOUT,[
-AC_ARG_ENABLE(layout,
-APACHE_HELP_STRING(--enable-layout=LAYOUT,Default file layout),[
-  LAYOUT=$enableval
-])
-
-if test -z "$LAYOUT"; then
-  LAYOUT="Apache"
-fi
-APACHE_LAYOUT($srcdir/config.layout, $LAYOUT)
-
-AC_MSG_CHECKING(for chosen layout)
-AC_MSG_RESULT($layout_name)
-])
 
 dnl
 dnl APACHE_ENABLE_MODULES

diff --git a/configure.in b/configure.in
index ba60cb4332d1bac752b053212ed31a90054705ce..f9baec8fbf9f552b0efd9e92e6fbe32109b000ed 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -18,6 +18,18 @@ sinclude(srclib/apr/build/apr_network.m4)
 sinclude(srclib/apr/build/apr_threads.m4)
 sinclude(acinclude.m4)
 
+dnl Get the layout here, so we can pass the required variables to apr
+dnl APACHE_ENABLE_LAYOUT
+AC_MSG_CHECKING(for chosen layout)
+AC_ARG_ENABLE(layout,
+APACHE_HELP_STRING(--enable-layout=LAYOUT,Default file layout),[
+  LAYOUT=$enableval
+  APACHE_LAYOUT($srcdir/config.layout, $LAYOUT)
+  AC_MSG_RESULT($LAYOUT)
+], [
+  AC_MSG_RESULT([Autoconf Defaults])
+])
+
 dnl Save user-defined environment settings for later restoration
 dnl
 APR_SAVE_THE_ENVIRONMENT(CPPFLAGS)
@@ -52,15 +64,15 @@ orig_prefix="$prefix"
 
 echo $ac_n "${nl}Configuring Apache Portable Runtime library ...${nl}"
 
-APR_SUBDIR_CONFIG(srclib/apr, "$apache_apr_flags --prefix=$prefix")
+APR_SUBDIR_CONFIG(srclib/apr, "$apache_apr_flags --prefix=$prefix --exec-prefix=$exec_prefix --libdir=$libdir --bindir=$bindir")
 
 echo $ac_n "${nl}Configuring Apache Portable Runtime Utility library...${nl}"
 
-APR_SUBDIR_CONFIG(srclib/apr-util, "--with-apr=../apr --prefix=$prefix")
+APR_SUBDIR_CONFIG(srclib/apr-util, "--with-apr=../apr --prefix=$prefix --exec-prefix=$exec_prefix --libdir=$libdir --bindir=$bindir")
 
 echo $ac_n "${nl}Configuring PCRE regular expression library ...${nl}"
 
-APR_SUBDIR_CONFIG(srclib/pcre, "--prefix=$prefix")
+APR_SUBDIR_CONFIG(srclib/pcre, "--prefix=$prefix --exec-prefix=$exec_prefix --libdir=$libdir --bindir=$bindir")
 
 echo $ac_n "${nl}Configuring Apache httpd ...${nl}"
 
@@ -277,7 +289,6 @@ AC_ARG_ENABLE(maintainer-mode,APACHE_HELP_STRING(--enable-maintainer-mode,Turn o
   APR_ADDTO(CPPFLAGS, -DAP_DEBUG)
 ])dnl
 
-APACHE_ENABLE_LAYOUT
 prefix="$orig_prefix"
 APACHE_ENABLE_MODULES