svn commit: r721533 - in /httpd/httpd/trunk: buildconf configure.in

[jo...@apache.org]

Author: jorton
Date: Fri Nov 28 08:51:07 2008
New Revision: 721533

URL: http://svn.apache.org/viewvc?rev=721533&view=rev
Log:
* buildconf, configure.in: Don't attempt to configure the
  no-longer-bundled pcre.

Modified:
    httpd/httpd/trunk/buildconf
    httpd/httpd/trunk/configure.in

Modified: httpd/httpd/trunk/buildconf
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/buildconf?rev=721533&r1=721532&r2=721533&view=diff
==============================================================================
--- httpd/httpd/trunk/buildconf (original)
+++ httpd/httpd/trunk/buildconf Fri Nov 28 08:51:07 2008
@@ -115,10 +115,9 @@
 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 @@
 
 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 @@
     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 @@
 ${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

Modified: httpd/httpd/trunk/configure.in
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/configure.in?rev=721533&r1=721532&r2=721533&view=diff
==============================================================================
--- httpd/httpd/trunk/configure.in (original)
+++ httpd/httpd/trunk/configure.in Fri Nov 28 08:51:07 2008
@@ -611,7 +611,7 @@
 
 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)