fix old and add new http\Client\Curl\Versions constants

[m6w6/ext-http] / config.w32

diff --git a/config.w32 b/config.w32
index e7f265db6beb95c3310fa10cfbbb1be426a4cf1f..3cc4069d6649ed7bf4f15de5e69145f0c40f0ccc 100644 (file)
--- a/config.w32
+++ b/config.w32
@@ -123,15 +123,14 @@ if (PHP_HTTP != "no") {
                        CHECK_LIB("normaliz.lib", "http", PHP_HTTP) &&
                        CHECK_LIB("libssl.lib;ssleay32.lib", "http", PHP_HTTP) &&
                        CHECK_LIB("libcrypto.lib;libeay32.lib", "http", PHP_HTTP) &&
+                       CHECK_LIB("crypt32.lib;libeay32.lib", "http", PHP_HTTP) &&
                        CHECK_LIB("zlib.lib;zlib_a.lib", "http", PHP_HTTP) &&
-                       ADD_EXTENSION_DEP("http", "propro", true) &&
                        ADD_EXTENSION_DEP("http", "raphf", true) &&
                        CHECK_LIB("winmm.lib", "http", PHP_HTTP)) {
                AC_DEFINE("PHP_HTTP_HAVE_LIBCURL", 1, "Have CURL library");
                AC_DEFINE("PHP_HTTP_HAVE_SSL", 1, "Have SSL");
                AC_DEFINE("PHP_HTTP_HAVE_LIBCURL_SSL", 1);
                AC_DEFINE("PHP_HTTP_HAVE_LIBCURL_OPENSSL", 1);
-               AC_DEFINE("PHP_HTTP_HAVE_EXT_PROPRO", 1, "");
                AC_DEFINE("PHP_HTTP_HAVE_EXT_RAPHF", 1, "");
                AC_DEFINE("PHP_HTTP_HAVE_CLIENT", 1, "Have HTTP client support");
                AC_DEFINE("PHP_HAVE_CURL_MULTI_STRERROR", 1, "");
@@ -144,7 +143,8 @@ if (PHP_HTTP != "no") {
                AC_DEFINE("PHP_HAVE_CURL_MULTI_TIMEOUT", 1, "");
                ADD_FLAG("CFLAGS_HTTP", "/I" + configure_module_dirname + " ");
 
-               if (CHECK_HEADER_ADD_INCLUDE("event2/event.h", "CFLAGS_HTTP") &&
+               if (CHECK_HEADER_ADD_INCLUDE("event.h", "CFLAGS_HTTP") &&
+                       CHECK_HEADER_ADD_INCLUDE("event2/event.h", "CFLAGS_HTTP") &&
                        CHECK_LIB("libevent.lib", "http", PHP_HTTP) &&
                        CHECK_LIB("libevent_core.lib", "http", PHP_HTTP) &&
                        CHECK_LIB("libevent_extras.lib", "http", PHP_HTTP)) {
@@ -152,6 +152,8 @@ if (PHP_HTTP != "no") {
                        AC_DEFINE("PHP_HTTP_HAVE_LIBEVENT", 1);
                        AC_DEFINE("PHP_HTTP_HAVE_LIBEVENT2", 1);
                        AC_DEFINE("PHP_HTTP_LIBEVENT_VERSION", "2.0.21 or greater");
+               } else {
+                       WARNING("http module: libevent not enabled; libraries or headers not found");
                }
        } else {
                WARNING("curl convenience functions not enabled; libraries and headers not found");