Merge 2.5.x changes to trunk.

apache2/build/find_apr.m4

@@ -26,13 +26,13 @@ AC_MSG_CHECKING([for libapr config script])
 for x in ${test_paths}; do
     dnl # Determine if the script was specified and use it directly
     if test ! -d "$x" -a -e "$x"; then
-        APR_CONFIG="`basename $x`"
-        apr_path=`echo $x | sed "s/\/\?${APR_CONFIG}\$//"`
+        APR_CONFIG=$x
+        apr_path=no
         break
     fi
 
     dnl # Try known config script names/locations
-    for APR_CONFIG in apr-1-mt-config apr-1-config apr-mt-config apr-config; do
+    for APR_CONFIG in apr-1-mt-config apr-1-config apr-config-1 apr-mt-config-1 apr-mt-config apr-config; do
         if test -e "${x}/bin/${APR_CONFIG}"; then
             apr_path="${x}/bin"
             break
@@ -49,7 +49,9 @@ for x in ${test_paths}; do
 done
 
 if test -n "${apr_path}"; then
-    APR_CONFIG="${apr_path}/${APR_CONFIG}"
+    if test "${apr_path}" != "no"; then
+        APR_CONFIG="${apr_path}/${APR_CONFIG}"
+    fi
     AC_MSG_RESULT([${APR_CONFIG}])
     APR_CFLAGS="`${APR_CONFIG} --includes --cppflags --cflags`"
     if test "$verbose_output" -eq 1; then AC_MSG_NOTICE(apr CFLAGS: $APR_CFLAGS); fi

apache2/build/find_apu.m4

@@ -27,12 +27,12 @@ for x in ${test_paths}; do
     dnl # Determine if the script was specified and use it directly
     if test ! -d "$x" -a -e "$x"; then
         APU_CONFIG="`basename $x`"
-        apu_path=`echo $x | sed "s/\/\?${APU_CONFIG}\$//"`
+        apu_path="no"
         break
     fi
 
     dnl # Try known config script names/locations
-    for APU_CONFIG in apu-1-mt-config apu-1-config apu-mt-config apu-config; do
+    for APU_CONFIG in apu-1-mt-config apu-1-config apu-config-1 apu-mt-config-1 apu-mt-config apu-config; do
         if test -e "${x}/bin/${APU_CONFIG}"; then
             apu_path="${x}/bin"
             break
@@ -49,7 +49,9 @@ for x in ${test_paths}; do
 done
 
 if test -n "${apu_path}"; then
-    APU_CONFIG="${apu_path}/${APU_CONFIG}"
+    if test "${apu_path}" != "no"; then
+        APU_CONFIG="${apu_path}/${APU_CONFIG}"
+    fi
     AC_MSG_RESULT([${APU_CONFIG}])
     APU_CFLAGS="`${APU_CONFIG} --includes`"
     if test "$verbose_output" -eq 1; then AC_MSG_NOTICE(apu CFLAGS: $APU_CFLAGS); fi

apache2/build/find_curl.m4

@@ -23,8 +23,8 @@ AC_MSG_CHECKING([for libcurl config script])
 for x in ${test_paths}; do
     dnl # Determine if the script was specified and use it directly
     if test ! -d "$x" -a -e "$x"; then
-        CURL_CONFIG="`basename $x`"
-        curl_path=`echo $x | sed "s/\/\?${CURL_CONFIG}\$//"`
+        CURL_CONFIG=$x
+        curl_path="no"
         break
     fi
 
@@ -46,7 +46,9 @@ for x in ${test_paths}; do
 done
 
 if test -n "${curl_path}"; then
-    CURL_CONFIG="${curl_path}/${CURL_CONFIG}"
+    if test "${curl_path}" != "no"; then
+        CURL_CONFIG="${curl_path}/${CURL_CONFIG}"
+    fi
     AC_MSG_RESULT([${CURL_CONFIG}])
     CURL_CFLAGS="`${CURL_CONFIG} --cflags`"
     if test "$verbose_output" -eq 1; then AC_MSG_NOTICE(curl CFLAGS: $CURL_CFLAGS); fi

apache2/build/find_pcre.m4

@@ -29,8 +29,8 @@ fi
 for x in ${test_paths}; do
     dnl # Determine if the script was specified and use it directly
     if test ! -d "$x" -a -e "$x"; then
-        PCRE_CONFIG="`basename $x`"
-        pcre_path=`echo $x | sed "s/\/\?${PCRE_CONFIG}\$//"`
+        PCRE_CONFIG=$x
+        pcre_path="no"
         break
     fi
 
@@ -54,7 +54,9 @@ done
     LDFLAGS=$save_LDFLAGS
 
 if test -n "${pcre_path}"; then
-    PCRE_CONFIG="${pcre_path}/${PCRE_CONFIG}"
+    if test "${pcre_path}" != "no"; then
+        PCRE_CONFIG="${pcre_path}/${PCRE_CONFIG}"
+    fi
     AC_MSG_RESULT([${PCRE_CONFIG}])
     PCRE_CFLAGS="`${PCRE_CONFIG} --cflags`"
     if test "$verbose_output" -eq 1; then AC_MSG_NOTICE(pcre CFLAGS: $PCRE_CFLAGS); fi

apache2/build/find_xml.m4

@@ -22,8 +22,8 @@ AC_MSG_CHECKING([for libxml2 config script])
 for x in ${test_paths}; do
     dnl # Determine if the script was specified and use it directly
     if test ! -d "$x" -a -e "$x"; then
-        LIBXML2_CONFIG="`basename $x`"
-        libxml2_path=`echo $x | sed "s/\/\?${LIBXML2_CONFIG}\$//"`
+        LIBXML2_CONFIG=$x
+        libxml2_path="no"
         break
     fi
 
@@ -47,7 +47,9 @@ done
     LDFLAGS=$save_LDFLAGS
 
 if test -n "${libxml2_path}"; then
-    LIBXML2_CONFIG="${libxml2_path}/${LIBXML2_CONFIG}"
+    if test "${libxml2_path}" != "no"; then
+        LIBXML2_CONFIG="${libxml2_path}/${LIBXML2_CONFIG}"
+    fi
     AC_MSG_RESULT([${LIBXML2_CONFIG}])
     LIBXML2_CFLAGS="`${LIBXML2_CONFIG} --cflags`"
     if test "$verbose_output" -eq 1; then AC_MSG_NOTICE(xml CFLAGS: $LIBXML2_CFLAGS); fi