diff options
| author | Jeff Trawick <trawick@apache.org> | 2003-04-17 02:57:22 +0000 |
|---|---|---|
| committer | Jeff Trawick <trawick@apache.org> | 2003-04-17 02:57:22 +0000 |
| commit | 7bc80a5432a7e2a1fec2ecaad428257c94d47cdf (patch) | |
| tree | bc1984b13309dcab7f154bd37251d8af7a5bbd9a /configure.in | |
| parent | c7776d9530274b6ab86c32d0dbe3aa795d8b0fa7 (diff) | |
| download | httpd-7bc80a5432a7e2a1fec2ecaad428257c94d47cdf.tar.gz | |
merge this fix into 2.0.46-dev:
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]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/APACHE_2_0_BRANCH@99398 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/configure.in b/configure.in index aa44573f2c..90ff8baf80 100644 --- a/configure.in +++ b/configure.in @@ -68,7 +68,9 @@ if test "$apr_found" = "no"; then fi if test "$apr_found" = "reconfig"; then - 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]) + 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" @@ -91,7 +93,9 @@ if test "$apu_found" = "no"; then fi if test "$apu_found" = "reconfig"; then - APR_SUBDIR_CONFIG(srclib/apr-util, [--with-apr=../apr --prefix=$prefix --exec-prefix=$exec_prefix --libdir=$libdir --includedir=$includedir --bindir=$bindir]) + 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" @@ -104,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}" |