- MFB: add 2007a/b info

- update config.w32 to detect static lib

diff --git a/ext/imap/config.w32 b/ext/imap/config.w32
index 3a6c8fe5f04d3945dc0f9fffaa80a37ecc197a73..8de007eb777419a2e8e6749daa6ab7954b6c3086 100644 (file)
--- a/ext/imap/config.w32
+++ b/ext/imap/config.w32
@@ -4,7 +4,7 @@
 ARG_WITH("imap", "IMAP Support", "no");
 
 if (PHP_IMAP == "yes") {
-       if (CHECK_LIB("cclient.lib", "imap") &&
+       if ((CHECK_LIB("cclient.lib", "imap") || CHECK_LIB("cclient_a.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_LIB("winmm.lib", "imap");
@@ -13,7 +13,7 @@ if (PHP_IMAP == "yes") {
                CHECK_LIB("crypt32.lib", "imap");
                EXTENSION("imap", "php_imap.c");
 
-               ADD_FLAG("CFLAGS_IMAP", "/D HAVE_IMAP2000=1 /D HAVE_IMAP2004=1 /D HAVE_IMAP_SSL=1");
+               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_IMAP', 1, 'Have IMAP support', true);
        } else {
                WARNING("imap not enabled; libraries and headers not found");

diff --git a/ext/imap/php_imap.c b/ext/imap/php_imap.c
index eb27482dfea03bbde2ce392b02eb21c5c32c0110..e020a4c2cd70e9c1eeade1c1ad3bcf8275f39d00 100644 (file)
--- a/ext/imap/php_imap.c
+++ b/ext/imap/php_imap.c
@@ -729,7 +729,11 @@ PHP_RSHUTDOWN_FUNCTION(imap)
 PHP_MINFO_FUNCTION(imap)
 {
        php_info_print_table_start();
-#if HAVE_IMAP2004
+#if HAVE_IMAP2007b
+       php_info_print_table_row(2, "IMAP c-Client Version", "2007b");
+#elif HAVE_IMAP2007a
+       php_info_print_table_row(2, "IMAP c-Client Version", "2007a");
+#elif HAVE_IMAP2004
        php_info_print_table_row(2, "IMAP c-Client Version", "2004");
 #elif HAVE_IMAP2001
        php_info_print_table_row(2, "IMAP c-Client Version", "2001");