From: Antony Dovgal <tony2001@php.net>
Date: Thu, 18 Jan 2007 14:05:07 +0000 (+0000)
Subject: improve check configure for new version of utf8_mime2text()
X-Git-Tag: RELEASE_1_0_0RC1~231
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6dd9b26716dfb1f2cfdfec80b15f459fdb5e35fc;p=php

improve check configure for new version of utf8_mime2text()
---

diff --git a/ext/imap/config.m4 b/ext/imap/config.m4
index bb944da869..ffb00475bc 100644
--- a/ext/imap/config.m4
+++ b/ext/imap/config.m4
@@ -117,11 +117,26 @@ if test "$PHP_IMAP" != "no"; then
     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
-    AC_EGREP_HEADER(mail_append_set, $IMAP_INC_DIR/mail.h, [
-      AC_DEFINE(HAVE_NEW_MIME2TEXT,1,[ ])
-    ])
+    old_CFLAGS=$CFLAGS
+    CFLAGS="-I$IMAP_INC_DIR"
+	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
+	  ])
+    )
+    if test "$ac_cv_utf8_mime2text" = "new"; then
+      AC_DEFINE(HAVE_NEW_MIME2TEXT, 1, [Whether utf8_mime2text() has new signature])
+    fi
+    CFLAGS=$old_CPPFLAGS
 
     dnl Check for c-client version 2001
     old_CPPFLAGS=$CPPFLAGS