1diff -ru a/ext/gettext/config.m4 b/ext/gettext/config.m4
2--- a/ext/gettext/config.m4 2018-11-07 15:35:26.000000000 +0000
3+++ b/ext/gettext/config.m4 2018-11-27 00:33:07.000000000 +0000
4@@ -6,9 +6,7 @@
5 [ --with-gettext[=DIR] Include GNU gettext support])
6
7 if test "$PHP_GETTEXT" != "no"; then
8- for i in $PHP_GETTEXT /usr/local /usr; do
9- test -r $i/include/libintl.h && GETTEXT_DIR=$i && break
10- done
11+ GETTEXT_DIR=$PHP_GETTEXT
12
13 if test -z "$GETTEXT_DIR"; then
14 AC_MSG_ERROR(Cannot locate header file libintl.h)
15diff -ru a/sapi/apache2handler/config.m4 b/sapi/apache2handler/config.m4
16--- a/sapi/apache2handler/config.m4 2018-11-07 15:35:23.000000000 +0000
17+++ b/sapi/apache2handler/config.m4 2018-11-27 00:32:28.000000000 +0000
18@@ -66,7 +66,7 @@
19 AC_MSG_ERROR([Please note that Apache version >= 2.0.44 is required])
20 fi
21
22- APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR`
23+ APXS_LIBEXECDIR="$prefix/modules"
24 if test -z `$APXS -q SYSCONFDIR`; then
25 INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \
26 $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \