Move the dropped '--enable-layout' subdir logic into APR_SUBDIR_CONFIG macro

as a third parameter rather than manually computing it ourselves.

Add the ' prefix'd --enable-layout so that this can work with an autoconf-2.54+
generated configure.  (Previously, the option would not be dropped with 2.54
or 2.57 since it unconditionally adds single-quotes which our case statement
would not catch.)

Try to shorten long invocations of APR_SUBDIR_CONFIG where possible.

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

diff --git a/configure.in b/configure.in
index e429ade7089c54e80a246157c552806484b3e2d1..d660185e7a962f99ca30de23b4357936fc4173fd 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -59,21 +59,6 @@ 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)
@@ -83,10 +68,9 @@ 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
+  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],
+                    [--enable-layout=*|\'--enable-layout=*])
   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"
@@ -109,10 +93,9 @@ 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
+  APR_SUBDIR_CONFIG(srclib/apr-util,
+                    [--with-apr=../apr --prefix=$prefix --exec-prefix=$exec_prefix --libdir=$libdir --includedir=$includedir --bindir=$bindir],
+                    [--enable-layout=*|\'--enable-layout=*])
   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"
@@ -125,7 +108,8 @@ APU_INCLUDEDIR=`$apu_config --includedir`
 
 echo $ac_n "${nl}Configuring PCRE regular expression library ...${nl}"
 
-APR_SUBDIR_CONFIG(srclib/pcre, [--prefix=$prefix --exec-prefix=$exec_prefix --libdir=$libdir --includedir=$includedir --bindir=$bindir])
+APR_SUBDIR_CONFIG(srclib/pcre,
+                  [--prefix=$prefix --exec-prefix=$exec_prefix --libdir=$libdir --includedir=$includedir --bindir=$bindir])
 
 echo $ac_n "${nl}Configuring Apache httpd ...${nl}"