From: foobar <sniper@php.net>
Date: Tue, 11 Jan 2005 04:56:57 +0000 (+0000)
Subject: MFH: - Added check for IMAP 2004 versions
X-Git-Tag: php-4.3.11RC1~174
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f835eba6b34b3c8e7fe71f05653ad3d2fb7c2b67;p=php

MFH: - Added check for IMAP 2004 versions
---

diff --git a/ext/imap/config.m4 b/ext/imap/config.m4
index 62c527912e..bc4d5e54ac 100644
--- a/ext/imap/config.m4
+++ b/ext/imap/config.m4
@@ -122,6 +122,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 e51ca88064..19bbf33c2b 100644
--- a/ext/imap/php_imap.c
+++ b/ext/imap/php_imap.c
@@ -680,7 +680,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");
@@ -692,7 +694,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();