X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=config.w32;h=680d7fa24eb745306c41ced159e5cfdb68df95c0;hp=ed909dc4e364210e9a1780cbd84ac4ab3a5471ca;hb=refs%2Fheads%2Fv1.7.x;hpb=dfb7bdcf442027ae56af9084f57c57cfe4878c7f

diff --git a/config.w32 b/config.w32
index ed909dc..680d7fa 100644
--- a/config.w32
+++ b/config.w32
@@ -55,7 +55,8 @@ 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 http_persistent_handle_api.c",
 		null,
 		"/I\"" + configure_module_dirname + "/phpstr\"");
 	ADD_SOURCES(configure_module_dirname + "/phpstr", "phpstr.c", "http");
@@ -77,7 +78,7 @@ if (PHP_HTTP != "no") {
 		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"))) {
@@ -94,30 +95,35 @@ if (PHP_HTTP != "no") {
 		ADD_EXTENSION_DEP("http", "iconv", true);
 	}
 	
-	CURL_LIB = PHP_DEBUG != "no" ? "libcurld.lib":"libcurl.lib";
+	CURL_LIB="libcurl_a.lib;libcurl.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("zlib.lib;zlib_a.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_SHARE_STRERROR", 1, "");
 		AC_DEFINE("HAVE_CURL_EASY_STRERROR", 1, "");
 		AC_DEFINE("HAVE_CURL_EASY_RESET", 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");
 	}
-
-	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");
-	}
+/*
+//	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");
+//	}
+*/
 }