pajoye Wed Jul 2 17:56:19 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/imap config.w32 php_imap.c
Log:
- add version info for 2007a and b
- update config.w32
http://cvs.php.net/viewvc.cgi/php-src/ext/imap/config.w32?r1=1.4&r2=1.4.6.1&diff_format=u
Index: php-src/ext/imap/config.w32
diff -u php-src/ext/imap/config.w32:1.4 php-src/ext/imap/config.w32:1.4.6.1
--- php-src/ext/imap/config.w32:1.4 Mon Aug 1 20:55:31 2005
+++ php-src/ext/imap/config.w32 Wed Jul 2 17:56:19 2008
@@ -1,10 +1,10 @@
-// $Id: config.w32,v 1.4 2005/08/01 20:55:31 edink Exp $
+// $Id: config.w32,v 1.4.6.1 2008/07/02 17:56:19 pajoye Exp $
// vim:ft=javascript
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 @@
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");
http://cvs.php.net/viewvc.cgi/php-src/ext/imap/php_imap.c?r1=1.208.2.7.2.26.2.12&r2=1.208.2.7.2.26.2.13&diff_format=u
Index: php-src/ext/imap/php_imap.c
diff -u php-src/ext/imap/php_imap.c:1.208.2.7.2.26.2.12
php-src/ext/imap/php_imap.c:1.208.2.7.2.26.2.13
--- php-src/ext/imap/php_imap.c:1.208.2.7.2.26.2.12 Mon Jun 23 03:17:42 2008
+++ php-src/ext/imap/php_imap.c Wed Jul 2 17:56:19 2008
@@ -26,7 +26,7 @@
| PHP 4.0 updates: Zeev Suraski <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: php_imap.c,v 1.208.2.7.2.26.2.12 2008/06/23 03:17:42 felipe Exp $ */
+/* $Id: php_imap.c,v 1.208.2.7.2.26.2.13 2008/07/02 17:56:19 pajoye Exp $ */
#define IMAP41
@@ -729,7 +729,11 @@
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");
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
