diff options
| author | Remi Collet <remi@php.net> | 2014-12-26 08:35:31 +0100 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2014-12-26 08:35:31 +0100 |
| commit | af11f818fbee33cb3e4622c53847216ac3980911 (patch) | |
| tree | cfd12eefd511c3b92cdd9540634608ce5e7049bc | |
| parent | 898cae2e636e77c0e8adef0d9eed35bca838d950 (diff) | |
| parent | 76d6c4f9ec37558f5aa95e2325e5b9360bfe129e (diff) | |
| download | php-git-af11f818fbee33cb3e4622c53847216ac3980911.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
NEWS
Fix bug #68656 Report gd library version
| -rw-r--r-- | ext/gd/config.m4 | 1 | ||||
| -rw-r--r-- | ext/gd/gd.c | 7 |
2 files changed, 8 insertions, 0 deletions
diff --git a/ext/gd/config.m4 b/ext/gd/config.m4 index 446c2425ae..e643e52736 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 def17b8df3..5a88acdb4a 100644 --- a/ext/gd/gd.c +++ b/ext/gd/gd.c @@ -1288,7 +1288,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"); |