com php-src: Allow PHP 7 to install in Apache 2 on OS X: sapi/apache2handler/config.m4
| From: | Christopher Jones | Date: | Fri, 29 Aug 2014 15:47:10 +0000 |
| Subject: | com php-src: Allow PHP 7 to install in Apache 2 on OS X: sapi/apache2handler/config.m4 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-81302@lists.php.net to get a copy of this message | ||
Commit: 88099a0a27b8c95cf665f6c932672d2b25d305c4
Author: Christopher Jones <sixd@php.net> Fri, 29 Aug 2014 08:47:10 -0700
Parents: d3fb1859f0db44c19b7766a8f6dda6b212ce9ce6
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=88099a0a27b8c95cf665f6c932672d2b25d305c4
Log:
Allow PHP 7 to install in Apache 2 on OS X
This fixes the fundamental part of #67910. The complete change from
php5 -> php7 in sapi/* still needs to be done.
Bugs:
https://bugs.php.net/67910
Changed paths:
M sapi/apache2handler/config.m4
Diff:
diff --git a/sapi/apache2handler/config.m4 b/sapi/apache2handler/config.m4
index 02f8a0b..a0080a6 100644
--- a/sapi/apache2handler/config.m4
+++ b/sapi/apache2handler/config.m4
@@ -100,7 +100,7 @@ if test "$PHP_APXS2" != "no"; then
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)
- SAPI_SHARED=libs/libphp5.so
+ SAPI_SHARED=libs/libphp7.so
INSTALL_IT="$INSTALL_IT $SAPI_SHARED"
;;
*beos*)