rebuild

[apache] / buildconf

diff --git a/buildconf b/buildconf
index 343983f3b87db86a0ce44a59a9db440c427426d6..a58845d7c4adf2763eaf5603d705eeb44b2ce1d4 100755 (executable)
--- a/buildconf
+++ b/buildconf
@@ -19,6 +19,18 @@
 # buildconf: Build the support scripts needed to compile from a
 #            checked-out version of the source code.
 
+# version check for AC_PROG_CC_C99
+ac_version=`${AUTOCONF:-autoconf} --version 2>/dev/null|sed -e 's/^[^0-9]*//;s/[a-z]* *$//;q'`
+case "$ac_version" in
+# versions older than 2.50 are denied by AC_PREREQ
+2.5*)
+    echo WARNING: You are using an outdated version of autoconf.
+    echo WARNING: This may lead to less than optimal performance of httpd.
+    echo WARNING: You should use autoconf 2.60 or newer.
+    sleep 1
+    ;;
+esac
+
 # set a couple of defaults for where we should be looking for our support libs.
 # can be overridden with --with-apr=[dir] and --with-apr-util=[dir]
 
@@ -106,7 +118,7 @@ if [ $apr_major_version -lt 2 ] ; then
         echo "or specify the location of the source with "
         echo "--with-apr-util=[path to apr-util]:"
         echo ""
-        echo "   svn co http://svn.apache.org/repos/asf/apr/apr-util/trunk srclib/apr-util"
+        echo "   svn co http://svn.apache.org/repos/asf/apr/apr-util/branches/1.5.x srclib/apr-util"
         echo ""
         should_exit=1
     fi
@@ -198,6 +210,7 @@ rm -rf autom4te*.cache
 if [ -f `which cut` ]; then
   echo rebuilding rpm spec file
   ( VMMN=`build/get-version.sh mmn include/ap_mmn.h MODULE_MAGIC_NUMBER`
+    EPOCH=`build/get-version.sh epoch include/ap_release.h AP_SERVER`
     REVISION=`build/get-version.sh all include/ap_release.h AP_SERVER`
     VERSION=`echo $REVISION | cut -d- -s -f1`
     RELEASE=`echo $REVISION | cut -d- -s -f2`
@@ -209,18 +222,17 @@ if [ -f `which cut` ]; then
     sed -e "s/APACHE_VERSION/$VERSION/" \
         -e "s/APACHE_RELEASE/$RELEASE/" \
         -e "s/APACHE_MMN/$VMMN/" \
+        -e "s/APACHE_EPOCH/$EPOCH/" \
     > httpd.spec )
 fi
 
-# ensure that the mod_ssl expression parser sources are never regenerated
+# ensure that the ap_expr expression parser sources are never regenerated
 # when running make
-echo fixing timestamps for mod_ssl sources
-cd modules/ssl
-touch ssl_expr_parse.y
-sleep 1
-touch ssl_expr_parse.c ssl_expr_parse.h ssl_expr_scan.l
+echo fixing timestamps for ap_expr sources
+cd server
+touch util_expr_parse.y util_expr_scan.l
 sleep 1
-touch ssl_expr_scan.c
-cd ../..
+touch util_expr_parse.c util_expr_parse.h util_expr_scan.c
+cd ..
 
 exit 0