1
0
mirror of https://github.com/php/php-src.git synced 2026-03-27 09:42:22 +01:00

- add version info for 2007a and b

- update config.w32
This commit is contained in:
Pierre Joye
2008-07-02 17:56:19 +00:00
parent a9175febd6
commit 2f3beadffd
2 changed files with 7 additions and 3 deletions

View File

@@ -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");

View File

@@ -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");