sniper Mon Jan 10 23:56:57 2005 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/imap config.m4 php_imap.c
Log:
MFH: - Added check for IMAP 2004 versions
http://cvs.php.net/diff.php/php-src/ext/imap/config.m4?r1=1.49.2.14&r2=1.49.2.15&ty=u
Index: php-src/ext/imap/config.m4
diff -u php-src/ext/imap/config.m4:1.49.2.14
php-src/ext/imap/config.m4:1.49.2.15
--- php-src/ext/imap/config.m4:1.49.2.14 Thu Dec 30 09:54:35 2004
+++ php-src/ext/imap/config.m4 Mon Jan 10 23:56:57 2005
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.49.2.14 2004/12/30 14:54:35 sniper Exp $
+dnl $Id: config.m4,v 1.49.2.15 2005/01/11 04:56:57 sniper Exp $
dnl
AC_DEFUN([IMAP_INC_CHK],[if test -r "$i$1/c-client.h"; then
@@ -122,6 +122,12 @@
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, [
http://cvs.php.net/diff.php/php-src/ext/imap/php_imap.c?r1=1.142.2.35&r2=1.142.2.36&ty=u
Index: php-src/ext/imap/php_imap.c
diff -u php-src/ext/imap/php_imap.c:1.142.2.35
php-src/ext/imap/php_imap.c:1.142.2.36
--- php-src/ext/imap/php_imap.c:1.142.2.35 Thu Dec 30 00:33:53 2004
+++ php-src/ext/imap/php_imap.c Mon Jan 10 23:56:57 2005
@@ -26,7 +26,7 @@
| PHP 4.0 updates: Zeev Suraski <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: php_imap.c,v 1.142.2.35 2004/12/30 05:33:53 sniper Exp $ */
+/* $Id: php_imap.c,v 1.142.2.36 2005/01/11 04:56:57 sniper Exp $ */
#define IMAP41
@@ -680,7 +680,9 @@
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 @@
#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();
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
