pajoye          Tue May 26 08:53:13 2009 UTC

  Modified files:              (Branch: PHP_5_3)
    /php-src/ext/gd     config.m4 
  Log:
  - always add libgd/
  
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/config.m4?r1=1.154.2.1.2.6.2.3&r2=1.154.2.1.2.6.2.4&diff_format=u
Index: php-src/ext/gd/config.m4
diff -u php-src/ext/gd/config.m4:1.154.2.1.2.6.2.3 
php-src/ext/gd/config.m4:1.154.2.1.2.6.2.4
--- php-src/ext/gd/config.m4:1.154.2.1.2.6.2.3  Tue Apr  7 09:26:22 2009
+++ php-src/ext/gd/config.m4    Tue May 26 08:53:13 2009
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.154.2.1.2.6.2.3 2009/04/07 09:26:22 pajoye Exp $
+dnl $Id: config.m4,v 1.154.2.1.2.6.2.4 2009/05/26 08:53:13 pajoye Exp $
 dnl
 
 dnl
@@ -401,9 +401,10 @@
 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 @@
     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 ])



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to