cvs: php4(PHP_4_0_7) /sapi/apache config.m4

sniper Sun Nov 18 19:52:03 2001 EDT Modified files: (Branch: PHP_4_0_7) /php4/sapi/apache config.m4 Log: MFH Index: php4/sapi/apache/config.m4 diff -u php4/sapi/apache/config.m4:1.42 php4/sapi/apache/config.m4:1.42.2.1 --- php4/sapi/apache/config.m4:1.42 Fri Jun 15 08:53:20 2001 +++ php4/sapi/apache/config.m4 Sun Nov 18 19:52:02 2001 @@ -39,7 +39,16 @@ 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 @@ 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