diff options
| author | Pierre Joye <pajoye@php.net> | 2008-07-07 08:41:10 +0000 |
|---|---|---|
| committer | Pierre Joye <pajoye@php.net> | 2008-07-07 08:41:10 +0000 |
| commit | ce7428d9d905476dbfe2c573af4074156640132e (patch) | |
| tree | c3d7588534409b6e3c7533800d22e91522d6e39c | |
| parent | 005c6c8f0443b97dd9d5b63cd53abb4742279221 (diff) | |
| download | php-git-ce7428d9d905476dbfe2c573af4074156640132e.tar.gz | |
- test for ZLIB_SHARED (possible conflict)
| -rw-r--r-- | ext/gd/config.w32 | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/ext/gd/config.w32 b/ext/gd/config.w32 index 45b777687a..dc5b276655 100644 --- a/ext/gd/config.w32 +++ b/ext/gd/config.w32 @@ -8,12 +8,12 @@ if (PHP_GD != "no") { if (CHECK_LIB("libjpeg.lib", "gd", PHP_GD) && (CHECK_LIB("freetype.lib", "gd", PHP_GD) || CHECK_LIB("freetype2.lib", "gd", PHP_GD) ) && (CHECK_LIB("libpng_a.lib", "gd", PHP_GD) || CHECK_LIB("libpng.lib", "gd", PHP_GD) ) && - (CHECK_LIB("zlib_a.lib", "gd", PHP_GD) || CHECK_LIB("zlib.lib", "gd", PHP_GD) ) && (CHECK_LIB("libiconv_a.lib", "gd", PHP_GD) || CHECK_LIB("libiconv.lib", "gd", PHP_GD) ) && CHECK_HEADER_ADD_INCLUDE("gd.h", "CFLAGS_GD", PHP_GD + ";ext\\gd\\libgd") && (CHECK_LIB("libiconv_a.lib", "iconv", PHP_ICONV) || CHECK_LIB("libiconv.lib", "iconv", PHP_ICONV) || CHECK_LIB("iconv_a.lib", "iconv", PHP_ICONV) || CHECK_LIB("iconv.lib", "iconv", PHP_ICONV)) && - CHECK_HEADER_ADD_INCLUDE("iconv.h", "CFLAGS_ICONV", PHP_ICONV) + CHECK_HEADER_ADD_INCLUDE("iconv.h", "CFLAGS_ICONV", PHP_ICONV) && + ((!PHP_ZLIB_SHARED) || CHECK_LIB("zlib_a.lib", "gd", PHP_GD) || CHECK_LIB("zlib.lib", "gd", PHP_GD)) ) { if (PHP_T1LIB != "no") { if (CHECK_LIB("T1_StaticMD.lib", "gd", PHP_GD) && @@ -25,10 +25,6 @@ if (PHP_GD != "no") { } } - if (PHP_ZLIB == "no" || PHP_ZLIB_SHARED) { - CHECK_LIB("zlib.lib", "gd", PHP_GD); - } - CHECK_LIB("User32.lib", "gd", PHP_GD); CHECK_LIB("Gdi32.lib", "gd", PHP_GD); |