Support for OpenSSL 1.1.0:

[apache] / buildconf

diff --git a/buildconf b/buildconf
index 772610343a12899c863e46f74d37653fa93d94a1..38969681ee2e95fb84f79a960fa3b87ba1ebe3b4 100755 (executable)
--- a/buildconf
+++ b/buildconf
@@ -81,12 +81,9 @@ done
 
 if [ $apr_found -lt 1 ]; then
     echo ""
-    echo "You don't have a copy of the apr source in srclib/apr. "
-    echo "Please get the source using the following instructions," 
-    echo "or specify the location of the source with " 
-    echo "--with-apr=[path to apr] :"
+    echo "APR could not be found automatically."
     echo ""
-    echo "   svn co http://svn.apache.org/repos/asf/apr/apr/trunk srclib/apr"
+    echo "Please refer to the documentation on APR in the httpd INSTALL file."
     echo ""
     should_exit=1
 else
@@ -113,12 +110,9 @@ if [ $apr_major_version -lt 2 ] ; then
 
     if [ $apu_found -lt 1 ]; then
         echo ""
-        echo "You don't have a copy of the apr-util source in srclib/apr-util. "
-        echo "Please get one the source using the following instructions, "
-        echo "or specify the location of the source with "
-        echo "--with-apr-util=[path to apr-util]:"
+        echo "You are using APR 1.x but APR-util 1.x was not found."
         echo ""
-        echo "   svn co http://svn.apache.org/repos/asf/apr/apr-util/trunk srclib/apr-util"
+        echo "Please refer to the documentation on APR in the httpd INSTALL file."
         echo ""
         should_exit=1
     fi
@@ -207,6 +201,9 @@ ${AUTOCONF:-autoconf} 2>&1 | grep -v "$cross_compile_warning"
 # Remove autoconf 2.5x cache directories
 rm -rf autom4te*.cache
 
+# Remove possible bsd_converted file
+rm -rf bsd_converted
+
 if [ -f `which cut` ]; then
   echo rebuilding rpm spec file
   ( VMMN=`build/get-version.sh mmn include/ap_mmn.h MODULE_MAGIC_NUMBER`
@@ -226,15 +223,13 @@ if [ -f `which cut` ]; then
     > 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