summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xbuildconf9
-rw-r--r--configure.in2
2 files changed, 3 insertions, 8 deletions
diff --git a/buildconf b/buildconf
index 706751ca15..b36d0579ae 100755
--- a/buildconf
+++ b/buildconf
@@ -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
diff --git a/configure.in b/configure.in
index b380439464..e13e051882 100644
--- a/configure.in
+++ b/configure.in
@@ -611,7 +611,7 @@ fi
APACHE_FAST_OUTPUT(Makefile modules/Makefile srclib/Makefile)
APACHE_FAST_OUTPUT(os/Makefile server/Makefile)
-APACHE_FAST_OUTPUT(support/Makefile srclib/pcre/Makefile)
+APACHE_FAST_OUTPUT(support/Makefile)
if test -d ./test; then
APACHE_FAST_OUTPUT(test/Makefile)