X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=config.w32;h=2519240e104e8d29a4864fb0113cf05ec983e282;hp=e18d586466cd7538e851bd76d0c1130ab9c5f59c;hb=3a6772376bf9d4cf83484c51e5ed059e958e83cf;hpb=7fef44c902c86eebce30f36003a27905fbaeba65

diff --git a/config.w32 b/config.w32
index e18d586..2519240 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;
 }
@@ -54,48 +53,66 @@ 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_request_body_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_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");
 	}
 	
-	if (CHECK_HEADER_ADD_INCLUDE('zlib.h', 'CFLAGS_HTTP')) {
+	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") {
+	if (typeof(PHP_HASH) != "undefined" && 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_FLAG("CFLAGS_HTTP", '/I "' + f + '" /DHTTP_HAVE_PHP_HASH_H=1');
 			ADD_EXTENSION_DEP("http", "hash", true);
 		}
 	}
-
+	
+	if (PHP_SESSION != "no") {
+		ADD_EXTENSION_DEP("http", "session", true);
+	}
+	
+	if (PHP_ICONV != "no") {
+		ADD_EXTENSION_DEP("http", "iconv", true);
+	}
+	
 	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") &&
+	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_CURL_ZLIB", 1, "");
 		AC_DEFINE("HTTP_HAVE_SSL", 1, "Have SSL");
 		AC_DEFINE("HAVE_CURL_MULTI_STRERROR", 1, "");
+		AC_DEFINE("HAVE_CURL_SHARE_STRERROR", 1, "");
 		AC_DEFINE("HAVE_CURL_EASY_STRERROR", 1, "");
 		AC_DEFINE("HAVE_CURL_EASY_RESET", 1, "");
-		AC_DEFINE("CURL_STATICLIB", 1, "");
+		AC_DEFINE("HAVE_CURL_GETFORMDATA", 1, "");
+		AC_DEFINE("HAVE_CURL_FORMGET", 1, "");
+		AC_DEFINE("HAVE_CURL_MULTI_SETOPT", 1, "");
+		AC_DEFINE("HAVE_CURL_MULTI_TIMEOUT", 1, "");
 	} else {
 		WARNING("curl convenience functions not enabled; libraries and headers not found");
 	}