pajoye Thu Apr 23 22:22:51 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/imap config.w32
Log:
- define HAVE_NEW_MIME2TEXT and detect utf8aux
http://cvs.php.net/viewvc.cgi/php-src/ext/imap/config.w32?r1=1.4.6.3&r2=1.4.6.4&diff_format=u
Index: php-src/ext/imap/config.w32
diff -u php-src/ext/imap/config.w32:1.4.6.3 php-src/ext/imap/config.w32:1.4.6.4
--- php-src/ext/imap/config.w32:1.4.6.3 Mon Dec 1 00:02:37 2008
+++ php-src/ext/imap/config.w32 Thu Apr 23 22:22:51 2009
@@ -1,12 +1,15 @@
-// $Id: config.w32,v 1.4.6.3 2008/12/01 00:02:37 pajoye Exp $
+// $Id: config.w32,v 1.4.6.4 2009/04/23 22:22:51 pajoye Exp $
// vim:ft=javascript
ARG_WITH("imap", "IMAP Support", "no");
if (PHP_IMAP == "yes") {
- if ((CHECK_LIB("cclient.lib", "imap") || CHECK_LIB("cclient_a.lib",
"imap")) &&
+ if (CHECK_LIB("cclient_a.lib;cclient.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_HEADER_ADD_INCLUDE("c-client/c-client.h",
"CFLAGS_IMAP", null, null, true)) ||
+ (CHECK_HEADER_ADD_INCLUDE("utf8aux.h", "CFLAGS_IMAP")||
+ CHECK_HEADER_ADD_INCLUDE("c-client/utf8aux.h",
"CFLAGS_IMAP", null, null, true))
+ ) {
CHECK_LIB("winmm.lib", "imap");
CHECK_LIB("ws2_32.lib", "imap");
CHECK_LIB("Secur32.lib", "imap");
@@ -15,6 +18,7 @@
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);
+ AC_DEFINE('HAVE_NEW_MIME2TEXT', 1, 'Have utf8_mime2text', true);
AC_DEFINE('HAVE_RFC822_OUTPUT_ADDRESS_LIST', 1, 'Have
rfc822_output_address_list', true);
} else {
WARNING("imap not enabled; libraries and headers not found");
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
