cvs: php4 /sapi/apache2filter config.m4
| From: | Jani Taskinen | Date: | Fri, 28 Jun 2002 09:01:57 +0000 |
| Subject: | cvs: php4 /sapi/apache2filter config.m4 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-12593@lists.php.net to get a copy of this message | ||
sniper Fri Jun 28 05:01:57 2002 EDT
Modified files:
/php4/sapi/apache2filter config.m4
Log:
Fixed bug: #17491 (honor INSTALL_ROOT)
Index: php4/sapi/apache2filter/config.m4
diff -u php4/sapi/apache2filter/config.m4:1.18 php4/sapi/apache2filter/config.m4:1.19
--- php4/sapi/apache2filter/config.m4:1.18 Mon Jun 24 10:51:01 2002
+++ php4/sapi/apache2filter/config.m4 Fri Jun 28 05:01:56 2002
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.18 2002/06/24 14:51:01 rasmus Exp $
+dnl $Id: config.m4,v 1.19 2002/06/28 09:01:56 sniper Exp $
dnl
AC_MSG_CHECKING(for Apache 2.0 module support via DSO through APXS)
@@ -50,12 +50,14 @@
AC_MSG_ERROR([Please note that Apache version >= 2.0.35 is required.])
fi
+ INSTALL_IT="\$(mkinstalldirs) \"\$(INSTALL_ROOT)
$APXS -q LIBEXECDIR\"
&& $APXS -S LIBEXECDIR=\"\$(INSTALL_ROOT)$APXS -q LIBEXECDIR\" -i
[ -d \$APXS -q SYSCONFDIR\ ] || echo -a -n php4"
+
case $host_alias in
*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)
- INSTALL_IT="$APXS -i -a -n php4 $SAPI_LIBTOOL"
+ INSTALL_IT="$INSTALL_IT $SAPI_LIBTOOL"
;;
*darwin*)
dnl When using bundles on Darwin, we must resolve all symbols. However,
@@ -73,11 +75,11 @@
PHP_SUBST(MH_BUNDLE_FLAGS)
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"
+ INSTALL_IT="$INSTALL_IT $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"
+ INSTALL_IT="$INSTALL_IT $SAPI_LIBTOOL"
;;
esac