diff options
| -rw-r--r-- | ext/imap/config.m4 | 6 | ||||
| -rw-r--r-- | ext/imap/php_imap.c | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/ext/imap/config.m4 b/ext/imap/config.m4 index 3a9c281046..d9fe3cc6d7 100644 --- a/ext/imap/config.m4 +++ b/ext/imap/config.m4 @@ -110,6 +110,12 @@ if test "$PHP_IMAP" != "no"; then fi done + dnl Check for c-client version 2004 + AC_EGREP_HEADER(mail_fetch_overview_sequence, $IMAP_INC_DIR/mail.h, [ + AC_DEFINE(HAVE_IMAP2004,1,[ ]) + ]) + + dnl Check for c-client version 2001 old_CPPFLAGS=$CPPFLAGS CPPFLAGS=-I$IMAP_INC_DIR AC_EGREP_CPP(this_is_true, [ diff --git a/ext/imap/php_imap.c b/ext/imap/php_imap.c index a81a0137ca..1dbe3f46b4 100644 --- a/ext/imap/php_imap.c +++ b/ext/imap/php_imap.c @@ -694,7 +694,9 @@ PHP_RSHUTDOWN_FUNCTION(imap) PHP_MINFO_FUNCTION(imap) { php_info_print_table_start(); -#if HAVE_IMAP2001 +#if 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"); #elif HAVE_IMAP2000 php_info_print_table_row(2, "IMAP c-Client Version", "2000"); @@ -706,7 +708,7 @@ PHP_MINFO_FUNCTION(imap) #if HAVE_IMAP_SSL php_info_print_table_row(2, "SSL Support", "enabled"); #endif -#if HAVE_IMAP_KRB +#if HAVE_IMAP_KRB && HAVE_IMAP_AUTH_GSS php_info_print_table_row(2, "Kerberos Support", "enabled"); #endif php_info_print_table_end(); |