cvs: /php4 configure.in /php4/sapi/apache config.m4

sas Sat Dec 11 12:48:41 1999 EDT Modified files: /php4 configure.in /php4/sapi/apache config.m4 Log: Moving APXS-specific checks into respective config.m4. The placement of %APXS -q.. caused error messages, if APXS was not used. Index: php4/configure.in diff -u php4/configure.in:1.65 php4/configure.in:1.66 --- php4/configure.in:1.65 Tue Dec 7 13:18:17 1999 +++ php4/configure.in Sat Dec 11 12:48:40 1999 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.65 1999/12/07 18:18:17 andrei Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.66 1999/12/11 17:48:40 sas Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(0) @@ -798,15 +798,13 @@ 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. Index: php4/sapi/apache/config.m4 diff -u php4/sapi/apache/config.m4:1.13 php4/sapi/apache/config.m4:1.14 --- php4/sapi/apache/config.m4:1.13 Thu Nov 18 09:21:50 1999 +++ php4/sapi/apache/config.m4 Sat Dec 11 12:48:41 1999 @@ -23,6 +23,9 @@ 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)