MFH: fix build

diff --git a/ext/imap/config.m4 b/ext/imap/config.m4
index d2111c4f7f1b49185c42bc4e3e81833aeaac280f..ec777ce22889ea593ad87e546e8b0a8c11e6d13b 100644 (file)
--- a/ext/imap/config.m4
+++ b/ext/imap/config.m4
@@ -228,13 +228,10 @@ if test "$PHP_IMAP" != "no"; then
       AC_DEFINE(HAVE_IMAP_AUTH_GSS, 1, [ ])
     ], [], $TST_LIBS)
 
-    AC_MSG_CHECKING(whether build with IMAP works)
-    PHP_IMAP_TEST_BUILD(mail_newbody, [
-      AC_MSG_RESULT(yes)
-    ], [
-      AC_MSG_RESULT(no)
-      AC_MSG_ERROR([build test failed. Please check the config.log for details.])
-    ], $TST_LIBS)
+    dnl Check if utf8_to_mutf7 exists
+    PHP_IMAP_TEST_BUILD(utf8_to_mutf7, [
+      AC_DEFINE(HAVE_IMAP_MUTF7, 1, [ ])
+    ], [], $TST_LIBS)
 
     AC_MSG_CHECKING(whether rfc822_output_address_list function present)
     PHP_TEST_BUILD(foobar, [
@@ -271,4 +268,11 @@ if test "$PHP_IMAP" != "no"; then
       char foobar () {f = rfc822_output_address_list;}
     ])
 
+    AC_MSG_CHECKING(whether build with IMAP works)
+    PHP_IMAP_TEST_BUILD(mail_newbody, [
+      AC_MSG_RESULT(yes)
+    ], [
+      AC_MSG_RESULT(no)
+      AC_MSG_ERROR([build test failed. Please check the config.log for details.])
+    ], $TST_LIBS)
 fi

diff --git a/ext/imap/php_imap.c b/ext/imap/php_imap.c
index 3f5ddf54c43d95b4060d0fd8bb7cf29fcee9cc56..c3cdf9cf9ad5edf65e934b5e18a47e520442de71 100644 (file)
--- a/ext/imap/php_imap.c
+++ b/ext/imap/php_imap.c
@@ -351,6 +351,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_utf7_encode, 0, 0, 1)
        ZEND_ARG_INFO(0, buf)
 ZEND_END_ARG_INFO()
 
+#ifdef HAVE_IMAP_MUTF7
 ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_utf8_to_mutf7, 0, 0, 1)
        ZEND_ARG_INFO(0, in)
 ZEND_END_ARG_INFO()
@@ -358,6 +359,7 @@ ZEND_END_ARG_INFO()
 ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_mutf7_to_utf8, 0, 0, 1)
        ZEND_ARG_INFO(0, in)
 ZEND_END_ARG_INFO()
+#endif
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_setflag_full, 0, 0, 3)
        ZEND_ARG_INFO(0, stream_id)
@@ -517,8 +519,10 @@ const zend_function_entry imap_functions[] = {
        PHP_FE(imap_search,                                                             arginfo_imap_search)
        PHP_FE(imap_utf7_decode,                                                arginfo_imap_utf7_decode)
        PHP_FE(imap_utf7_encode,                                                arginfo_imap_utf7_encode)
+#ifdef HAVE_IMAP_MUTF7
        PHP_FE(imap_utf8_to_mutf7,                                              arginfo_imap_utf8_to_mutf7)
        PHP_FE(imap_mutf7_to_utf8,                                              arginfo_imap_mutf7_to_utf8)
+#endif
        PHP_FE(imap_mime_header_decode,                                 arginfo_imap_mime_header_decode)
        PHP_FE(imap_thread,                                                             arginfo_imap_thread)
        PHP_FE(imap_timeout,                                                            arginfo_imap_timeout)
@@ -2342,7 +2346,7 @@ PHP_FUNCTION(imap_savebody)
        IMAPG(gets_stream) = writer;
        mail_parameters(NIL, SET_GETS, (void *) php_mail_gets);
        mail_fetchbody_full(imap_ptr->imap_stream, msgno, section, NULL, flags);
-       mail_parameters(NIL, SET_GETS, (void *) NIL);
+       mail_parameters(NIL, SET_GETS, (void *) NULL);
        IMAPG(gets_stream) = NULL;
 
        if (close_stream) {
@@ -2895,6 +2899,7 @@ PHP_FUNCTION(imap_utf7_encode)
 #undef B64
 #undef UNB64
 
+#ifdef HAVE_IMAP_MUTF7
 static void php_imap_mutf7(INTERNAL_FUNCTION_PARAMETERS, int mode)
 {
        char *in;
@@ -2935,6 +2940,7 @@ PHP_FUNCTION(imap_mutf7_to_utf8)
 {
        php_imap_mutf7(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1);
 }
+#endif
 
 /* {{{ proto bool imap_setflag_full(resource stream_id, string sequence, string flag [, int options])
    Sets flags on messages */

diff --git a/ext/imap/php_imap.h b/ext/imap/php_imap.h
index 6f44029562a407efd11d763ba8651982613e0b83..c060ee716cffb13d192e1b47350104a3b9a2109c 100644 (file)
--- a/ext/imap/php_imap.h
+++ b/ext/imap/php_imap.h
@@ -165,8 +165,10 @@ PHP_FUNCTION(imap_search);
 PHP_FUNCTION(imap_utf8);
 PHP_FUNCTION(imap_utf7_decode);
 PHP_FUNCTION(imap_utf7_encode);
+#ifdef HAVE_IMAP_MUTF7
 PHP_FUNCTION(imap_utf8_to_mutf7);
 PHP_FUNCTION(imap_mutf7_to_utf8);
+#endif
 PHP_FUNCTION(imap_mime_header_decode);
 PHP_FUNCTION(imap_thread);
 PHP_FUNCTION(imap_timeout);