cvs: php4 /sapi/apache config.m4
| From: | Jani Taskinen | Date: | Mon, 19 Nov 2001 00:51:06 +0000 |
| Subject: | cvs: php4 /sapi/apache config.m4 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-8252@lists.php.net to get a copy of this message | ||
sniper Sun Nov 18 19:51:06 2001 EDT
Modified files:
/php4/sapi/apache config.m4
Log:
Fixed bugs: #14034, #11647 (can not find any others)
Index: php4/sapi/apache/config.m4
diff -u php4/sapi/apache/config.m4:1.43 php4/sapi/apache/config.m4:1.44
--- php4/sapi/apache/config.m4:1.43 Wed Oct 10 12:14:25 2001
+++ php4/sapi/apache/config.m4 Sun Nov 18 19:51:06 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