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

tony2001 Mon Dec 25 15:42:36 2006 UTC Modified files: (Branch: PHP_4_4) /php-src configure.in NEWS 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/configure.in?r1=1.396.2.164.2.31&r2=1.396.2.164.2.32&diff_format=u Index: php-src/configure.in diff -u php-src/configure.in:1.396.2.164.2.31 php-src/configure.in:1.396.2.164.2.32 --- php-src/configure.in:1.396.2.164.2.31 Thu Nov 30 22:13:57 2006 +++ php-src/configure.in Mon Dec 25 15:42:35 2006 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.396.2.164.2.31 2006/11/30 22:13:57 tony2001 Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.396.2.164.2.32 2006/12/25 15:42:35 tony2001 Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -1045,6 +1045,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 @@ -1135,6 +1144,7 @@ PHP_SUBST(prefix) PHP_SUBST(localstatedir) PHP_SUBST(datadir) +PHP_SUBST(datarootdir) PHP_SUBST(sysconfdir) PHP_SUBST(AWK) http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.1247.2.920.2.178&r2=1.1247.2.920.2.179&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.1247.2.920.2.178 php-src/NEWS:1.1247.2.920.2.179 --- php-src/NEWS:1.1247.2.920.2.178 Fri Dec 1 17:11:07 2006 +++ php-src/NEWS Mon Dec 25 15:42:35 2006 @@ -5,6 +5,8 @@ indexing the page. (Ilia) - Updated PCRE to version 6.7. (Ilia) - Fixed missing open_basedir check inside chdir() function. (Ilia) +- Fixed bug #39890 (using autoconf 2.6x and --with-layout=GNU breaks PEAR + install path). (Tony) - Fixed bug #39653 (ext/dba doesn't check for db-4.5 and db-4.4 when db4 support is enabled). (Tony) - Fixed bug #39583 (ftp_put() does not change transfer mode to ASCII). (Tony)