helly Tue Feb 28 12:26:03 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-src acinclude.m4
Log:
- MFH Fix dependency checks
http://cvs.php.net/viewcvs.cgi/php-src/acinclude.m4?r1=1.332.2.9&r2=1.332.2.10&diff_format=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.332.2.9 php-src/acinclude.m4:1.332.2.10
--- php-src/acinclude.m4:1.332.2.9 Sat Dec 24 11:38:05 2005
+++ php-src/acinclude.m4 Tue Feb 28 12:26:03 2006
@@ -1,5 +1,5 @@
dnl
-dnl $Id: acinclude.m4,v 1.332.2.9 2005/12/24 11:38:05 helly Exp $
+dnl $Id: acinclude.m4,v 1.332.2.10 2006/02/28 12:26:03 helly Exp $
dnl
dnl This file contains local autoconf functions.
dnl
@@ -1000,8 +1000,7 @@
dnl
dnl PHP_ADD_EXTENSION_DEP(extname, depends [, depconf])
dnl
-dnl This macro is currently a placeholder in the config.m4 file
-dnl it is scanned by genif.sh when it builds the internal functions
+dnl This macro is scanned by genif.sh when it builds the internal functions
dnl list, so that modules can be init'd in the correct order
dnl $1 = name of extension, $2 = extension upon which it depends
dnl $3 = optional: if true, it's ok for $2 to have not been configured
@@ -1013,6 +1012,7 @@
AC_DEFUN([PHP_ADD_EXTENSION_DEP], [
am_i_shared=$[PHP_]translit($1,a-z_-,A-Z__)[_SHARED]
is_it_shared=$[PHP_]translit($2,a-z_-,A-Z__)[_SHARED]
+ is_it_enabled=$[PHP_]translit($2,a-z_-,A-Z__)
if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
AC_MSG_ERROR([
You've configured extension $1 to build statically, but it
@@ -1021,7 +1021,7 @@
build to be successful.
])
fi
- if test "x$is_it_shared" = "x" && test "x$3" != "xtrue"; then
+ if test "x$is_it_enabled" = "xno" && test "x$3" != "xtrue"; then
AC_MSG_ERROR([
You've configured extension $1, which depends on extension $2,
but you've either not enabled $2, or have disabled it.
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
