diff options
author | Joe Orton <jorton@apache.org> | 2008-11-28 17:51:07 +0100 |
---|---|---|
committer | Joe Orton <jorton@apache.org> | 2008-11-28 17:51:07 +0100 |
commit | 96bfc9fe36a5618ebb74be15159d9e8928d90f18 (patch) | |
tree | 817aaf54f2825ccf4ca2ea65db739141fbfffa21 /buildconf | |
parent | Backported (diff) | |
download | apache2-96bfc9fe36a5618ebb74be15159d9e8928d90f18.tar.xz apache2-96bfc9fe36a5618ebb74be15159d9e8928d90f18.zip |
* buildconf, configure.in: Don't attempt to configure the
no-longer-bundled pcre.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@721533 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'buildconf')
-rwxr-xr-x | buildconf | 9 |
1 files changed, 2 insertions, 7 deletions
@@ -115,10 +115,9 @@ fi touch .deps rm -f aclocal.m4 rm -f generated_lists -rm -f srclib/pcre/aclocal.m4 # Remove autoconf 2.5x cache directories -rm -rf autom4te*.cache srclib/pcre/autom4te*.cache +rm -rf autom4te*.cache case "`uname`" in *BSD/OS*) @@ -129,7 +128,6 @@ esac apr_configure="$apr_src_dir/configure" aprutil_configure="$apu_src_dir/configure" -pcre_configure="srclib/pcre/configure" config_h_in="include/ap_config_auto.h.in" cross_compile_warning="warning: AC_TRY_RUN called without default to allow cross compiling" @@ -173,9 +171,6 @@ if [ -f $apr_src_dir/build/ltmain.sh ]; then cp $apr_src_dir/build/ltmain.sh build fi -echo rebuilding $pcre_configure -(cd srclib/pcre && ${AUTOCONF:-autoconf}) - echo rebuilding $config_h_in rm -f $config_h_in ${AUTOHEADER:-autoheader} 2>&1 | grep -v "$cross_compile_warning" @@ -185,7 +180,7 @@ rm -f config.cache ${AUTOCONF:-autoconf} 2>&1 | grep -v "$cross_compile_warning" # Remove autoconf 2.5x cache directories -rm -rf autom4te*.cache srclib/pcre/autom4te*.cache +rm -rf autom4te*.cache if [ -f `which cut` ]; then echo rebuilding rpm spec file |