| 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 | @@ -67,18 +67,9 @@ |
| 4 | fi |
| 5 | |
| 6 | APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR` |
| 7 | - if test -z `$APXS -q SYSCONFDIR`; then |
| 8 | INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \ |
| 9 | $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \ |
| 10 | -i -n php7" |
| 11 | - else |
| 12 | - APXS_SYSCONFDIR='$(INSTALL_ROOT)'`$APXS -q SYSCONFDIR` |
| 13 | - INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \ |
| 14 | - \$(mkinstalldirs) '$APXS_SYSCONFDIR' && \ |
| 15 | - $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \ |
| 16 | - -S SYSCONFDIR='$APXS_SYSCONFDIR' \ |
| 17 | - -i -a -n php7" |
| 18 | - fi |
| 19 | |
| 20 | case $host_alias in |
| 21 | *aix*) |
| 22 | @@ -122,7 +122,7 @@ |
| 23 | PHP_BUILD_THREAD_SAFE |
| 24 | fi |
| 25 | else |
| 26 | - APACHE_THREADED_MPM=`$APXS_HTTPD -V | grep 'threaded:.*yes'` |
| 27 | + APACHE_THREADED_MPM=true |
| 28 | if test -n "$APACHE_THREADED_MPM"; then |
| 29 | PHP_BUILD_THREAD_SAFE |
| 30 | fi |