detect c-client headers correctly using Edin's php-win32-dev layout

diff --git a/ext/imap/config.w32 b/ext/imap/config.w32
index 93512d562dda587e5c80276dbaa6feb4db7ff96d..672ec7f168047bb92ab98035bcde6126d3bbc653 100644 (file)
--- a/ext/imap/config.w32
+++ b/ext/imap/config.w32
@@ -5,7 +5,8 @@ ARG_WITH("imap", "IMAP Support", "no");
 
 if (PHP_IMAP == "yes") {
        if (CHECK_LIB("cclient.lib", "imap") &&
-                       CHECK_HEADER_ADD_INCLUDE("rfc822.h", "CFLAGS_IMAP")) {
+                       (CHECK_HEADER_ADD_INCLUDE("c-client.h", "CFLAGS_IMAP")||
+                       CHECK_HEADER_ADD_INCLUDE("c-client/c-client.h", "CFLAGS_IMAP", null, null, true))) {
                CHECK_LIB("winmm.lib", "imap");
                CHECK_LIB("ws2_32.lib", "imap");
                CHECK_LIB("Secur32.lib", "imap");