AC_DEFINE("PHP_HTTP_HAVE_LIBICU", 1, "");
AC_DEFINE("PHP_HTTP_HAVE_IDNA2003", 1, "");
AC_DEFINE("PHP_HTTP_HAVE_IDNA2008", 1, "");
- ADD_FLAG("LIBS_HTTP", "icuuc.lib icudt.lib icuin.lib icuio.lib icule.lib iculx.lib");
+ ADD_FLAG("LIBS_HTTP", "icuuc.lib icudt.lib icuin.lib icuio.lib");
+ /* Compat for ICU before 58.1.*/
+ if (CHECK_LIB("icule.lib", "http", PHP_HTTP)) {
+ ADD_FLAG("LIBS_HTTP", "icule.lib");
+ }
+ if (CHECK_LIB("iculx.lib", "http", PHP_HTTP)) {
+ ADD_FLAG("LIBS_HTTP", "iculx.lib");
+ }
}
if (PHP_CURL != "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)) {
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");