diff options
| author | Remi Collet <remi@php.net> | 2013-05-04 20:36:32 +0200 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2013-05-04 20:36:32 +0200 |
| commit | 2ab270011dfcbfea8e39374f546d6ced653059b5 (patch) | |
| tree | 3a1e93ec360a64973d557222a2474978cacae3ad /ext/gd/config.m4 | |
| parent | d981c191d452fe1f95ac31fcea366bc0c770b4b7 (diff) | |
| download | php-git-2ab270011dfcbfea8e39374f546d6ced653059b5.tar.gz | |
gd: fix typo and cleanups
Diffstat (limited to 'ext/gd/config.m4')
| -rw-r--r-- | ext/gd/config.m4 | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/ext/gd/config.m4 b/ext/gd/config.m4 index 5d02bed785..1328b82dcb 100644 --- a/ext/gd/config.m4 +++ b/ext/gd/config.m4 @@ -252,11 +252,11 @@ AC_DEFUN([PHP_GD_JISX0208],[ ]) AC_DEFUN([PHP_GD_CHECK_VERSION],[ - PHP_CHECK_LIBRARY(gd, gdImageCreateFromPng, [AC_DEFINE(HAVE_GD_PNG, 1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ]) - PHP_CHECK_LIBRARY(gd, gdImageCreateFromWebp, [AC_DEFINE(HAVE_GD_WEBP, 1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ]) - PHP_CHECK_LIBRARY(gd, gdImageCreateFromJpeg, [AC_DEFINE(HAVE_GD_JPG, 1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ]) - PHP_CHECK_LIBRARY(gd, gdImageCreateFromXpm, [AC_DEFINE(HAVE_GD_XPM, 1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ]) - PHP_CHECK_LIBRARY(gd, gdImageStringFT, [AC_DEFINE(HAVE_GD_FREETYPE, 1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ]) + PHP_CHECK_LIBRARY(gd, gdImageCreateFromPng, [AC_DEFINE(HAVE_GD_PNG, 1, [ ])], [], [ $GD_SHARED_LIBADD ]) + PHP_CHECK_LIBRARY(gd, gdImageCreateFromWebp, [AC_DEFINE(HAVE_GD_WEBP, 1, [ ])], [], [ $GD_SHARED_LIBADD ]) + 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 ]) ]) dnl @@ -366,9 +366,8 @@ dnl Library path ],[ AC_MSG_ERROR([Unable to find libgd.(a|so) >= 2.1.0 anywhere under $PHP_GD]) ],[ - -L$GD_PHP/$PHP_LIBDIR + -L$PHP_GD/$PHP_LIBDIR ]) - PHP_GD_CHECK_VERSION PHP_EXPAND_PATH($GD_INCLUDE, GD_INCLUDE) @@ -395,7 +394,7 @@ if test "$PHP_GD" != "no"; then PHP_ADD_INCLUDE($GD_INCLUDE) PHP_CHECK_LIBRARY(gd, gdImageCreate, [], [ AC_MSG_ERROR([GD build test failed. Please check the config.log for details.]) - ], [ -L$GD_LIB $GD_SHARED_LIBADD ]) + ], [ $GD_SHARED_LIBADD ]) fi PHP_INSTALL_HEADERS([$GD_HEADER_DIRS]) |