cvs: php-src(PHP_5_2) / NEWS configure.in

tony2001 Mon Dec 25 15:41:57 2006 UTC Modified files: (Branch: PHP_5_2) /php-src NEWS configure.in Log: MFH: fix bug #39890 (using autoconf 2.6x and --with-layout=GNU breaks PEAR install path) http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.458&r2=1.2027.2.547.2.459&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.458 php-src/NEWS:1.2027.2.547.2.459 --- php-src/NEWS:1.2027.2.547.2.458 Mon Dec 25 14:16:26 2006 +++ php-src/NEWS Mon Dec 25 15:41:56 2006 @@ -22,6 +22,8 @@ - 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). http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.579.2.52.2.32&r2=1.579.2.52.2.33&diff_format=u Index: php-src/configure.in diff -u php-src/configure.in:1.579.2.52.2.32 php-src/configure.in:1.579.2.52.2.33 --- php-src/configure.in:1.579.2.52.2.32 Fri Dec 15 01:22:35 2006 +++ php-src/configure.in Mon Dec 25 15:41:56 2006 @@ -1,4 +1,4 @@ - ## $Id: configure.in,v 1.579.2.52.2.32 2006/12/15 01:22:35 iliaa Exp $ -*- autoconf -*- + ## $Id: configure.in,v 1.579.2.52.2.33 2006/12/25 15:41:56 tony2001 Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -1100,6 +1100,15 @@ 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(prefix) PHP_SUBST(localstatedir) PHP_SUBST(datadir) +PHP_SUBST(datarootdir) PHP_SUBST(sysconfdir) PHP_SUBST(EXEEXT)