[PHP-CVS] cvs: php-src(PHP_5_2) /ext/imap config.m4

2007-02-11 Thread Antony Dovgal 
tony2001Sun Feb 11 09:25:32 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/imap   config.m4 
  Log:
  MFH
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/imap/config.m4?r1=1.69.4.6r2=1.69.4.7diff_format=u
Index: php-src/ext/imap/config.m4
diff -u php-src/ext/imap/config.m4:1.69.4.6 php-src/ext/imap/config.m4:1.69.4.7
--- php-src/ext/imap/config.m4:1.69.4.6 Tue Jan 23 12:37:21 2007
+++ php-src/ext/imap/config.m4  Sun Feb 11 09:25:32 2007
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.69.4.6 2007/01/23 12:37:21 bjori Exp $
+dnl $Id: config.m4,v 1.69.4.7 2007/02/11 09:25:32 tony2001 Exp $
 dnl
 
 AC_DEFUN([IMAP_INC_CHK],[if test -r $i$1/c-client.h; then
@@ -137,7 +137,7 @@
 if test $ac_cv_utf8_mime2text = new; then
   AC_DEFINE(HAVE_NEW_MIME2TEXT, 1, [Whether utf8_mime2text() has new 
signature])
 fi
-CFLAGS=$old_CPPFLAGS
+CFLAGS=$old_CFLAGS
 
 old_CFLAGS=$CFLAGS
 CFLAGS=-I$IMAP_INC_DIR
@@ -152,7 +152,7 @@
  ac_cv_u8t_canonical=no
   ])
 )
-CFLAGS=$old_CPPFLAGS
+CFLAGS=$old_CFLAGS
 
 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.])

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/imap config.m4

2007-01-23 Thread Hannes Magnusson 
bjori   Tue Jan 23 12:37:21 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/imap   config.m4 
  Log:
  Fix typo
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/imap/config.m4?r1=1.69.4.5r2=1.69.4.6diff_format=u
Index: php-src/ext/imap/config.m4
diff -u php-src/ext/imap/config.m4:1.69.4.5 php-src/ext/imap/config.m4:1.69.4.6
--- php-src/ext/imap/config.m4:1.69.4.5 Fri Jan 19 22:33:25 2007
+++ php-src/ext/imap/config.m4  Tue Jan 23 12:37:21 2007
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.69.4.5 2007/01/19 22:33:25 tony2001 Exp $
+dnl $Id: config.m4,v 1.69.4.6 2007/01/23 12:37:21 bjori Exp $
 dnl
 
 AC_DEFUN([IMAP_INC_CHK],[if test -r $i$1/c-client.h; then
@@ -65,7 +65,7 @@
 
 AC_DEFUN([PHP_IMAP_SSL_CHK], [
   if test $PHP_IMAP_SSL != no; then
-if test $PHP_OPENSSL == ; then
+if test $PHP_OPENSSL = ; then
   PHP_OPENSSL='no'
 fi
 PHP_SETUP_OPENSSL(IMAP_SHARED_LIBADD,

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/imap config.m4

2007-01-19 Thread Antony Dovgal 
tony2001Fri Jan 19 20:45:09 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/imap   config.m4 
  Log:
  MFH: improve utf8_mime2text() signature detection
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/imap/config.m4?r1=1.69.4.3r2=1.69.4.4diff_format=u
Index: php-src/ext/imap/config.m4
diff -u php-src/ext/imap/config.m4:1.69.4.3 php-src/ext/imap/config.m4:1.69.4.4
--- php-src/ext/imap/config.m4:1.69.4.3 Thu Jan 18 14:05:21 2007
+++ php-src/ext/imap/config.m4  Fri Jan 19 20:45:09 2007
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.69.4.3 2007/01/18 14:05:21 tony2001 Exp $
+dnl $Id: config.m4,v 1.69.4.4 2007/01/19 20:45:09 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

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/imap config.m4

2007-01-19 Thread Antony Dovgal 
tony2001Fri Jan 19 22:33:26 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/imap   config.m4 
  Log:
  MFH
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/imap/config.m4?r1=1.69.4.4r2=1.69.4.5diff_format=u
Index: php-src/ext/imap/config.m4
diff -u php-src/ext/imap/config.m4:1.69.4.4 php-src/ext/imap/config.m4:1.69.4.5
--- php-src/ext/imap/config.m4:1.69.4.4 Fri Jan 19 20:45:09 2007
+++ php-src/ext/imap/config.m4  Fri Jan 19 22:33:25 2007
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.69.4.4 2007/01/19 20:45:09 tony2001 Exp $
+dnl $Id: config.m4,v 1.69.4.5 2007/01/19 22:33:25 tony2001 Exp $
 dnl
 
 AC_DEFUN([IMAP_INC_CHK],[if test -r $i$1/c-client.h; then
@@ -123,6 +123,7 @@
 CFLAGS=-I$IMAP_INC_DIR
 AC_CACHE_CHECK(for utf8_mime2text signature, ac_cv_utf8_mime2text,
   AC_TRY_COMPILE([
+#include stdio.h
 #include c-client.h
   ],[
 SIZEDTEXT *src, *dst;

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/imap config.m4

2007-01-18 Thread Antony Dovgal 
tony2001Thu Jan 18 14:05:21 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/imap   config.m4 
  Log:
  MFH: improve check configure for new version of utf8_mime2text()
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/imap/config.m4?r1=1.69.4.2r2=1.69.4.3diff_format=u
Index: php-src/ext/imap/config.m4
diff -u php-src/ext/imap/config.m4:1.69.4.2 php-src/ext/imap/config.m4:1.69.4.3
--- php-src/ext/imap/config.m4:1.69.4.2 Mon Jan  8 22:24:11 2007
+++ php-src/ext/imap/config.m4  Thu Jan 18 14:05:21 2007
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.69.4.2 2007/01/08 22:24:11 andrei Exp $
+dnl $Id: config.m4,v 1.69.4.3 2007/01/18 14:05:21 tony2001 Exp $
 dnl
 
 AC_DEFUN([IMAP_INC_CHK],[if test -r $i$1/c-client.h; then
@@ -117,11 +117,26 @@
 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

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/imap config.m4

2007-01-08 Thread Andrei Zmievski 
andrei  Mon Jan  8 22:24:11 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/imap   config.m4 
  Log:
  MFH
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/imap/config.m4?r1=1.69.4.1r2=1.69.4.2diff_format=u
Index: php-src/ext/imap/config.m4
diff -u php-src/ext/imap/config.m4:1.69.4.1 php-src/ext/imap/config.m4:1.69.4.2
--- php-src/ext/imap/config.m4:1.69.4.1 Sun Sep 24 18:06:37 2006
+++ php-src/ext/imap/config.m4  Mon Jan  8 22:24:11 2007
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.69.4.1 2006/09/24 18:06:37 iliaa Exp $
+dnl $Id: config.m4,v 1.69.4.2 2007/01/08 22:24:11 andrei Exp $
 dnl
 
 AC_DEFUN([IMAP_INC_CHK],[if test -r $i$1/c-client.h; then
@@ -65,6 +65,9 @@
 
 AC_DEFUN([PHP_IMAP_SSL_CHK], [
   if test $PHP_IMAP_SSL != no; then
+if test $PHP_OPENSSL == ; then
+  PHP_OPENSSL='no'
+fi
 PHP_SETUP_OPENSSL(IMAP_SHARED_LIBADD,
 [
   AC_DEFINE(HAVE_IMAP_SSL,1,[ ])

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php