- MFH Fix dependency checks

This commit is contained in:
Marcus Boerger 2006-02-28 12:26:03 +00:00
parent c4b81d8720
commit 477f503b9e

View file

@ -1000,8 +1000,7 @@ AC_DEFUN([PHP_WITH_SHARED],[
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 @@ dnl
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 @@ You either need to build $1 shared or build $2 statically for the
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.