]> granicus.if.org Git - php/commitdiff
- always add libgd/
authorPierre Joye <pajoye@php.net>
Tue, 26 May 2009 08:53:13 +0000 (08:53 +0000)
committerPierre Joye <pajoye@php.net>
Tue, 26 May 2009 08:53:13 +0000 (08:53 +0000)
ext/gd/config.m4

index 70bf7fe180f5192565a96ce9500490b125d3affa..151881b72bbddec6ad69c080deb52afbccd1125e 100644 (file)
@@ -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 ])