From: Pierre Joye <pajoye@php.net>
Date: Tue, 8 Jul 2008 19:07:53 +0000 (+0000)
Subject: - use _a for static lib
X-Git-Tag: BEFORE_HEAD_NS_CHANGE~1337
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=739450edb7e344a1970624e122911be9e7d631e5;p=php

- use _a for static lib
- fix logic for shared zlib
---

diff --git a/ext/gd/config.w32 b/ext/gd/config.w32
index 4205ce4d77..caeed872c3 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) &&
@@ -24,11 +24,6 @@ if (PHP_GD != "no") {
 				WARNING("t1lib not enabled; libraries and headers not found");
 			}
 		}
-
-		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);