cvs: php-src / configure.in
| From: | Antony Dovgal | Date: | Mon, 25 Dec 2006 15:40:14 +0000 |
| Subject: | cvs: php-src / configure.in | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-42362@lists.php.net to get a copy of this message | ||
tony2001 Mon Dec 25 15:40:14 2006 UTC
Modified files:
/php-src configure.in
Log:
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.618&r2=1.619&diff_format=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.618 php-src/configure.in:1.619
--- php-src/configure.in:1.618 Tue Dec 12 07:36:37 2006
+++ php-src/configure.in Mon Dec 25 15:40:14 2006
@@ -1,4 +1,4 @@
- ## $Id: configure.in,v 1.618 2006/12/12 07:36:37 tony2001 Exp $ -*- autoconf -*-
+ ## $Id: configure.in,v 1.619 2006/12/25 15:40:14 tony2001 Exp $ -*- autoconf -*-
dnl ## Process this file with autoconf to produce a configure script.
divert(1)
@@ -1052,6 +1052,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_EXTENSION_DIR=
eval echo $EXTENSION_DIR
EXPANDED_LOCALSTATEDIR=eval echo $localstatedir
@@ -1141,6 +1150,7 @@
PHP_SUBST(prefix)
PHP_SUBST(localstatedir)
PHP_SUBST(datadir)
+PHP_SUBST(datarootdir)
PHP_SUBST(sysconfdir)
PHP_SUBST(EXEEXT)