sniper Fri Jan 20 21:58:17 2006 UTC
Modified files:
/php-src/ext/gd config.m4
Log:
- Fixed bug #Â36110 (missing sanity checks for external build)
http://cvs.php.net/viewcvs.cgi/php-src/ext/gd/config.m4?r1=1.166&r2=1.167&diff_format=u
Index: php-src/ext/gd/config.m4
diff -u php-src/ext/gd/config.m4:1.166 php-src/ext/gd/config.m4:1.167
--- php-src/ext/gd/config.m4:1.166 Tue Dec 27 00:16:05 2005
+++ php-src/ext/gd/config.m4 Fri Jan 20 21:58:17 2006
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.166 2005/12/27 00:16:05 pajoye Exp $
+dnl $Id: config.m4,v 1.167 2006/01/20 21:58:17 sniper Exp $
dnl
dnl
@@ -208,19 +208,23 @@
AC_DEFUN([PHP_GD_CHECK_VERSION],
[
AC_MSG_CHECKING([for GD library version])
- GD_VERSION=`$GDLIB_CONFIG --version`
- AC_DEFINE_UNQUOTED(PHP_GD_VERSION_STRING, "$GD_VERSION", [GD library
version])
+ GD_VERSION=`$GDLIB_CONFIG --version 2> /dev/null`
+
+ if test -z "$GD_VERSION"; then
+ AC_MSG_ERROR([invalid gdlib-config passed to --with-gd!])
+ fi
ac_IFS=[$]IFS
IFS="."
set $GD_VERSION
IFS=$ac_IFS
- GD_VERNUM=`expr [$]1 \* 1000000 + [$]2 \* 1000 + [$]3`
+ GD_VERNUM=`expr [$]1 \* 1000000 + [$]2 \* 1000 + [$]3 2> /dev/null`
if test "$GD_VERNUM" -lt "2000033"; then
AC_MSG_ERROR([GD version 2.0.33 or greater required.])
else
+ AC_DEFINE_UNQUOTED(PHP_GD_VERSION_STRING, "$GD_VERSION", [GD library
version])
AC_MSG_RESULT([$GD_VERSION])
fi
])
@@ -263,7 +267,7 @@
elif test "$PHP_GD" != "no"; then
- if test -x "$PHP_GD"; then
+ if test -f "$PHP_GD" && test -x "$PHP_GD"; then
GDLIB_CONFIG=$PHP_GD
PHP_GD_CHECK_VERSION
else
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php