X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;ds=sidebyside;f=config.w32;h=a53455ee5ca019956006f8aa3f3655db6c64eaf8;hb=0acbfc76b5a3e4122a6d06d64bd834a810806656;hp=a537fb95f45c00431e4900d67694772abd3e2ee1;hpb=c71fd3a3bcc7231f2efc4c7520888880f42a6b3c;p=m6w6%2Fext-http

diff --git a/config.w32 b/config.w32
index a537fb9..a53455e 100644
--- a/config.w32
+++ b/config.w32
@@ -12,37 +12,61 @@ if (PHP_HTTP != "no") {
 		"http_api.c http_cache_api.c http_request_pool_api.c "+
 		"http_request_api.c http_date_api.c http_headers_api.c "+
 		"http_message_api.c http_send_api.c http_url_api.c "+
-		"http_info_api.c http_request_method_api.c",
+		"http_info_api.c http_request_method_api.c http_encoding_api.c "+
+		"http_filter_api.c",
 		null,
 		"/I\"" + configure_module_dirname + "/phpstr\"");
 	ADD_SOURCES(configure_module_dirname + "/phpstr", "phpstr.c", "http");
 	AC_DEFINE("HAVE_HTTP", 1, "Have extended HTTP support");
-
-	if (CHECK_HEADER_ADD_INCLUDE('mhash.h', 'CFLAGS_HTTP') &&
-			CHECK_LIB('libmhash.lib', 'http', PHP_HTTP)) {
-		AC_DEFINE('HTTP_HAVE_MHASH', 1 , "Have mhash library");
+	
+	if (PHP_DEBUG != "no") {
+		ADD_FLAG("CFLAGS_HTTP", "/W3");
+	}
+	
+	if (CHECK_HEADER_ADD_INCLUDE('zlib.h', 'CFLAGS_HTTP')) {
+		AC_DEFINE('HTTP_HAVE_ZLIB', 1, "Have zlib library");
+		ADD_FLAG("LDFLAGS_HTTP", "/FORCE:MULTIPLE");
 	} else {
-		WARNING("mhash etag generator not enabled; libraries and headers not found");
+		WARNING("zlib encoding functions not enabled; libraries and headers not found");
+	}
+	
+	if (PHP_HASH != "no") {
+		var f;
+		STDOUT.Write("Checking for ext/hash ...  ");
+		if (glob((f = configure_module_dirname +"\\..\\hash") +"\\php_hash.h").length ||
+			glob((f = configure_module_dirname +"\\..\\..\\..\\pecl\\hash") +"\\php_hash.h").length) {
+			ADD_FLAG("CFLAGS_HTTP", "/I"+ f);
+			AC_DEFINE("HTTP_HAVE_EXT_HASH", 1, "");
+			ADD_EXTENSION_DEP("http", "hash", true);
+			STDOUT.WriteLine(condense_path(f));
+		} else {
+			STDOUT.WriteLine("<not found>");
+		}
 	}
 
+	CURL_LIB = PHP_DEBUG != "no" ? "libcurld.lib":"libcurl.lib";
     if (CHECK_HEADER_ADD_INCLUDE("curl/curl.h", "CFLAGS_HTTP") &&
-			CHECK_LIB("libcurl.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("winmm.lib", "http", PHP_HTTP)) {
-        AC_DEFINE("HTTP_HAVE_CURL", 1, "Have CURL library");
-        AC_DEFINE("HAVE_CURL_MULTI_STRERROR", 1, "");
-        AC_DEFINE("HAVE_CURL_EASY_STRERROR", 1, "")
-    } 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_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("winmm.lib", "http", PHP_HTTP)) {
+		AC_DEFINE("HTTP_HAVE_CURL", 1, "Have CURL library");
+		AC_DEFINE("HTTP_HAVE_SSL", 1, "Have SSL");
+		AC_DEFINE("HAVE_CURL_MULTI_STRERROR", 1, "");
+		AC_DEFINE("HAVE_CURL_EASY_STRERROR", 1, "");
+		AC_DEFINE("HAVE_CURL_EASY_RESET", 1, "");
+		AC_DEFINE("CURL_STATICLIB", 1, "");
+	} 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");
 	}