diff options
Diffstat (limited to 'ext/gd/config.w32')
| -rw-r--r-- | ext/gd/config.w32 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ext/gd/config.w32 b/ext/gd/config.w32 index 71cbe9c4ae..d912110fc1 100644 --- a/ext/gd/config.w32 +++ b/ext/gd/config.w32 @@ -15,8 +15,8 @@ if (PHP_GD != "no") { CHECK_HEADER_ADD_INCLUDE("png.h", "CFLAGS_GD", PHP_GD + ";" + PHP_PHP_BUILD + "\\include\\libpng15") || CHECK_HEADER_ADD_INCLUDE("png.h", "CFLAGS_GD", PHP_GD + ";" + PHP_PHP_BUILD + "\\include\\libpng12")) && (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) )) || + 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))) && CHECK_LIB("libXpm_a.lib", "gd", PHP_GD) && CHECK_HEADER_ADD_INCLUDE("xpm.h", "CFLAGS_GD", PHP_GD + ";" + PHP_PHP_BUILD + "\\include\\X11") @@ -78,7 +78,7 @@ if (PHP_GD != "no") { if (ICC_TOOLSET) { ADD_FLAG("LDFLAGS_GD", "/nodefaultlib:libcmt"); } - + PHP_INSTALL_HEADERS("", "ext/gd ext/gd/libgd" ); } else { WARNING("gd not enabled; libraries and headers not found"); |