From: Pierre Joye <pajoye@php.net>
Date: Thu, 3 Jul 2008 18:28:41 +0000 (+0000)
Subject: - MFB: add 2007a/b info
X-Git-Tag: BEFORE_HEAD_NS_CHANGE~1405
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b23f7298fb4ca485ab9657e1f0b1a9718f2517b1;p=php

- 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 3a6c8fe5f0..8de007eb77 100644
--- 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 eb27482dfe..e020a4c2cd 100644
--- 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");