diff options
| author | Clement Laforet <clement@FreeBSD.org> | 2004-12-13 10:26:52 +0000 |
|---|---|---|
| committer | Clement Laforet <clement@FreeBSD.org> | 2004-12-13 10:26:52 +0000 |
| commit | 53975fd70282fcb9876cc1b1b814f68aef4da627 (patch) | |
| tree | 1a1233aabb46e359ff442c21dadc82788230d7b2 /www/apache21/files/patch-configure.in | |
| parent | - s/INSTALLS_SHILB/INSTALLS_SHLIB/ (diff) | |
- Sync apache-apr layout with devel/apr one (to avoid another hack for
subversion)
- Add support for APR_FROM_PORTS
Notes
Notes:
svn path=/head/; revision=123913
Diffstat (limited to 'www/apache21/files/patch-configure.in')
| -rw-r--r-- | www/apache21/files/patch-configure.in | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/www/apache21/files/patch-configure.in b/www/apache21/files/patch-configure.in index 6d77c65b7f07..e36f5d9ac795 100644 --- a/www/apache21/files/patch-configure.in +++ b/www/apache21/files/patch-configure.in @@ -1,24 +1,24 @@ ---- configure.in.orig Thu Mar 18 08:36:52 2004 -+++ configure.in Fri Jul 2 11:44:25 2004 +--- configure.in.orig Sun Nov 21 19:50:36 2004 ++++ configure.in Mon Dec 13 10:43:16 2004 @@ -69,7 +69,7 @@ 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], -+ [$apache_apr_flags --prefix=$prefix --exec-prefix=$exec_prefix --libdir=$libdir --includedir=$includedir --bindir=$libdir --datadir=$datadir --with-installbuilddir=$installbuilddir], ++ [$apache_apr_flags --prefix=$prefix], [--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" -@@ -96,7 +96,7 @@ +@@ -97,7 +97,7 @@ 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], -+ [--with-apr=../apr --prefix=$prefix --exec-prefix=$exec_prefix --libdir=$libdir --includedir=$includedir --bindir=$libdir], ++ [--with-apr=../apr --prefix=$prefix], [--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" -@@ -545,8 +545,14 @@ +@@ -549,8 +549,14 @@ [Root directory of the Apache install area]) AC_DEFINE_UNQUOTED(SERVER_CONFIG_FILE, "${rel_sysconfdir}/${progname}.conf", [Location of the config file, relative to the Apache root directory]) |