78eca501f4
* php: handle php-apache properly * fix other modules linking against apr * fix php including httpd.conf * php: update revision for php-apache
54 lines
1.8 KiB
Diff
54 lines
1.8 KiB
Diff
--- ./sapi/apache2handler/config.m4 2017-05-09 17:59:42.000000000 +0530
|
|
+++ ./sapi/apache2handler/config.m4 2017-06-08 21:10:39.847173781 +0530
|
|
@@ -111,6 +111,9 @@
|
|
INSTALL_IT="$INSTALL_IT $SAPI_LIBTOOL"
|
|
;;
|
|
*)
|
|
+ PHP_ADD_LIBRARY_WITH_PATH(apr-1, @TERMUX_PREFIX@, PHP7LIB_SHARED_LIBADD)
|
|
+ PHP_ADD_LIBRARY_WITH_PATH(aprutil-1, @TERMUX_PREFIX@, PHP7LIB_SHARED_LIBADD)
|
|
+ PHP_SUBST(PHP7LIB_SHARED_LIBADD)
|
|
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"
|
|
;;
|
|
@@ -122,7 +122,7 @@
|
|
PHP_BUILD_THREAD_SAFE
|
|
fi
|
|
else
|
|
- APACHE_THREADED_MPM=`$APXS_HTTPD -V | grep 'threaded:.*yes'`
|
|
+ APACHE_THREADED_MPM=true
|
|
if test -n "$APACHE_THREADED_MPM"; then
|
|
PHP_BUILD_THREAD_SAFE
|
|
fi
|
|
--- ./configure
|
|
+++ ./configure
|
|
@@ -6932,7 +6932,7 @@
|
|
|
|
fi
|
|
else
|
|
- APACHE_THREADED_MPM=`$APXS_HTTPD -V | grep 'threaded:.*yes'`
|
|
+ APACHE_THREADED_MPM=true
|
|
if test -n "$APACHE_THREADED_MPM"; then
|
|
|
|
enable_maintainer_zts=yes
|
|
--- ./sapi/apache2handler/config.m4 2017-06-14 08:17:02.760779119 +0530
|
|
+++ ../config.m4 2017-06-14 08:25:58.653886169 +0530
|
|
@@ -67,18 +67,9 @@
|
|
fi
|
|
|
|
APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR`
|
|
- if test -z `$APXS -q SYSCONFDIR`; then
|
|
INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \
|
|
$APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
|
|
-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 php7"
|
|
- fi
|
|
|
|
case $host_alias in
|
|
*aix*)
|