Diff for /embedaddon/php/ext/gd/config.w32 between versions 1.1.1.2 and 1.1.1.3

version 1.1.1.2, 2012/05/29 12:34:39 version 1.1.1.3, 2013/07/22 01:31:50
Line 15  if (PHP_GD != "no") { Line 15  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_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) &&                    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=="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 (PHP_T1LIB != "no") {
                         if (CHECK_LIB("T1_StaticMD.lib", "gd", PHP_GD) &&                          if (CHECK_LIB("T1_StaticMD.lib", "gd", PHP_GD) &&
Line 56  if (PHP_GD != "no") { Line 58  if (PHP_GD != "no") {
 /D HAVE_GD_STRINGTTF=1  \  /D HAVE_GD_STRINGTTF=1  \
 /D HAVE_GD_WBMP  \  /D HAVE_GD_WBMP  \
 /D HAVE_GD_XBM  \  /D HAVE_GD_XBM  \
   /D HAVE_GD_XPM  \
 /D HAVE_GD_WEBP \  /D HAVE_GD_WEBP \
 /D HAVE_LIBFREETYPE=1  \  /D HAVE_LIBFREETYPE=1  \
 /D HAVE_LIBGD13=1  \  /D HAVE_LIBGD13=1  \
Line 65  if (PHP_GD != "no") { Line 68  if (PHP_GD != "no") {
 /D HAVE_LIBJPEG  \  /D HAVE_LIBJPEG  \
 /D HAVE_LIBVPX \  /D HAVE_LIBVPX \
 /D HAVE_LIBPNG  \  /D HAVE_LIBPNG  \
   /D HAVE_XPM  \
 /D HAVE_COLORCLOSESTHWB  \  /D HAVE_COLORCLOSESTHWB  \
 /D USE_GD_IMGSTRTTF  \  /D USE_GD_IMGSTRTTF  \
 /D USE_GD_IOCTX \  /D USE_GD_IOCTX \

Removed from v.1.1.1.2  
changed lines
  Added in v.1.1.1.3


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>