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