X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=config.w32;h=b4d2fd35cdcbb8dfcd8d8cdbbe6ef13532539b52;hp=142983669f3089ac8f1385b1d4be34f1aa2c5f41;hb=dc76f745ce61ab266f873e80a39604fa91875c3d;hpb=e9de3fba9942aa70d85fa148fb57caca3222603c

diff --git a/config.w32 b/config.w32
index 1429836..b4d2fd3 100644
--- a/config.w32
+++ b/config.w32
@@ -2,31 +2,108 @@
 // $Id$
 
 ARG_ENABLE("http", "whether to enable extended HTTP support", "no");
-ARG_WITH("http-curl-zend-mm", "whether ext/http's curl should use zend mm");
+
+function check_for_main_ext(ext, header)
+{
+	if (!header) {
+		header = "php_"+ ext +".h";
+	}
+	
+	var r = new RegExp(PHP_VERSION +"."+ PHP_MINOR_VERSION);
+	var g = glob(configure_module_dirname +"\\..\\..\\*\\ext\\"+ ext +"\\"+ header);
+	
+	STDOUT.Write("Checking for ext/"+ ext +" ...  ");
+	for (i = 0; i < g.length; i++) {
+		if (g[i].match(r)) {
+			var f = g[i].substr(0, g[i].length - header.length - 1);
+			STDOUT.WriteLine(f);
+			return f;
+		}
+	}
+	STDOUT.WriteLine("<not found>");
+	return false;
+}
+
+function check_for_pecl_ext(ext, header)
+{
+	if (!header) {
+		header = "php_"+ ext +".h";
+	}
+	
+	var g;
+	var s = ext +"\\"+ header;
+	
+	STDOUT.Write("Checking for pecl/"+ ext +" ...  ");
+	if (	(g = glob(configure_module_dirname +"\\..\\"+ s)) ||
+			(g = glob(configure_module_dirname +"\\..\\..\\..\\pecl\\"+ s))) {
+		var f = g[0].substr(0, g[0].length - header.length - 1);
+		STDOUT.WriteLine(f);
+		return f;
+	}
+	STDOUT.WriteLine("<not found>");
+	return false;
+}
 
 if (PHP_HTTP != "no") {
+
 	EXTENSION("http",
 		"missing.c http.c http_functions.c http_exception_object.c "+
 		"http_util_object.c http_message_object.c http_requestpool_object.c "+
 		"http_request_object.c http_response_object.c "+
-		"http_api.c http_auth_api.c http_cache_api.c http_request_pool_api.c "+
+		"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_message_api.c http_send_api.c http_url_api.c "+
+		"http_info_api.c http_request_method_api.c http_encoding_api.c "+
+		"http_filter_api.c http_request_body_api.c http_wrapper_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_LIB("libcurl.lib", "http", PHP_HTTP) &&
-            CHECK_HEADER_ADD_INCLUDE("curl/easy.h", "CFLAGS_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");
-		if (PHP_HTTP_CURL_ZEND_MM == "yes") {
-			AC_DEFINE("HTTP_CURL_USE_ZEND_MM", 1, "CURL library shall use Zend MM");
+	AC_DEFINE("HAVE_HTTP", 1, "Have extended HTTP support");
+	
+	if (PHP_DEBUG != "no") {
+		ADD_FLAG("CFLAGS_HTTP", "/W3");
+	}
+	
+	if (CHECK_HEADER_ADD_INCLUDE('zlib.h', 'CFLAGS_HTTP', '..\\zlib;' + php_usual_include_suspects)) {
+		AC_DEFINE('HTTP_HAVE_ZLIB', 1, "Have zlib library");
+		ADD_FLAG("LDFLAGS_HTTP", "/FORCE:MULTIPLE");
+	} else {
+		WARNING("zlib encoding functions not enabled; libraries and headers not found");
+	}
+	
+	if (PHP_HASH != "no") {
+		var f;
+		
+		if ((f = check_for_pecl_ext("hash")) || (f = check_for_main_ext("hash"))) {
+			ADD_FLAG("CFLAGS_HTTP", "/I"+ f);
+			AC_DEFINE("HTTP_HAVE_EXT_HASH", 1, "");
+			ADD_EXTENSION_DEP("http", "hash", true);
 		}
-    } else {
-        WARNING("curl convenience functions not enabled; libraries and headers not found");
-    }
+	}
+
+	CURL_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("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, "");
+	} 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");
+	}
 }