diff options
| author | foobar <sniper@php.net> | 2001-11-19 00:52:02 +0000 |
|---|---|---|
| committer | foobar <sniper@php.net> | 2001-11-19 00:52:02 +0000 |
| commit | f5b77142382952e41af3e666c115be511dc3792f (patch) | |
| tree | 5ddc76ef7bf6a5350257f7309736f894f9fade68 | |
| parent | 747258e34f53dbc4bb0aad72fcb831c8324f6e69 (diff) | |
| download | php-git-f5b77142382952e41af3e666c115be511dc3792f.tar.gz | |
MFH
| -rw-r--r-- | sapi/apache/config.m4 | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/sapi/apache/config.m4 b/sapi/apache/config.m4 index 3cdb95566b..a053ea4c46 100644 --- a/sapi/apache/config.m4 +++ b/sapi/apache/config.m4 @@ -39,7 +39,16 @@ AC_ARG_WITH(apxs, done PHP_ADD_INCLUDE($APXS_INCLUDEDIR) PHP_SAPI=apache - APACHE_INSTALL="\$(mkinstalldirs) \"\$(INSTALL_ROOT)`$APXS -q LIBEXECDIR`\" && $APXS -S LIBEXECDIR=\"\$(INSTALL_ROOT)`$APXS -q LIBEXECDIR`\" -i -a -n php4 $SAPI_SHARED" + + # Test whether apxs support -S option + $APXS -q -S CFLAGS=$APXS_CFLAGS CFLAGS >/dev/null 2>&1 + + if test "$?" != "0"; then + APACHE_INSTALL="$APXS -i -a -n php4 $SAPI_SHARED" # Old apxs does not have -S option + else + APACHE_INSTALL="\$(mkinstalldirs) \"\$(INSTALL_ROOT)`$APXS -q LIBEXECDIR`\" && $APXS -S LIBEXECDIR=\"\$(INSTALL_ROOT)`$APXS -q LIBEXECDIR`\" -i -a -n php4 $SAPI_SHARED" + fi + PHP_BUILD_SHARED if test -z "`$APXS -q LD_SHLIB`" || test "`$APXS -q LIBEXECDIR`" = "modules"; then PHP_APXS_BROKEN=yes @@ -64,7 +73,7 @@ if test "$PHP_SAPI" != "apache"; then AC_MSG_CHECKING(for Apache module support) AC_ARG_WITH(apache, [ --with-apache[=DIR] Build Apache module. DIR is the top-level Apache - build directory, defaults to /usr/local/etc/httpd.],[ + build directory, defaults to /usr/local/apache.],[ if test "$withval" = "yes"; then # Apache's default directory withval=/usr/local/apache |