tony2001 Fri Jan 19 20:44:52 2007 UTC
Modified files:
/php-src/ext/imap config.m4
Log:
improve utf8_mime2text() signature detection
look also for U8T_CANONICAL, which must exist if new signature was detected
http://cvs.php.net/viewvc.cgi/php-src/ext/imap/config.m4?r1=1.72&r2=1.73&diff_format=u
Index: php-src/ext/imap/config.m4
diff -u php-src/ext/imap/config.m4:1.72 php-src/ext/imap/config.m4:1.73
--- php-src/ext/imap/config.m4:1.72 Thu Jan 18 14:05:07 2007
+++ php-src/ext/imap/config.m4 Fri Jan 19 20:44:52 2007
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.72 2007/01/18 14:05:07 tony2001 Exp $
+dnl $Id: config.m4,v 1.73 2007/01/19 20:44:52 tony2001 Exp $
dnl
AC_DEFUN([IMAP_INC_CHK],[if test -r "$i$1/c-client.h"; then
@@ -117,27 +117,49 @@
AC_EGREP_HEADER(mail_fetch_overview_sequence, $IMAP_INC_DIR/mail.h, [
AC_DEFINE(HAVE_IMAP2004,1,[ ])
])
-
+
dnl Check for new version of the utf8_mime2text() function
old_CFLAGS=$CFLAGS
CFLAGS="-I$IMAP_INC_DIR"
- AC_CACHE_CHECK(for utf8_mime2text signature, ac_cv_utf8_mime2text,
- AC_TRY_COMPILE([
+ AC_CACHE_CHECK(for utf8_mime2text signature, ac_cv_utf8_mime2text,
+ AC_TRY_COMPILE([
#include <c-client.h>
- ],[
- SIZEDTEXT *src, *dst;
- utf8_mime2text(src, dst);
- ],[
- ac_cv_utf8_mime2text=old
- ],[
- ac_cv_utf8_mime2text=new
- ])
+ ],[
+ SIZEDTEXT *src, *dst;
+ utf8_mime2text(src, dst);
+ ],[
+ ac_cv_utf8_mime2text=old
+ ],[
+ ac_cv_utf8_mime2text=new
+ ])
)
if test "$ac_cv_utf8_mime2text" = "new"; then
AC_DEFINE(HAVE_NEW_MIME2TEXT, 1, [Whether utf8_mime2text() has new
signature])
fi
CFLAGS=$old_CPPFLAGS
+ old_CFLAGS=$CFLAGS
+ CFLAGS="-I$IMAP_INC_DIR"
+ AC_CACHE_CHECK(for U8T_CANONICAL, ac_cv_u8t_canonical,
+ AC_TRY_COMPILE([
+#include <c-client.h>
+ ],[
+ int i = U8T_CANONICAL;
+ ],[
+ ac_cv_u8t_canonical=yes
+ ],[
+ ac_cv_u8t_canonical=no
+ ])
+ )
+ CFLAGS=$old_CPPFLAGS
+
+ if test "$ac_cv_u8t_canonical" = "no" && test "$ac_cv_utf8_mime2text" =
"new"; then
+ AC_MSG_ERROR([utf8_mime2text() has new signature, but
U8T_CANONICAL is missing. This should not happen. Check config.log for
additional information.])
+ fi
+ if test "$ac_cv_u8t_canonical" = "yes" && test "$ac_cv_utf8_mime2text" =
"old"; then
+ AC_MSG_ERROR([utf8_mime2text() has old signature, but
U8T_CANONICAL is present. This should not happen. Check config.log for
additional information.])
+ fi
+
dnl Check for c-client version 2001
old_CPPFLAGS=$CPPFLAGS
CPPFLAGS=-I$IMAP_INC_DIR
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
