Commit:    b48e163c35f3d56e151946317e982991199d597a
Author:    Anatoliy Belsky <a...@php.net>         Wed, 24 Oct 2012 10:26:27 
+0200
Parents:   dbb72de6c75796803ed6ed103763a12eebc9e78e
Branches:  PHP-5.3 PHP-5.4 master

Link:       
http://git.php.net/?p=php-src.git;a=commitdiff;h=b48e163c35f3d56e151946317e982991199d597a

Log:
enabled libxpm for gd on windows

Changed paths:
  M  ext/gd/config.w32


Diff:
diff --git a/ext/gd/config.w32 b/ext/gd/config.w32
index 8f1c13f..9b5eb7b 100644
--- a/ext/gd/config.w32
+++ b/ext/gd/config.w32
@@ -13,7 +13,9 @@ if (PHP_GD != "no") {
                (CHECK_LIB("libiconv_a.lib;libiconv.lib", "gd", PHP_GD) || 
CHECK_LIB("iconv_a.lib;iconv.lib", "gd", PHP_GD)) &&
                 CHECK_HEADER_ADD_INCLUDE("iconv.h", "CFLAGS_GD", PHP_GD) && 
                (((PHP_ZLIB=="no") && (CHECK_LIB("zlib_a.lib;zlib.lib", "gd", 
PHP_GD) )) || 
-                       (PHP_ZLIB_SHARED && CHECK_LIB("zlib.lib", "gd", 
PHP_GD)) || (PHP_ZLIB == "yes" && (!PHP_ZLIB_SHARED)))
+                       (PHP_ZLIB_SHARED && CHECK_LIB("zlib.lib", "gd", 
PHP_GD)) || (PHP_ZLIB == "yes" && (!PHP_ZLIB_SHARED))) &&
+               CHECK_LIB("libXpm_a.lib", "gd", PHP_GD) &&
+               CHECK_HEADER_ADD_INCLUDE("xpm.h", "CFLAGS_GD", PHP_GD + ";" + 
PHP_PHP_BUILD + "\\include\\X11")
                ) {
                if (PHP_T1LIB != "no") {
                        if (CHECK_LIB("T1_StaticMD.lib", "gd", PHP_GD) &&
@@ -54,6 +56,7 @@ if (PHP_GD != "no") {
 /D HAVE_GD_STRINGTTF=1  \
 /D HAVE_GD_WBMP  \
 /D HAVE_GD_XBM  \
+/D HAVE_GD_XPM  \
 /D HAVE_LIBFREETYPE=1  \
 /D HAVE_LIBGD13=1  \
 /D HAVE_LIBGD15=1  \
@@ -61,6 +64,7 @@ if (PHP_GD != "no") {
 /D HAVE_LIBGD204=1 \
 /D HAVE_LIBJPEG  \
 /D HAVE_LIBPNG  \
+/D HAVE_XPM  \
 /D HAVE_COLORCLOSESTHWB  \
 /D USE_GD_IMGSTRTTF  \
 /D USE_GD_IOCTX \


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

Reply via email to