| 1 | --- ./sapi/apache2handler/config.m4 2017-05-09 17:59:42.000000000 +0530 |
| 2 | +++ ./sapi/apache2handler/config.m4 2017-06-08 21:10:39.847173781 +0530 |
| 3 | @@ -111,6 +111,9 @@ |
| 4 | INSTALL_IT="$INSTALL_IT $SAPI_LIBTOOL" |
| 5 | ;; |
| 6 | *) |
| 7 | + PHP_ADD_LIBRARY_WITH_PATH(apr-1, @TERMUX_PREFIX@, PHP7LIB_SHARED_LIBADD) |
| 8 | + PHP_ADD_LIBRARY_WITH_PATH(aprutil-1, @TERMUX_PREFIX@, PHP7LIB_SHARED_LIBADD) |
| 9 | + PHP_SUBST(PHP7LIB_SHARED_LIBADD) |
| 10 | PHP_SELECT_SAPI(apache2handler, shared, mod_php7.c sapi_apache2.c apache_config.c php_functions.c, $APACHE_CFLAGS) |
| 11 | INSTALL_IT="$INSTALL_IT $SAPI_LIBTOOL" |
| 12 | ;; |
| 13 | @@ -122,7 +122,7 @@ |
| 14 | PHP_BUILD_THREAD_SAFE |
| 15 | fi |
| 16 | else |
| 17 | - APACHE_THREADED_MPM=`$APXS_HTTPD -V | grep 'threaded:.*yes'` |
| 18 | + APACHE_THREADED_MPM=true |
| 19 | if test -n "$APACHE_THREADED_MPM"; then |
| 20 | PHP_BUILD_THREAD_SAFE |
| 21 | fi |
| 22 | --- ./configure |
| 23 | +++ ./configure |
| 24 | @@ -6932,7 +6932,7 @@ |
| 25 | |
| 26 | fi |
| 27 | else |
| 28 | - APACHE_THREADED_MPM=`$APXS_HTTPD -V | grep 'threaded:.*yes'` |
| 29 | + APACHE_THREADED_MPM=true |
| 30 | if test -n "$APACHE_THREADED_MPM"; then |
| 31 | |
| 32 | enable_maintainer_zts=yes |
| 33 | --- ./sapi/apache2handler/config.m4 2017-06-14 08:17:02.760779119 +0530 |
| 34 | +++ ../config.m4 2017-06-14 08:25:58.653886169 +0530 |
| 35 | @@ -67,18 +67,9 @@ |
| 36 | fi |
| 37 | |
| 38 | APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR` |
| 39 | - if test -z `$APXS -q SYSCONFDIR`; then |
| 40 | INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \ |
| 41 | $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \ |
| 42 | -i -n php7" |
| 43 | - else |
| 44 | - APXS_SYSCONFDIR='$(INSTALL_ROOT)'`$APXS -q SYSCONFDIR` |
| 45 | - INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \ |
| 46 | - \$(mkinstalldirs) '$APXS_SYSCONFDIR' && \ |
| 47 | - $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \ |
| 48 | - -S SYSCONFDIR='$APXS_SYSCONFDIR' \ |
| 49 | - -i -a -n php7" |
| 50 | - fi |
| 51 | |
| 52 | case $host_alias in |
| 53 | *aix*) |