X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=config.w32;h=1ec34d1b640de85f26c332e2dd40af1446e45555;hb=0e998acc9b529b67de3b1a772e016dd85bbc8eb2;hp=638273f26364a27f6572d056308a469be45cdffc;hpb=46fc12676a53668d55fe6d02d44210e2eaf4b6b5;p=m6w6%2Fext-http

diff --git a/config.w32 b/config.w32
index 638273f..1ec34d1 100644
--- a/config.w32
+++ b/config.w32
@@ -8,18 +8,17 @@ 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);
+
+	/* When in configure, we're always in the root of PHP source */
+	var ext_path = "ext\\" + ext;
 	
 	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;
-		}
+
+	if (FSO.FileExists(ext_path + "\\" + header)) {
+		STDOUT.WriteLine(ext_path);
+		return ext_path;
 	}
+
 	STDOUT.WriteLine("<not found>");
 	return false;
 }
@@ -56,13 +55,18 @@ if (PHP_HTTP != "no") {
 		"http_info_api.c http_request_method_api.c http_encoding_api.c "+
 		"http_filter_api.c http_request_body_api.c http_querystring_object.c "+
 		"http_deflatestream_object.c http_inflatestream_object.c "+
-		"http_cookie_api.c http_querystring_api.c",
+		"http_cookie_api.c http_querystring_api.c http_request_datashare_api.c "+
+		"http_requestdatashare_object.c http_request_info.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");
 	AC_DEFINE("HTTP_SHARED_DEPS", 1, "Depend on shared extensions");
 	
+	AC_DEFINE("HAVE_GETHOSTNAME", 1);
+	AC_DEFINE("HAVE_GETSERVBYPORT", 1);
+	AC_DEFINE("HAVE_GETSERVBYNAME", 1);
+	
 	if (PHP_DEBUG != "no") {
 		ADD_FLAG("CFLAGS_HTTP", "/W3");
 	}
@@ -78,8 +82,7 @@ if (PHP_HTTP != "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_FLAG("CFLAGS_HTTP", '/I "' + f + '" /DHTTP_HAVE_PHP_HASH_H=1');
 			ADD_EXTENSION_DEP("http", "hash", true);
 		}
 	}