com php-src: Update config.m4: sapi/apache2handler/config.m4
| From: | Anatol Belski | Date: | Thu, 18 Sep 2014 18:43:23 +0000 |
| Subject: | com php-src: Update config.m4: sapi/apache2handler/config.m4 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-81737@lists.php.net to get a copy of this message | ||
Commit: 51e343d5d74e6e1fc93eaf608d75f50c088a9335
Author: jfha73 <jfha73@gmail.com> Thu, 18 Sep 2014 13:19:20 -0400
Committer: Anatol Belski <ab@php.net> Thu, 18 Sep 2014 20:43:23 +0200
Parents: eed9fdb98153877217edc017e0f99f5341ec8b5f
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=51e343d5d74e6e1fc93eaf608d75f50c088a9335
Log:
Update config.m4
Change of php5 for php7
Changed paths:
M sapi/apache2handler/config.m4
Diff:
diff --git a/sapi/apache2handler/config.m4 b/sapi/apache2handler/config.m4
index a0080a6..59e1739 100644
--- a/sapi/apache2handler/config.m4
+++ b/sapi/apache2handler/config.m4
@@ -70,20 +70,20 @@ if test "$PHP_APXS2" != "no"; then
if test -z
$APXS -q SYSCONFDIR; then
INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \
$APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
- -i -n php5"
+ -i -n php7"
else
APXS_SYSCONFDIR='$(INSTALL_ROOT)'$APXS -q SYSCONFDIR
INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \
\$(mkinstalldirs) '$APXS_SYSCONFDIR' && \
$APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
-S SYSCONFDIR='$APXS_SYSCONFDIR' \
- -i -a -n php5"
+ -i -a -n php7"
fi
case $host_alias in
*aix*)
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-brtl -Wl,-bI:$APXS_LIBEXECDIR/httpd.exp"
- PHP_SELECT_SAPI(apache2handler, shared, mod_php5.c sapi_apache2.c apache_config.c
php_functions.c, $APACHE_CFLAGS)
+ PHP_SELECT_SAPI(apache2handler, shared, mod_php7.c sapi_apache2.c apache_config.c
php_functions.c, $APACHE_CFLAGS)
INSTALL_IT="$INSTALL_IT $SAPI_LIBTOOL"
;;
*darwin*)
@@ -99,7 +99,7 @@ if test "$PHP_APXS2" != "no"; then
fi
MH_BUNDLE_FLAGS="-bundle -bundle_loader $APXS_HTTPD $MH_BUNDLE_FLAGS"
PHP_SUBST(MH_BUNDLE_FLAGS)
- PHP_SELECT_SAPI(apache2handler, bundle, mod_php5.c sapi_apache2.c apache_config.c
php_functions.c, $APACHE_CFLAGS)
+ PHP_SELECT_SAPI(apache2handler, bundle, mod_php7.c sapi_apache2.c apache_config.c
php_functions.c, $APACHE_CFLAGS)
SAPI_SHARED=libs/libphp7.so
INSTALL_IT="$INSTALL_IT $SAPI_SHARED"
;;
@@ -107,11 +107,11 @@ if test "$PHP_APXS2" != "no"; then
if test -f _APP_; then rm _APP_; fi
ln -s $APXS_BINDIR/httpd _APP_
EXTRA_LIBS="$EXTRA_LIBS _APP_"
- PHP_SELECT_SAPI(apache2handler, shared, mod_php5.c sapi_apache2.c apache_config.c
php_functions.c, $APACHE_CFLAGS)
+ PHP_SELECT_SAPI(apache2handler, shared, mod_php7.c sapi_apache2.c apache_config.c
php_functions.c, $APACHE_CFLAGS)
INSTALL_IT="$INSTALL_IT $SAPI_LIBTOOL"
;;
*)
- PHP_SELECT_SAPI(apache2handler, shared, mod_php5.c sapi_apache2.c apache_config.c
php_functions.c, $APACHE_CFLAGS)
+ PHP_SELECT_SAPI(apache2handler, shared, mod_php7.c sapi_apache2.c apache_config.c
php_functions.c, $APACHE_CFLAGS)
INSTALL_IT="$INSTALL_IT $SAPI_LIBTOOL"
;;
esac