diff options
| author | Sascha Schumann <sas@php.net> | 1999-12-11 17:48:41 +0000 |
|---|---|---|
| committer | Sascha Schumann <sas@php.net> | 1999-12-11 17:48:41 +0000 |
| commit | 73656982689970856ec14b53e176c1fbdfd13157 (patch) | |
| tree | 43d3cce6b90db4d19c6b31d49fbf80081d43191f | |
| parent | 4bd855e69f8178703582d00ad07ece0c6ad8adf7 (diff) | |
| download | php-git-73656982689970856ec14b53e176c1fbdfd13157.tar.gz | |
Moving APXS-specific checks into respective config.m4. The placement of
`%APXS -q..` caused error messages, if APXS was not used.
| -rw-r--r-- | configure.in | 16 | ||||
| -rw-r--r-- | sapi/apache/config.m4 | 3 |
2 files changed, 10 insertions, 9 deletions
diff --git a/configure.in b/configure.in index 555640ad45..13ea7784eb 100644 --- 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 9ebdad0b3d..626eaae52f 100644 --- 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) |