From: Pierre Joye <pajoye@php.net>
Date: Sun, 6 Jul 2008 17:07:26 +0000 (+0000)
Subject: - MFH:
X-Git-Tag: php-5.3.0alpha1~476
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a4354756ebfa62abc62030debcce57a4916b1612;p=php

- MFH:
  - update lib/headers detection
  - nuke unused variables
---

diff --git a/ext/gd/config.w32 b/ext/gd/config.w32
index 69861ddce6..45b777687a 100644
--- a/ext/gd/config.w32
+++ b/ext/gd/config.w32
@@ -6,9 +6,14 @@ ARG_WITH("t1lib", "t1lib support", "yes");
 
 if (PHP_GD != "no") {
 	if (CHECK_LIB("libjpeg.lib", "gd", PHP_GD) &&
-		CHECK_LIB("freetype2.lib", "gd", PHP_GD) &&
-		CHECK_LIB("libpng.lib", "gd", PHP_GD) &&
-		CHECK_HEADER_ADD_INCLUDE("gd.h", "CFLAGS_GD", PHP_GD + ";ext\\gd\\libgd")
+		(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)
 		) {
 		if (PHP_T1LIB != "no") {
 			if (CHECK_LIB("T1_StaticMD.lib", "gd", PHP_GD) &&
diff --git a/ext/gd/gd.c b/ext/gd/gd.c
index e03b2a6af5..4403389608 100644
--- a/ext/gd/gd.c
+++ b/ext/gd/gd.c
@@ -2168,8 +2168,6 @@ PHP_FUNCTION(imagegrabscreen)
 	HDC memDC;
 	HBITMAP memBM;
 	HBITMAP hOld;
-	HINSTANCE handle;
-	long lwindow_handle;
 	typedef BOOL (WINAPI *tPrintWindow)(HWND, HDC,UINT);
 	tPrintWindow pPrintWindow = 0;
 	gdImagePtr im;