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;
}
"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_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");
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") &&
AC_DEFINE("HAVE_CURL_MULTI_STRERROR", 1, "");
AC_DEFINE("HAVE_CURL_EASY_STRERROR", 1, "");
AC_DEFINE("HAVE_CURL_EASY_RESET", 1, "");
+ AC_DEFINE("HAVE_CURL_GETFORMDATA", 1, "");
} else {
WARNING("curl convenience functions not enabled; libraries and headers not found");
}