- define HAVE_NEW_MIME2TEXT and HAVE_RFC822_OUTPUT_ADDRESS_LIST

diff --git a/ext/imap/config.w32 b/ext/imap/config.w32
index 42148d24e7ad29898b21b9fcea410c63a0ff50b6..42ba48cef7f64b1ff0b238b6ca39a357c122ef93 100644 (file)
--- a/ext/imap/config.w32
+++ b/ext/imap/config.w32
@@ -4,9 +4,12 @@
 ARG_WITH("imap", "IMAP Support", "no");
 
 if (PHP_IMAP == "yes") {
-       if ((CHECK_LIB("cclient.lib", "imap") || CHECK_LIB("cclient_a.lib", "imap")) &&
+       if (CHECK_LIB("cclient_a.lib;cclient.lib", "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_HEADER_ADD_INCLUDE("c-client/c-client.h", "CFLAGS_IMAP", null, null, true)) ||
+                       (CHECK_HEADER_ADD_INCLUDE("utf8aux.h", "CFLAGS_IMAP")||
+                       CHECK_HEADER_ADD_INCLUDE("c-client/utf8aux.h", "CFLAGS_IMAP", null, null, true))
+                       ) {
                CHECK_LIB("winmm.lib", "imap");
                CHECK_LIB("ws2_32.lib", "imap");
                CHECK_LIB("Secur32.lib", "imap");
@@ -16,6 +19,8 @@ if (PHP_IMAP == "yes") {
                ADD_FLAG("CFLAGS_IMAP", "/D HAVE_IMAP2000=1 /D HAVE_IMAP2004=1 /D HAVE_IMAP2007a=1 /D HAVE_IMAP2007b=1 /D HAVE_IMAP_SSL=1");
                AC_DEFINE('HAVE_RFC822_OUTPUT_ADDRESS_LIST', 1, 'Have rfc822_output_address_list', true);
                AC_DEFINE('HAVE_IMAP', 1, 'Have IMAP support', true);
+               AC_DEFINE('HAVE_NEW_MIME2TEXT', 1, 'Have utf8_mime2text', true);
+               AC_DEFINE('HAVE_RFC822_OUTPUT_ADDRESS_LIST', 1, 'Have rfc822_output_address_list', true);
        } else {
                WARNING("imap not enabled; libraries and headers not found");
        }