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

diff --git a/config.w32 b/config.w32
index a53455e..10bb196 100644
--- a/config.w32
+++ b/config.w32
@@ -3,6 +3,47 @@
 
 ARG_ENABLE("http", "whether to enable extended HTTP support", "no");
 
+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",
@@ -13,7 +54,7 @@ if (PHP_HTTP != "no") {
 		"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_encoding_api.c "+
-		"http_filter_api.c",
+		"http_filter_api.c http_request_body_api.c",
 		null,
 		"/I\"" + configure_module_dirname + "/phpstr\"");
 	ADD_SOURCES(configure_module_dirname + "/phpstr", "phpstr.c", "http");
@@ -32,15 +73,11 @@ if (PHP_HTTP != "no") {
 	
 	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) {
+		
+		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);
-			STDOUT.WriteLine(condense_path(f));
-		} else {
-			STDOUT.WriteLine("<not found>");
 		}
 	}
 
@@ -57,7 +94,6 @@ if (PHP_HTTP != "no") {
 		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");
 	}