com php-src: Fix bug #68656 Report gd library version: ext/gd/config.m4 ext/gd/gd.c

Commit: faba23015363d608b3e21a120ac323bbd2e729e9 Author: Remi Collet <remi@php.net> Fri, 26 Dec 2014 08:33:21 +0100 Parents: 316f72ce28f345228cc76f7ce537d593d33df765 Branches: PHP-5.6 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=faba23015363d608b3e21a120ac323bbd2e729e9 Log: Fix bug #68656 Report gd library version Bugs: https://bugs.php.net/68656 Changed paths: M ext/gd/config.m4 M ext/gd/gd.c Diff: diff --git a/ext/gd/config..m4 b/ext/gd/config.m4 index 446c242..e643e52 100644 --- a/ext/gd/config.m4 +++ b/ext/gd/config.m4 @@ -251,6 +251,7 @@ AC_DEFUN([PHP_GD_CHECK_VERSION],[ PHP_CHECK_LIBRARY(gd, gdImageCreateFromJpeg, [AC_DEFINE(HAVE_GD_JPG, 1, [ ])], [], [ $GD_SHARED_LIBADD ]) PHP_CHECK_LIBRARY(gd, gdImageCreateFromXpm, [AC_DEFINE(HAVE_GD_XPM, 1, [ ])], [], [ $GD_SHARED_LIBADD ]) PHP_CHECK_LIBRARY(gd, gdImageStringFT, [AC_DEFINE(HAVE_GD_FREETYPE, 1, [ ])], [], [ $GD_SHARED_LIBADD ]) + PHP_CHECK_LIBRARY(gd, gdVersionString, [AC_DEFINE(HAVE_GD_LIBVERSION, 1, [ ])], [], [ $GD_SHARED_LIBADD ]) ]) dnl diff --git a/ext/gd/gd.c b/ext/gd/gd.c index 7bf0b75..1c30357 100644 --- a/ext/gd/gd.c +++ b/ext/gd/gd.c @@ -1289,7 +1289,14 @@ PHP_MINFO_FUNCTION(gd) /* need to use a PHPAPI function here because it is external module in windows */ +#if defined(HAVE_GD_BUNDLED) php_info_print_table_row(2, "GD Version", PHP_GD_VERSION_STRING); +#else + php_info_print_table_row(2, "GD headers Version", PHP_GD_VERSION_STRING); +#if defined(HAVE_GD_LIBVERSION) + php_info_print_table_row(2, "GD library Version", gdVersionString()); +#endif +#endif #ifdef ENABLE_GD_TTF php_info_print_table_row(2, "FreeType Support", "enabled");