Moving APXS-specific checks into respective config.m4. The placement of

`%APXS -q..` caused error messages, if APXS was not used.

diff --git a/configure.in b/configure.in
index 555640ad45554c69487a2d695b2162bbc17cc9b4..13ea7784eb1101c6b0890a89f4f9f3154f5f158c 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -798,15 +798,13 @@ if true; then
   else
       rm -f internal_functions.c.old
   fi
-  
-  if test -n "$APXS" ; then
-    if test "a`$APXS -q LD_SHLIB`" = "a" || test "`$APXS -q LIBEXECDIR`" = "modules"; then
-        echo "+--------------------------------------------------------------------+"
-        echo "| WARNING: Your $APXS script is most likely broken."
-        echo "|                                                                    |"
-        echo "| Please go read http://www.php.net/FAQ.php3#4.11 and make the       |"
-        echo "| changes described there and try again.                             |"
-    fi
+
+  if test -n "$PHP_APXS_BROKEN"; then
+    echo "+--------------------------------------------------------------------+"
+    echo "| WARNING: Your $APXS script is most likely broken."
+    echo "|                                                                    |"
+    echo "| Please go read http://www.php.net/FAQ.php3#4.11 and make the       |"
+    echo "| changes described there and try again.                             |"
   fi
 
   # Warn about CGI version with no extra security options.

diff --git a/sapi/apache/config.m4 b/sapi/apache/config.m4
index 9ebdad0b3df055fe5c758b0ad0c8cd32bec14d50..626eaae52ff25adc11f1f2ba149d4958c358e135 100644 (file)
--- a/sapi/apache/config.m4
+++ b/sapi/apache/config.m4
@@ -23,6 +23,9 @@ AC_ARG_WITH(apxs,
        PHP_SAPI=apache
        APACHE_INSTALL="$APXS -i -a -n php4 $SAPI_SHARED"
        PHP_BUILD_SHARED
+       if test -z "`$APXS -q LD_SHLIB`" || test "`$APXS -q LIBEXECDIR`" = "modules"; then
+               PHP_APXS_BROKEN=yes
+       fi
        STRONGHOLD=
        AC_DEFINE(APACHE)
        AC_DEFINE(HAVE_AP_CONFIG_H)