Fix a build problem with passing unsupported --enable-layout

args to apr and apr-util.  This broke binbuild.sh as well as
user-specified layout parameters.

PR:                                  18649
Original concept code submitted by:  Justin Erenkrantz
Mangled by:                          Jeff Trawick

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

diff --git a/CHANGES b/CHANGES
index ea3968edb970ef41bb7a6de9c182c2146db7169d..67e0b23ec1b64761fe18e47faf15decce82cb1a6 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,11 @@ Changes with Apache 2.1.0-dev
 
   [Remove entries to the current 2.0 section below, when backported]
 
+  *) Fix a build problem with passing unsupported --enable-layout
+     args to apr and apr-util.  This broke binbuild.sh as well as
+     user-specified layout parameters.  PR 18649 [Justin Erenkrantz,
+     Jeff Trawick]
+
   *) ap_get_mime_headers_core: allocate space for the trailing null
      when folding is in effect.
      PR 18170 [Peter Mayne <PeterMayne@SPAM_SUX.ap.spherion.com>]

diff --git a/configure.in b/configure.in
index 1bd3d20ac812c12af71ca84fc8dc52ffef197e48..e429ade7089c54e80a246157c552806484b3e2d1 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -59,6 +59,21 @@ AC_CANONICAL_SYSTEM
 
 orig_prefix="$prefix"
 
+dnl apr and apr-util don't handle Apache layouts, so build a version
+dnl of the configure args without the --enable-layout= arg
+
+no_layout_configure_args=
+ap_sep=
+for ac_configure_arg in $ac_configure_args
+do
+  case "$ac_configure_arg" in
+    --enable-layout=*)
+      continue ;;
+  esac
+  no_layout_configure_args="$no_layout_configure_args$ap_sep'$ac_configure_arg'"
+  ap_sep=" "
+done
+
 echo $ac_n "${nl}Configuring Apache Portable Runtime library ...${nl}"
 
 APR_FIND_APR("$srcdir/srclib/apr", "./srclib/apr", 1)
@@ -68,7 +83,10 @@ if test "$apr_found" = "no"; then
 fi
 
 if test "$apr_found" = "reconfig"; then
+  orig_ac_configure_args=$ac_configure_args
+  ac_configure_args=$no_layout_configure_args
   APR_SUBDIR_CONFIG(srclib/apr, [$apache_apr_flags --prefix=$prefix --exec-prefix=$exec_prefix --libdir=$libdir --includedir=$includedir --bindir=$bindir --datadir=$datadir --with-installbuilddir=$installbuilddir])
+  ac_configure_args=$orig_ac_configure_args
   dnl We must be the first to build and the last to be cleaned
   AP_BUILD_SRCLIB_DIRS="apr $AP_BUILD_SRCLIB_DIRS"
   AP_CLEAN_SRCLIB_DIRS="$AP_CLEAN_SRCLIB_DIRS apr"
@@ -91,7 +109,10 @@ if test "$apu_found" = "no"; then
 fi
 
 if test "$apu_found" = "reconfig"; then
+  orig_ac_configure_args=$ac_configure_args
+  ac_configure_args=$no_layout_configure_args
   APR_SUBDIR_CONFIG(srclib/apr-util, [--with-apr=../apr --prefix=$prefix --exec-prefix=$exec_prefix --libdir=$libdir --includedir=$includedir --bindir=$bindir])
+  ac_configure_args=$orig_ac_configure_args
   dnl We must be the last to build and the first to be cleaned
   AP_BUILD_SRCLIB_DIRS="$AP_BUILD_SRCLIB_DIRS apr-util"
   AP_CLEAN_SRCLIB_DIRS="apr-util $AP_CLEAN_SRCLIB_DIRS"