cvs: php4 / configure.in
| From: | Stig Bakken | Date: | Sun, 06 May 2001 23:16:33 +0000 |
| Subject: | cvs: php4 / configure.in | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-5579@lists.php.net to get a copy of this message | ||
ssb Sun May 6 16:16:33 2001 EDT
Modified files:
/php4 configure.in
Log:
use $PHP_LAYOUT, not $libdir, to determine the extension install layout
Index: php4/configure.in
diff -u php4/configure.in:1.239 php4/configure.in:1.240
--- php4/configure.in:1.239 Sun May 6 16:11:58 2001
+++ php4/configure.in Sun May 6 16:16:33 2001
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.239 2001/05/06 23:11:58 ssb Exp $ -*- sh -*-
+dnl ## $Id: configure.in,v 1.240 2001/05/06 23:16:33 ssb Exp $ -*- sh -*-
dnl ## Process this file with autoconf to produce a configure script.
divert(1)
@@ -479,8 +479,12 @@
if test "x$PHP_CONFIG_FILE_PATH" = "xDEFAULT"; then
case $PHP_LAYOUT in
- GNU) PHP_CONFIG_FILE_PATH="$sysconfdir";;
- *) PHP_CONFIG_FILE_PATH="$libdir";;
+ GNU)
+ PHP_CONFIG_FILE_PATH="$sysconfdir"
+ oldstyleextdir=no;;
+ *)
+ PHP_CONFIG_FILE_PATH="$libdir"
+ oldstyleextdir=yes;;
esac
fi
@@ -710,13 +714,10 @@
test "$prefix" = "NONE" && prefix="/usr/local"
test "$exec_prefix" = "NONE" && exec_prefix='${prefix}'
+
case $libdir in
'${exec_prefix}/lib')
libdir="$libdir/php"
- oldstyleextdir=yes
- ;;
- *)
- oldstyleextdir=no
;;
esac
case $datadir in