X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=config.w32;h=680d7fa24eb745306c41ced159e5cfdb68df95c0;hp=95c1e994bb95deb9569f13ec704d87738a93b08d;hb=b6e5882dda739c665464331514ea7a54f568d814;hpb=2d8b53a0bcac3e00619fe266dcbb46142d79c71c

diff --git a/config.w32 b/config.w32
index 95c1e99..680d7fa 100644
--- a/config.w32
+++ b/config.w32
@@ -95,13 +95,13 @@ if (PHP_HTTP != "no") {
 		ADD_EXTENSION_DEP("http", "iconv", true);
 	}
 	
-	CURL_LIB = PHP_DEBUG != "no" ? "libcurld.lib":"libcurl.lib";
+	CURL_LIB="libcurl_a.lib;libcurl.lib;" + (PHP_DEBUG != "no" ? "libcurld.lib":"libcurl.lib");
 	if (CHECK_HEADER_ADD_INCLUDE("curl/curl.h", "CFLAGS_HTTP") &&
 			CHECK_HEADER_ADD_INCLUDE("openssl/crypto.h", "CFLAGS_HTTP") &&
 			CHECK_LIB(CURL_LIB, "http", PHP_HTTP) &&
 			CHECK_LIB("ssleay32.lib", "http", PHP_HTTP) &&
 			CHECK_LIB("libeay32.lib", "http", PHP_HTTP) &&
-			CHECK_LIB("zlib.lib", "http", PHP_HTTP) &&
+			CHECK_LIB("zlib.lib;zlib_a.lib", "http", PHP_HTTP) &&
 			CHECK_LIB("winmm.lib", "http", PHP_HTTP)) {
 		AC_DEFINE("HTTP_HAVE_CURL", 1, "Have CURL library");
 		AC_DEFINE("HTTP_HAVE_SSL", 1, "Have SSL");
@@ -116,13 +116,14 @@ if (PHP_HTTP != "no") {
 	} else {
 		WARNING("curl convenience functions not enabled; libraries and headers not found");
 	}
-
-	MAGIC_LIB = PHP_DEBUG != "no" ? "libmagic-staticd.lib":"libmagic-static.lib";
-	if (CHECK_HEADER_ADD_INCLUDE("magic.h", "CFLAGS_HTTP") &&
-			CHECK_LIB(MAGIC_LIB, "http", PHP_HTTP)) {
-		AC_DEFINE("HTTP_HAVE_MAGIC", 1, "Have magic library");
-		AC_DEFINE("USE_MAGIC_STATIC", "", "");
-	} else {
-		WARNING("content type guessing not enabled; libraries and headers not found");
-	}
+/*
+//	MAGIC_LIB = PHP_DEBUG != "no" ? "libmagic-staticd.lib":"libmagic-static.lib";
+//	if (CHECK_HEADER_ADD_INCLUDE("magic.h", "CFLAGS_HTTP") &&
+//			CHECK_LIB(MAGIC_LIB, "http", PHP_HTTP)) {
+//		AC_DEFINE("HTTP_HAVE_MAGIC", 1, "Have magic library");
+//		AC_DEFINE("USE_MAGIC_STATIC", "", "");
+//	} else {
+//		WARNING("content type guessing not enabled; libraries and headers not found");
+//	}
+*/
 }