diff options
| author | Pierre Joye <pajoye@php.net> | 2008-07-08 19:09:11 +0000 |
|---|---|---|
| committer | Pierre Joye <pajoye@php.net> | 2008-07-08 19:09:11 +0000 |
| commit | 0ca3ffeda3f119135d115e6659ce12296e1614f6 (patch) | |
| tree | ee9d5fa33a135cdcb1c7fb7514991e33b44badc7 /ext/gd | |
| parent | 4a23bbfe75b14d2c753c5880bcd418506424186b (diff) | |
| download | php-git-0ca3ffeda3f119135d115e6659ce12296e1614f6.tar.gz | |
MFH:
- use _a for static lib
- fix logic for shared zlib
Diffstat (limited to 'ext/gd')
| -rw-r--r-- | ext/gd/config.w32 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/gd/config.w32 b/ext/gd/config.w32 index dc5b276655..6fda13c8d2 100644 --- a/ext/gd/config.w32 +++ b/ext/gd/config.w32 @@ -6,14 +6,14 @@ ARG_WITH("t1lib", "t1lib support", "yes"); 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("freetype_a.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("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) && - ((!PHP_ZLIB_SHARED) || CHECK_LIB("zlib_a.lib", "gd", PHP_GD) || CHECK_LIB("zlib.lib", "gd", PHP_GD)) + ((!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) && |