diff options
| author | Pierre Joye <pajoye@php.net> | 2008-07-02 17:56:19 +0000 |
|---|---|---|
| committer | Pierre Joye <pajoye@php.net> | 2008-07-02 17:56:19 +0000 |
| commit | 2f3beadffd9d752146cbf313cac6555bfcec92bc (patch) | |
| tree | ac4a77529263561d9c2f363a488b668b32952217 | |
| parent | a9175febd6326fbdc36dcc8a33bbed1166fe59c8 (diff) | |
| download | php-git-2f3beadffd9d752146cbf313cac6555bfcec92bc.tar.gz | |
- add version info for 2007a and b
- update config.w32
| -rw-r--r-- | ext/imap/config.w32 | 4 | ||||
| -rw-r--r-- | ext/imap/php_imap.c | 6 |
2 files changed, 7 insertions, 3 deletions
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 58d98cc727..c17a798c31 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"); |