From: Pierre Joye <pajoye@php.net>
Date: Mon, 6 Apr 2009 09:39:02 +0000 (+0000)
Subject: - naming & cleanup
X-Git-Tag: php-5.3.0RC2~215
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=63169ea0b206ef892ab2e1acac8b162993fa06e1;p=php

- naming & cleanup
---

diff --git a/ext/gd/config.w32 b/ext/gd/config.w32
index 57f88584a6..d8eeedf66a 100644
--- a/ext/gd/config.w32
+++ b/ext/gd/config.w32
@@ -5,15 +5,14 @@ ARG_WITH("gd", "Bundled GD support", "yes,shared");
 ARG_WITH("t1lib", "t1lib support", "yes");
 
 if (PHP_GD != "no") {
-	if (CHECK_LIB("libjpeg.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) ) &&
+	if (CHECK_LIB("libjpeg_a.lib;libjpeg.lib", "gd", PHP_GD) &&
+		CHECK_LIB("freetype_a.lib;freetype.lib", "gd", PHP_GD) &&
+		CHECK_LIB("libpng_a.lib;libpng.lib", "gd", PHP_GD) &&
 		CHECK_HEADER_ADD_INCLUDE("gd.h", "CFLAGS_GD", PHP_GD + ";ext\\gd\\libgd") &&
 		CHECK_HEADER_ADD_INCLUDE("png.h", "CFLAGS_GD", PHP_GD +  ";" + PHP_PHP_BUILD + "\\include\\libpng12") &&
-		(CHECK_LIB("libiconv_a.lib", "gd", PHP_GD) || CHECK_LIB("libiconv.lib", "gd", PHP_GD) ||
-		 CHECK_LIB("iconv_a.lib", "gd", PHP_GD) || CHECK_LIB("iconv.lib", "gd", PHP_GD)) &&
+		(CHECK_LIB("libiconv_a.lib;libiconv.llib", "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", "gd", PHP_GD) || CHECK_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)))
 		) {
 		if (PHP_T1LIB != "no") {