Something went wrong. Try again.
Nix Packages collection & NixOS github.com/NixOS/nixpkgs
Something went wrong. Try again.
1.2 kB · 28 lines
at master
1234567891011121314151617181920212223242526272829diff --git a/ext/gettext/config.m4 b/ext/gettext/config.m4index 6235658..93a8b96 100644--- a/ext/gettext/config.m4+++ b/ext/gettext/config.m4@@ -4,9 +4,7 @@ PHP_ARG_WITH([gettext], [Include GNU gettext support])]) if test "$PHP_GETTEXT" != "no"; then- for i in $PHP_GETTEXT /usr/local /usr; do- AS_IF([test -r $i/include/libintl.h], [GETTEXT_DIR=$i; break;])- done+ GETTEXT_DIR=$PHP_GETTEXT AS_VAR_IF([GETTEXT_DIR],, [AC_MSG_ERROR([Cannot locate header file libintl.h])])diff --git a/sapi/apache2handler/config.m4 b/sapi/apache2handler/config.m4index 3001a4d..7e1e6c3 100644--- a/sapi/apache2handler/config.m4+++ b/sapi/apache2handler/config.m4@@ -77,7 +77,7 @@ if test "$PHP_APXS2" != "no"; then AS_VERSION_COMPARE([$APACHE_VERSION], [2.4.0], [AC_MSG_ERROR([Please note that Apache version >= 2.4 is required])]) - APXS_LIBEXECDIR='$(INSTALL_ROOT)'$($APXS -q LIBEXECDIR)+ APXS_LIBEXECDIR="$prefix/modules" if test -z $($APXS -q SYSCONFDIR) || test "$PHP_APACHE2_CONF" = "no"; then INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \ $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \