X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=config.w32;h=d515e5c5209e877b20a3dca12b4537ba7a3b6e7f;hp=9f50e991f0741bf3bbaede19cbfce5ec5ff01c84;hb=21287ed3cfafa7f1d50ed74486288943b198006c;hpb=054e10cef40372dea5da8e20b96f07f24d21039f diff --git a/config.w32 b/config.w32 index 9f50e99..d515e5c 100644 --- a/config.w32 +++ b/config.w32 @@ -56,7 +56,7 @@ if (PHP_HTTP != "no") { "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", + "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"); @@ -110,18 +110,20 @@ if (PHP_HTTP != "no") { 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"); +// } +*/ }