cvs: php4 /sapi/apache2filter config.m4
| From: | Marko Karppinen | Date: | Mon, 22 Apr 2002 15:37:55 +0000 |
| Subject: | cvs: php4 /sapi/apache2filter config.m4 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-11311@lists.php.net to get a copy of this message | ||
markonen Mon Apr 22 11:37:55 2002 EDT
Modified files:
/php4/sapi/apache2filter config.m4
Log:
Refine the OS X support a bit
Index: php4/sapi/apache2filter/config.m4
diff -u php4/sapi/apache2filter/config.m4:1.10 php4/sapi/apache2filter/config.m4:1.11
--- php4/sapi/apache2filter/config.m4:1.10 Mon Apr 22 11:25:17 2002
+++ php4/sapi/apache2filter/config.m4 Mon Apr 22 11:37:54 2002
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.10 2002/04/22 15:25:17 markonen Exp $
+dnl $Id: config.m4,v 1.11 2002/04/22 15:37:54 markonen Exp $
dnl
AC_MSG_CHECKING(for Apache 2.0 module support via DSO through APXS)
@@ -43,16 +43,20 @@
*aix*)
APXS_SBINDIR=
$APXS -q SBINDIR
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-bI:$APXS_SBINDIR/httpd.exp"
- PHP_SELECT_SAPI(apache2filter, shared, sapi_apache2.c apache_config.c php_functions.c)
+ PHP_SELECT_SAPI(apache2filter, shared, sapi_apache2.c apache_config.c php_functions.c)
+ INSTALL_IT="$APXS -i -a -n php4 $SAPI_LIBTOOL"
;;
*darwin*)
APXS_HTTPD=$APXS -q SBINDIR/$APXS -q TARGET
MH_BUNDLE_FLAGS="-bundle -bundle_loader $APXS_HTTPD"
PHP_SUBST(MH_BUNDLE_FLAGS)
- PHP_SELECT_SAPI(apache2filter, bundle, sapi_apache2.c apache_config.c php_functions.c)
+ PHP_SELECT_SAPI(apache2filter, bundle, sapi_apache2.c apache_config.c php_functions.c)
+ SAPI_SHARED=libs/libphp4.so
+ INSTALL_IT="$APXS -i -a -n php4 $SAPI_SHARED"
;;
*)
PHP_SELECT_SAPI(apache2filter, shared, sapi_apache2.c apache_config.c php_functions.c)
+ INSTALL_IT="$APXS -i -a -n php4 $SAPI_LIBTOOL"
;;
esac
@@ -62,7 +66,6 @@
fi
PHP_ADD_INCLUDE($APXS_INCLUDEDIR)
- INSTALL_IT="$APXS -i -a -n php4 $SAPI_LIBTOOL"
PHP_BUILD_THREAD_SAFE
AC_MSG_RESULT(yes)
],[