- fix inclusion of zlib.h

[m6w6/ext-http] / config.w32

diff --git a/config.w32 b/config.w32
index e18d586466cd7538e851bd76d0c1130ab9c5f59c..7db93da54e6daa0067fdcc6d311b53be64c2e163 100644 (file)
--- a/config.w32
+++ b/config.w32
@@ -64,7 +64,7 @@ if (PHP_HTTP != "no") {
                ADD_FLAG("CFLAGS_HTTP", "/W3");
        }
        
-       if (CHECK_HEADER_ADD_INCLUDE('zlib.h', 'CFLAGS_HTTP')) {
+       if (CHECK_HEADER_ADD_INCLUDE('zlib.h', 'CFLAGS_HTTP', '..\\zlib;' + php_usual_include_suspects)) {
                AC_DEFINE('HTTP_HAVE_ZLIB', 1, "Have zlib library");
                ADD_FLAG("LDFLAGS_HTTP", "/FORCE:MULTIPLE");
        } else {
@@ -90,12 +90,10 @@ if (PHP_HTTP != "no") {
                        CHECK_LIB("zlib.lib", "http", PHP_HTTP) &&
                        CHECK_LIB("winmm.lib", "http", PHP_HTTP)) {
                AC_DEFINE("HTTP_HAVE_CURL", 1, "Have CURL library");
-               AC_DEFINE("HTTP_HAVE_CURL_ZLIB", 1, "");
                AC_DEFINE("HTTP_HAVE_SSL", 1, "Have SSL");
                AC_DEFINE("HAVE_CURL_MULTI_STRERROR", 1, "");
                AC_DEFINE("HAVE_CURL_EASY_STRERROR", 1, "");
                AC_DEFINE("HAVE_CURL_EASY_RESET", 1, "");
-               AC_DEFINE("CURL_STATICLIB", 1, "");
        } else {
                WARNING("curl convenience functions not enabled; libraries and headers not found");
        }