32 lines
1.3 KiB
Diff
32 lines
1.3 KiB
Diff
|
diff -uNr php-7.4.1/sapi/apache2handler/config.m4 php-7.4.1.mod/sapi/apache2handler/config.m4
|
||
|
|
--- php-7.4.1/sapi/apache2handler/config.m4 2019-12-17 18:35:58.000000000 +0200
|
||
|
|
+++ php-7.4.1.mod/sapi/apache2handler/config.m4 2020-01-02 01:08:05.368395459 +0200
|
||
|
|
@@ -64,18 +64,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*)
|
||
|
|
@@ -100,6 +91,8 @@
|
||
|
|
INSTALL_IT="$INSTALL_IT $SAPI_SHARED"
|
||
|
|
;;
|
||
|
|
*)
|
||
|
|
+ EXTRA_LDFLAGS="`$APR_CONFIG --ldflags --link-ld --libs`"
|
||
|
|
+ EXTRA_LDFLAGS="`$APU_CONFIG --ldflags --link-ld --libs` $EXTRA_LDFLAGS"
|
||
|
|
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"
|
||
|
|
;;
|