MFH: fix bug #39890 (using autoconf 2.6x and --with-layout=GNU breaks PEAR install...

diff --git a/NEWS b/NEWS
index 84b1ff0d08914dd314e0df7fbebf6217bffdca2f..07571a0a2763a9a78a60f1fba5ef7652e4e639ab 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -22,6 +22,8 @@ PHP                                                                        NEWS
 - Fixed bug #39903 (Notice message when executing __halt_compiler() more than 
   once). (Tony)
 - Fixed bug #39898 (FILTER_VALIDATE_URL validates \r\n\t etc). (Ilia)
+- Fixed bug #39890 (using autoconf 2.6x and --with-layout=GNU breaks PEAR 
+  install path). (Tony)
 - Fixed bug #39884 (ReflectionParameter::getClass() throws exception for type
   hint self). (thekid at php dot net)
 - Fixed bug #39873 (number_format() breaks with locale & decimal points).

diff --git a/configure.in b/configure.in
index 47065dc6ad0678e466e4d559bf2382c5aac28766..885beba409cc9d197b10e16d1ce2cf5f664b0ba1 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1100,6 +1100,15 @@ if test -z "$EXTENSION_DIR"; then
   fi
 fi
 
+case $PHP_LAYOUT in
+  GNU)
+    datarootdir=$prefix/share
+    ;;
+  *)
+    datarootdir=$prefix/php
+    ;;
+esac
+
 dnl Expand all directory names for use in macros/constants
 EXPANDED_PEAR_INSTALLDIR=`eval echo $PEAR_INSTALLDIR`
 EXPANDED_EXTENSION_DIR=`eval echo $EXTENSION_DIR`
@@ -1191,6 +1200,7 @@ PHP_SUBST(phptempdir)
 PHP_SUBST(prefix)
 PHP_SUBST(localstatedir)
 PHP_SUBST(datadir)
+PHP_SUBST(datarootdir)
 PHP_SUBST(sysconfdir)
 
 PHP_SUBST(EXEEXT)