diff options
| author | Pierre Joye <pajoye@php.net> | 2009-05-26 08:53:13 +0000 |
|---|---|---|
| committer | Pierre Joye <pajoye@php.net> | 2009-05-26 08:53:13 +0000 |
| commit | c559d4fb300db664f8f107bfef3b927d191871d3 (patch) | |
| tree | 0b1545824e3e6f607c75bdb1731ead3b39d3dab8 | |
| parent | d8b76a84116a646cb7b28f5c28a705a19ccb361f (diff) | |
| download | php-git-c559d4fb300db664f8f107bfef3b927d191871d3.tar.gz | |
- always add libgd/
| -rw-r--r-- | ext/gd/config.m4 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/gd/config.m4 b/ext/gd/config.m4 index 70bf7fe180..151881b72b 100644 --- a/ext/gd/config.m4 +++ b/ext/gd/config.m4 @@ -401,9 +401,10 @@ dnl if test "$PHP_GD" != "no"; then PHP_NEW_EXTENSION(gd, gd.c $extra_sources, $ext_shared,, \\$(GDLIB_CFLAGS)) + PHP_ADD_BUILD_DIR($ext_builddir/libgd) + if test "$GD_MODULE_TYPE" = "builtin"; then GDLIB_CFLAGS="-I$ext_srcdir/libgd $GDLIB_CFLAGS" - PHP_ADD_BUILD_DIR($ext_builddir/libgd) GD_HEADER_DIRS="ext/gd/ ext/gd/libgd/" PHP_TEST_BUILD(foobar, [], [ @@ -413,7 +414,6 @@ if test "$PHP_GD" != "no"; then GD_HEADER_DIRS="ext/gd/" GDLIB_CFLAGS="-I$GD_INCLUDE $GDLIB_CFLAGS" 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 ]) |