Re: [PHP-CVS] cvs: php-src /ext/imap config.m4 php_imap.c php_imap.h

2009-05-05 Thread Jani Taskinen 
That might work in wonderland when using toy OS like Windows but in the real 
world and with real OSes you can't force people to start using the bleeding edge 
stuff.


--Jani

p.s. You still owe me money.

Pierre Joye kirjoitti:

Hi Jani,

I wonder if we should not require a decent c-client version instead,
for 5.3+. It has been proven now that versions before 2007 are not
safe and most distros (if not all) have updated their c-client to the
latest. Thoughts?

Cheers,

On Tue, May 5, 2009 at 3:22 AM, Jani Taskinen j...@php.net wrote:

janiTue May  5 01:22:31 2009 UTC

 Modified files:
   /php-src/ext/imap   config.m4 php_imap.c php_imap.h
 Log:
 - Fix build (modified utf7 stuff is rather new..)

http://cvs.php.net/viewvc.cgi/php-src/ext/imap/config.m4?r1=1.79r2=180diff_format=u
Index: php-src/ext/imap/config.m4
diff -u php-src/ext/imap/config.m4:1.79 php-src/ext/imap/config.m4:1.80
--- php-src/ext/imap/config.m4:1.79 Sat Apr  4 16:58:39 2009
+++ php-src/ext/imap/config.m4  Tue May  5 01:22:31 2009
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.79 2009/04/04 16:58:39 sean Exp $
+dnl $Id: config.m4,v 1.80 2009/05/05 01:22:31 jani Exp $
 dnl

 AC_DEFUN([IMAP_INC_CHK],[if test -r $i$1/c-client.h; then
@@ -228,13 +228,10 @@
  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 @@
  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
http://cvs.php.net/viewvc.cgi/php-src/ext/imap/php_imap.c?r1=1.286r2=1.287diff_format=u
Index: php-src/ext/imap/php_imap.c
diff -u php-src/ext/imap/php_imap.c:1.286 php-src/ext/imap/php_imap.c:1.287
--- php-src/ext/imap/php_imap.c:1.286   Sat May  2 17:32:35 2009
+++ php-src/ext/imap/php_imap.c Tue May  5 01:22:31 2009
@@ -26,7 +26,7 @@
   | PHP 4.0 updates:  Zeev Suraski z...@zend.com   |
   +--+
 */
-/* $Id: php_imap.c,v 1.286 2009/05/02 17:32:35 pajoye Exp $ */
+/* $Id: php_imap.c,v 1.287 2009/05/05 01:22:31 jani Exp $ */

 #define IMAP41

@@ -351,6 +351,7 @@
   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_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 @@
   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)
@@ -2338,7 +2342,7 @@
   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) {
@@ -2891,6 +2895,7 @@
 #undef B64
 #undef UNB64

+#ifdef HAVE_IMAP_MUTF7
 static void php_imap_mutf7(INTERNAL_FUNCTION_PARAMETERS, int mode)
 {
   char *in;
@@ -2937,6 +2942,7 @@
 {
   php_imap_mutf7(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0);
 }
+#endif

 /* {{{ proto string imap_mutf7_to_utf8(string in)
   Decode a modified UTF-7 string to UTF-8 */
http://cvs.php.net/viewvc.cgi/php-src/ext/imap/php_imap.h?r1=1.40r2=1.41diff_format=u
Index:

Re: [PHP-CVS] cvs: php-src /ext/imap config.m4 php_imap.c php_imap.h

2009-05-05 Thread Pierre Joye 
On Tue, May 5, 2009 at 6:29 PM, Jani Taskinen jani.taski...@sci.fi wrote:
 That might work in wonderland when using toy OS like Windows but in the real
 world and with real OSes you can't force people to start using the bleeding
 edge stuff.

it is 2 years old :)

-- 
Pierre

http://blog.thepimp.net | http://www.libgd.org

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

[PHP-CVS] cvs: php-src /ext/imap config.m4 php_imap.c php_imap.h

2009-05-04 Thread Jani Taskinen 
janiTue May  5 01:22:31 2009 UTC

  Modified files:  
/php-src/ext/imap   config.m4 php_imap.c php_imap.h 
  Log:
  - Fix build (modified utf7 stuff is rather new..)
  
http://cvs.php.net/viewvc.cgi/php-src/ext/imap/config.m4?r1=1.79r2=1.80diff_format=u
Index: php-src/ext/imap/config.m4
diff -u php-src/ext/imap/config.m4:1.79 php-src/ext/imap/config.m4:1.80
--- php-src/ext/imap/config.m4:1.79 Sat Apr  4 16:58:39 2009
+++ php-src/ext/imap/config.m4  Tue May  5 01:22:31 2009
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.79 2009/04/04 16:58:39 sean Exp $
+dnl $Id: config.m4,v 1.80 2009/05/05 01:22:31 jani Exp $
 dnl
 
 AC_DEFUN([IMAP_INC_CHK],[if test -r $i$1/c-client.h; then
@@ -228,13 +228,10 @@
   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 @@
   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
http://cvs.php.net/viewvc.cgi/php-src/ext/imap/php_imap.c?r1=1.286r2=1.287diff_format=u
Index: php-src/ext/imap/php_imap.c
diff -u php-src/ext/imap/php_imap.c:1.286 php-src/ext/imap/php_imap.c:1.287
--- php-src/ext/imap/php_imap.c:1.286   Sat May  2 17:32:35 2009
+++ php-src/ext/imap/php_imap.c Tue May  5 01:22:31 2009
@@ -26,7 +26,7 @@
| PHP 4.0 updates:  Zeev Suraski z...@zend.com   |
+--+
  */
-/* $Id: php_imap.c,v 1.286 2009/05/02 17:32:35 pajoye Exp $ */
+/* $Id: php_imap.c,v 1.287 2009/05/05 01:22:31 jani Exp $ */
 
 #define IMAP41
 
@@ -351,6 +351,7 @@
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_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 @@
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)
@@ -2338,7 +2342,7 @@
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) {
@@ -2891,6 +2895,7 @@
 #undef B64
 #undef UNB64
 
+#ifdef HAVE_IMAP_MUTF7
 static void php_imap_mutf7(INTERNAL_FUNCTION_PARAMETERS, int mode)
 {
char *in;
@@ -2937,6 +2942,7 @@
 {
php_imap_mutf7(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0);
 }
+#endif
 
 /* {{{ proto string imap_mutf7_to_utf8(string in)
Decode a modified UTF-7 string to UTF-8 */
http://cvs.php.net/viewvc.cgi/php-src/ext/imap/php_imap.h?r1=1.40r2=1.41diff_format=u
Index: php-src/ext/imap/php_imap.h
diff -u php-src/ext/imap/php_imap.h:1.40 php-src/ext/imap/php_imap.h:1.41
--- php-src/ext/imap/php_imap.h:1.40Sat May  2 17:32:35 2009
+++ php-src/ext/imap/php_imap.h Tue May  5 01:22:31 2009
@@ -27,7 +27,7 @@
+--+
  */
 
-/* $Id: php_imap.h,v 1.40 2009/05/02 17:32:35 pajoye Exp $ */
+/* $Id: php_imap.h,v 1.41 2009/05/05 01:22:31 jani Exp $ */
 
 #ifndef PHP_IMAP_H
 #define PHP_IMAP_H
@@

Re: [PHP-CVS] cvs: php-src /ext/imap config.m4 php_imap.c php_imap.h

2009-05-04 Thread Kalle Sommer Nielsen 
2009/5/5 Jani Taskinen j...@php.net:
 jani            Tue May  5 01:22:31 2009 UTC

  Modified files:
    /php-src/ext/imap   config.m4 php_imap.c php_imap.h
  Log:
  - Fix build (modified utf7 stuff is rather new..)


No AC_DEFINE()'s to config.w32? So its no disabled on Windows, in
future please remember such things, as it was the reason for
socket_create_pair() not being available on Windows from 4.3 to 5.3 by
such a change by you.

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





-- 
Kalle Sommer Nielsen
ka...@php.net

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

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

2009-04-04 Thread Sean Coates 
seanSat Apr  4 16:58:39 2009 UTC

  Modified files:  
/php-src/ext/imap   config.m4 
  Log:
  improve error message when missing c-client (just bit me on Ubuntu 8.10)
  
http://cvs.php.net/viewvc.cgi/php-src/ext/imap/config.m4?r1=1.78r2=1.79diff_format=u
Index: php-src/ext/imap/config.m4
diff -u php-src/ext/imap/config.m4:1.78 php-src/ext/imap/config.m4:1.79
--- php-src/ext/imap/config.m4:1.78 Thu Oct 16 16:21:20 2008
+++ php-src/ext/imap/config.m4  Sat Apr  4 16:58:39 2009
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.78 2008/10/16 16:21:20 dmitry Exp $
+dnl $Id: config.m4,v 1.79 2009/04/04 16:58:39 sean Exp $
 dnl
 
 AC_DEFUN([IMAP_INC_CHK],[if test -r $i$1/c-client.h; then
@@ -161,10 +161,10 @@
 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.])
+   AC_MSG_ERROR([utf8_mime2text() has new signature, but 
U8T_CANONICAL is missing. This should not happen. You may not have c-client 
installed properly. 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.])
+   AC_MSG_ERROR([utf8_mime2text() has old signature, but 
U8T_CANONICAL is present. This should not happen. You may not have c-client 
installed properly. Check config.log for additional information.])
 fi
 
 dnl Check for c-client version 2001



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

[PHP-CVS] cvs: php-src /ext/imap config.m4 php_imap.c

2008-10-16 Thread Dmitry Stogov 
dmitry  Thu Oct 16 16:21:21 2008 UTC

  Modified files:  
/php-src/ext/imap   config.m4 php_imap.c 
  Log:
  Fixed bug #42862 (IMAP toolkit crash: rfc822.c legacy routine buffer overflow)
  
  http://cvs.php.net/viewvc.cgi/php-src/ext/imap/config.m4?r1=1.77r2=1.78diff_format=u
Index: php-src/ext/imap/config.m4
diff -u php-src/ext/imap/config.m4:1.77 php-src/ext/imap/config.m4:1.78
--- php-src/ext/imap/config.m4:1.77 Thu Jan 31 18:48:00 2008
+++ php-src/ext/imap/config.m4  Thu Oct 16 16:21:20 2008
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.77 2008/01/31 18:48:00 nlopess Exp $
+dnl $Id: config.m4,v 1.78 2008/10/16 16:21:20 dmitry Exp $
 dnl
 
 AC_DEFUN([IMAP_INC_CHK],[if test -r $i$1/c-client.h; then
@@ -235,4 +235,40 @@
   AC_MSG_RESULT(no)
   AC_MSG_ERROR([build test failed. Please check the config.log for 
details.])
 ], $TST_LIBS)
+
+AC_MSG_CHECKING(whether rfc822_output_address_list function present)
+PHP_TEST_BUILD(foobar, [
+  AC_MSG_RESULT(yes)
+  AC_DEFINE(HAVE_RFC822_OUTPUT_ADDRESS_LIST, 1, [ ])
+], [
+  AC_MSG_RESULT(no)
+   ], [
+  $TST_LIBS
+], [
+#if defined(__GNUC__)  __GNUC__ = 4
+# define PHP_IMAP_EXPORT __attribute__ ((visibility(default)))
+#else
+# define PHP_IMAP_EXPORT
+#endif
+
+  PHP_IMAP_EXPORT void mm_log(void){}
+  PHP_IMAP_EXPORT void mm_dlog(void){}
+  PHP_IMAP_EXPORT void mm_flags(void){}
+  PHP_IMAP_EXPORT void mm_fatal(void){}
+  PHP_IMAP_EXPORT void mm_critical(void){}
+  PHP_IMAP_EXPORT void mm_nocritical(void){}
+  PHP_IMAP_EXPORT void mm_notify(void){}
+  PHP_IMAP_EXPORT void mm_login(void){}
+  PHP_IMAP_EXPORT void mm_diskerror(void){}
+  PHP_IMAP_EXPORT void mm_status(void){}
+  PHP_IMAP_EXPORT void mm_lsub(void){}
+  PHP_IMAP_EXPORT void mm_list(void){}
+  PHP_IMAP_EXPORT void mm_exists(void){}
+  PHP_IMAP_EXPORT void mm_searched(void){}
+  PHP_IMAP_EXPORT void mm_expunged(void){}
+  void rfc822_output_address_list(void);
+  void (*f)(void);
+  char foobar () {f = rfc822_output_address_list;}
+])
+
 fi
http://cvs.php.net/viewvc.cgi/php-src/ext/imap/php_imap.c?r1=1.259r2=1.260diff_format=u
Index: php-src/ext/imap/php_imap.c
diff -u php-src/ext/imap/php_imap.c:1.259 php-src/ext/imap/php_imap.c:1.260
--- php-src/ext/imap/php_imap.c:1.259   Mon Oct  6 01:19:07 2008
+++ php-src/ext/imap/php_imap.c Thu Oct 16 16:21:20 2008
@@ -26,7 +26,7 @@
| PHP 4.0 updates:  Zeev Suraski [EMAIL PROTECTED]   |
+--+
  */
-/* $Id: php_imap.c,v 1.259 2008/10/06 01:19:07 iliaa Exp $ */
+/* $Id: php_imap.c,v 1.260 2008/10/16 16:21:20 dmitry Exp $ */
 
 #define IMAP41
 
@@ -40,6 +40,7 @@
 #include ext/standard/php_string.h
 #include ext/standard/info.h
 #include ext/standard/file.h
+#include ext/standard/php_smart_str.h
 
 #ifdef ERROR
 #undef ERROR
@@ -72,10 +73,11 @@
 # define PHP_IMAP_EXPORT
 #endif
 
+
 static void _php_make_header_object(zval *myzvalue, ENVELOPE *en TSRMLS_DC);
 static void _php_imap_add_body(zval *arg, BODY *body TSRMLS_DC);
-static void _php_imap_parse_address(ADDRESS *addresslist, char **fulladdress, 
zval *paddress TSRMLS_DC);
-static int _php_imap_address_size(ADDRESS *addresslist);
+static char* _php_imap_parse_address(ADDRESS *addresslist, zval *paddress 
TSRMLS_DC);
+static char* _php_rfc822_write_address(ADDRESS *addresslist TSRMLS_DC);
 
 /* the gets we use */
 static char *php_mail_gets(readfn_t f, void *stream, unsigned long size, 
GETS_DATA *md);
@@ -2473,7 +2475,7 @@
char *mailbox, *host, *personal;
int mailbox_len, host_len, personal_len;
ADDRESS *addr;
-   char string[MAILTMPLEN];
+   char *string;
 
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, sss, mailbox, 
mailbox_len, host, host_len, personal, personal_len) == FAILURE) {
return;
@@ -2497,13 +2499,12 @@
addr-error=NIL;
addr-adl=NIL;
 
-   if (_php_imap_address_size(addr) = MAILTMPLEN) {
+   string = _php_rfc822_write_address(addr TSRMLS_CC);
+   if (string) {
+   RETVAL_STRING(string, 0);
+   } else {
RETURN_FALSE;
}
-
-   string[0]='\0';
-   rfc822_write_address(string, addr);
-   RETVAL_STRING(string, 1);
 }
 /* }}} */
 
@@ -3213,7 +3214,7 @@
int sequence_len;
pils *imap_le_struct;
zval *myoverview;
-   char address[MAILTMPLEN];
+   char *address;
long status, flags = 0L;
int argc = ZEND_NUM_ARGS();
 
@@ -3242,17 +3243,19 @@
if (env-subject) {
add_property_string(myoverview, 
subject, env-subject, 1);
}
-   if (env-from  
_php_imap_address_size(env-from)  MAILTMPLEN) {
+   if (env-from) {

[PHP-CVS] cvs: php-src /ext/imap config.m4 php_imap.c

2008-01-31 Thread Nuno Lopes 
nlopess Thu Jan 31 18:48:01 2008 UTC

  Modified files:  
/php-src/ext/imap   config.m4 php_imap.c 
  Log:
  fix gcc 4 build
  
http://cvs.php.net/viewvc.cgi/php-src/ext/imap/config.m4?r1=1.76r2=1.77diff_format=u
Index: php-src/ext/imap/config.m4
diff -u php-src/ext/imap/config.m4:1.76 php-src/ext/imap/config.m4:1.77
--- php-src/ext/imap/config.m4:1.76 Sun Feb 11 09:25:25 2007
+++ php-src/ext/imap/config.m4  Thu Jan 31 18:48:00 2008
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.76 2007/02/11 09:25:25 tony2001 Exp $
+dnl $Id: config.m4,v 1.77 2008/01/31 18:48:00 nlopess Exp $
 dnl
 
 AC_DEFUN([IMAP_INC_CHK],[if test -r $i$1/c-client.h; then
@@ -24,21 +24,27 @@
 AC_DEFUN([PHP_IMAP_TEST_BUILD], [
   PHP_TEST_BUILD([$1], [$2], [$3], [$4],
   [
-void mm_log(void){}
-void mm_dlog(void){}
-void mm_flags(void){}
-void mm_fatal(void){}
-void mm_critical(void){}
-void mm_nocritical(void){}
-void mm_notify(void){}
-void mm_login(void){}
-void mm_diskerror(void){}
-void mm_status(void){}
-void mm_lsub(void){}
-void mm_list(void){}
-void mm_exists(void){}
-void mm_searched(void){}
-void mm_expunged(void){}
+#if defined(__GNUC__)  __GNUC__ = 4
+# define PHP_IMAP_EXPORT __attribute__ ((visibility(default)))
+#else
+# define PHP_IMAP_EXPORT
+#endif
+
+PHP_IMAP_EXPORT void mm_log(void){}
+PHP_IMAP_EXPORT void mm_dlog(void){}
+PHP_IMAP_EXPORT void mm_flags(void){}
+PHP_IMAP_EXPORT void mm_fatal(void){}
+PHP_IMAP_EXPORT void mm_critical(void){}
+PHP_IMAP_EXPORT void mm_nocritical(void){}
+PHP_IMAP_EXPORT void mm_notify(void){}
+PHP_IMAP_EXPORT void mm_login(void){}
+PHP_IMAP_EXPORT void mm_diskerror(void){}
+PHP_IMAP_EXPORT void mm_status(void){}
+PHP_IMAP_EXPORT void mm_lsub(void){}
+PHP_IMAP_EXPORT void mm_list(void){}
+PHP_IMAP_EXPORT void mm_exists(void){}
+PHP_IMAP_EXPORT void mm_searched(void){}
+PHP_IMAP_EXPORT void mm_expunged(void){}
   ])
 ])
 
http://cvs.php.net/viewvc.cgi/php-src/ext/imap/php_imap.c?r1=1.242r2=1.243diff_format=u
Index: php-src/ext/imap/php_imap.c
diff -u php-src/ext/imap/php_imap.c:1.242 php-src/ext/imap/php_imap.c:1.243
--- php-src/ext/imap/php_imap.c:1.242   Mon Dec 31 07:12:10 2007
+++ php-src/ext/imap/php_imap.c Thu Jan 31 18:48:00 2008
@@ -26,7 +26,7 @@
| PHP 4.0 updates:  Zeev Suraski [EMAIL PROTECTED]   |
+--+
  */
-/* $Id: php_imap.c,v 1.242 2007/12/31 07:12:10 sebastian Exp $ */
+/* $Id: php_imap.c,v 1.243 2008/01/31 18:48:00 nlopess Exp $ */
 
 #define IMAP41
 
@@ -66,6 +66,12 @@
 #define SENDBUFLEN 16385
 #endif
 
+#if defined(__GNUC__)  __GNUC__ = 4
+# define PHP_IMAP_EXPORT __attribute__ ((visibility(default)))
+#else
+# define PHP_IMAP_EXPORT
+#endif
+
 static void _php_make_header_object(zval *myzvalue, ENVELOPE *en TSRMLS_DC);
 static void _php_imap_add_body(zval *arg, BODY *body TSRMLS_DC);
 static void _php_imap_parse_address(ADDRESS *addresslist, char **fulladdress, 
zval *paddress TSRMLS_DC);
@@ -4331,7 +4337,7 @@
 
 /* {{{ Interfaces to C-client 
  */
-void mm_searched(MAILSTREAM *stream, unsigned long number)
+PHP_IMAP_EXPORT void mm_searched(MAILSTREAM *stream, unsigned long number)
 {
MESSAGELIST *cur = NIL;
TSRMLS_FETCH();
@@ -4351,20 +4357,20 @@
}
 }
 
-void mm_exists(MAILSTREAM *stream, unsigned long number)
+PHP_IMAP_EXPORT void mm_exists(MAILSTREAM *stream, unsigned long number)
 {
 }
 
-void mm_expunged(MAILSTREAM *stream, unsigned long number)
+PHP_IMAP_EXPORT void mm_expunged(MAILSTREAM *stream, unsigned long number)
 {
 }
 
-void mm_flags(MAILSTREAM *stream, unsigned long number)
+PHP_IMAP_EXPORT void mm_flags(MAILSTREAM *stream, unsigned long number)
 {
 }
 
 /* Author: CJH */
-void mm_notify(MAILSTREAM *stream, char *str, long errflg)
+PHP_IMAP_EXPORT void mm_notify(MAILSTREAM *stream, char *str, long errflg)
 {
STRINGLIST *cur = NIL;
TSRMLS_FETCH();
@@ -4387,7 +4393,7 @@
}
 }
 
-void mm_list(MAILSTREAM *stream, DTYPE delimiter, char *mailbox, long 
attributes)
+PHP_IMAP_EXPORT void mm_list(MAILSTREAM *stream, DTYPE delimiter, char 
*mailbox, long attributes)
 {
STRINGLIST *cur=NIL;
FOBJECTLIST *ocur=NIL;
@@ -4434,7 +4440,7 @@
}
 }
 
-void mm_lsub(MAILSTREAM *stream, DTYPE delimiter, char *mailbox, long 
attributes)
+PHP_IMAP_EXPORT void mm_lsub(MAILSTREAM *stream, DTYPE delimiter, char 
*mailbox, long attributes)
 {
STRINGLIST *cur=NIL;
FOBJECTLIST *ocur=NIL;
@@ -4478,7 +4484,7 @@
}
 }
 
-void mm_status(MAILSTREAM *stream, char *mailbox, MAILSTATUS *status)
+PHP_IMAP_EXPORT void mm_status(MAILSTREAM *stream, char *mailbox, MAILSTATUS 
*status)
 {
TSRMLS_FETCH();
 
@@ -4500,7 +4506,7 @@
}
 }
 
-void mm_log(char *str, long errflg)
+PHP_IMAP_EXPORT void mm_log(char *str, long errflg)
 {
ERRORLIST *cur =

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

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

  Modified files:  
/php-src/ext/imap   config.m4 
  Log:
  fix typos
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/imap/config.m4?r1=1.75r2=1.76diff_format=u
Index: php-src/ext/imap/config.m4
diff -u php-src/ext/imap/config.m4:1.75 php-src/ext/imap/config.m4:1.76
--- php-src/ext/imap/config.m4:1.75 Tue Jan 23 12:38:40 2007
+++ php-src/ext/imap/config.m4  Sun Feb 11 09:25:25 2007
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.75 2007/01/23 12:38:40 bjori Exp $
+dnl $Id: config.m4,v 1.76 2007/02/11 09:25:25 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 /ext/imap config.m4

2007-01-23 Thread Hannes Magnusson 
bjori   Tue Jan 23 12:38:40 2007 UTC

  Modified files:  
/php-src/ext/imap   config.m4 
  Log:
  MFB: Fix typo
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/imap/config.m4?r1=1.74r2=1.75diff_format=u
Index: php-src/ext/imap/config.m4
diff -u php-src/ext/imap/config.m4:1.74 php-src/ext/imap/config.m4:1.75
--- php-src/ext/imap/config.m4:1.74 Fri Jan 19 22:33:10 2007
+++ php-src/ext/imap/config.m4  Tue Jan 23 12:38:40 2007
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.74 2007/01/19 22:33:10 tony2001 Exp $
+dnl $Id: config.m4,v 1.75 2007/01/23 12:38:40 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 /ext/imap config.m4

2007-01-19 Thread Antony Dovgal 
tony2001Fri 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.72r2=1.73diff_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

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

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

  Modified files:  
/php-src/ext/imap   config.m4 
  Log:
  fix configure check with imap-2001
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/imap/config.m4?r1=1.73r2=1.74diff_format=u
Index: php-src/ext/imap/config.m4
diff -u php-src/ext/imap/config.m4:1.73 php-src/ext/imap/config.m4:1.74
--- php-src/ext/imap/config.m4:1.73 Fri Jan 19 20:44:52 2007
+++ php-src/ext/imap/config.m4  Fri Jan 19 22:33:10 2007
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.73 2007/01/19 20:44:52 tony2001 Exp $
+dnl $Id: config.m4,v 1.74 2007/01/19 22:33:10 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 /ext/imap config.m4

2007-01-08 Thread Andrei Zmievski 
andrei  Mon Jan  8 18:23:23 2007 UTC

  Modified files:  
/php-src/ext/imap   config.m4 
  Log:
  Fix IMAP check.
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/imap/config.m4?r1=1.70r2=1.71diff_format=u
Index: php-src/ext/imap/config.m4
diff -u php-src/ext/imap/config.m4:1.70 php-src/ext/imap/config.m4:1.71
--- php-src/ext/imap/config.m4:1.70 Sun Sep 24 18:06:53 2006
+++ php-src/ext/imap/config.m4  Mon Jan  8 18:23:23 2007
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.70 2006/09/24 18:06:53 iliaa Exp $
+dnl $Id: config.m4,v 1.71 2007/01/08 18:23:23 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

[PHP-CVS] cvs: php-src /ext/imap config.m4 php_imap.c

2006-09-24 Thread Ilia Alshanetsky 
iliaa   Sun Sep 24 18:06:53 2006 UTC

  Modified files:  
/php-src/ext/imap   php_imap.c config.m4 
  Log:
  MFB: Fixed bug #38941 (imap extension does not compile against new version
  of the imap library).
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/imap/php_imap.c?r1=1.223r2=1.224diff_format=u
Index: php-src/ext/imap/php_imap.c
diff -u php-src/ext/imap/php_imap.c:1.223 php-src/ext/imap/php_imap.c:1.224
--- php-src/ext/imap/php_imap.c:1.223   Tue Sep  5 11:24:23 2006
+++ php-src/ext/imap/php_imap.c Sun Sep 24 18:06:53 2006
@@ -26,7 +26,7 @@
| PHP 4.0 updates:  Zeev Suraski [EMAIL PROTECTED]   |
+--+
  */
-/* $Id: php_imap.c,v 1.223 2006/09/05 11:24:23 tony2001 Exp $ */
+/* $Id: php_imap.c,v 1.224 2006/09/24 18:06:53 iliaa Exp $ */
 
 #define IMAP41
 
@@ -75,7 +75,11 @@
 void rfc822_date(char *date);
 char *cpystr(const char *str);
 char *cpytxt(SIZEDTEXT *dst, char *text, unsigned long size);
+#ifndef HAVE_NEW_MIME2TEXT
 long utf8_mime2text(SIZEDTEXT *src, SIZEDTEXT *dst);
+#else
+long utf8_mime2text (SIZEDTEXT *src, SIZEDTEXT *dst, long flags);
+#endif
 unsigned long find_rightmost_bit(unsigned long *valptr);
 void fs_give(void **block);
 void *fs_get(size_t size);
http://cvs.php.net/viewvc.cgi/php-src/ext/imap/config.m4?r1=1.69r2=1.70diff_format=u
Index: php-src/ext/imap/config.m4
diff -u php-src/ext/imap/config.m4:1.69 php-src/ext/imap/config.m4:1.70
--- php-src/ext/imap/config.m4:1.69 Sun May 29 23:16:41 2005
+++ php-src/ext/imap/config.m4  Sun Sep 24 18:06:53 2006
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.69 2005/05/29 23:16:41 sniper Exp $
+dnl $Id: config.m4,v 1.70 2006/09/24 18:06:53 iliaa Exp $
 dnl
 
 AC_DEFUN([IMAP_INC_CHK],[if test -r $i$1/c-client.h; then
@@ -114,6 +114,11 @@
 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,[ ])
+])
 
 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 /ext/imap config.m4 php_imap.c

2005-01-10 Thread Jani Taskinen 
sniper  Mon Jan 10 23:56:06 2005 EDT

  Modified files:  
/php-src/ext/imap   config.m4 php_imap.c 
  Log:
  - Added check for IMAP 2005 version
  
http://cvs.php.net/diff.php/php-src/ext/imap/config.m4?r1=1.67r2=1.68ty=u
Index: php-src/ext/imap/config.m4
diff -u php-src/ext/imap/config.m4:1.67 php-src/ext/imap/config.m4:1.68
--- php-src/ext/imap/config.m4:1.67 Thu Dec 30 09:50:06 2004
+++ php-src/ext/imap/config.m4  Mon Jan 10 23:56:05 2005
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.67 2004/12/30 14:50:06 sniper Exp $
+dnl $Id: config.m4,v 1.68 2005/01/11 04:56:05 sniper Exp $
 dnl
 
 AC_DEFUN([IMAP_INC_CHK],[if test -r $i$1/c-client.h; then
@@ -110,6 +110,12 @@
   fi
 done
 
+dnl Check for c-client version 2004
+AC_EGREP_HEADER(mail_fetch_overview_sequence, $IMAP_INC_DIR/mail.h, [
+  AC_DEFINE(HAVE_IMAP2004,1,[ ])
+])
+
+dnl Check for c-client version 2001
 old_CPPFLAGS=$CPPFLAGS
 CPPFLAGS=-I$IMAP_INC_DIR
 AC_EGREP_CPP(this_is_true, [
http://cvs.php.net/diff.php/php-src/ext/imap/php_imap.c?r1=1.195r2=1.196ty=u
Index: php-src/ext/imap/php_imap.c
diff -u php-src/ext/imap/php_imap.c:1.195 php-src/ext/imap/php_imap.c:1.196
--- php-src/ext/imap/php_imap.c:1.195   Thu Dec 30 00:31:55 2004
+++ php-src/ext/imap/php_imap.c Mon Jan 10 23:56:06 2005
@@ -26,7 +26,7 @@
| PHP 4.0 updates:  Zeev Suraski [EMAIL PROTECTED]   |
+--+
  */
-/* $Id: php_imap.c,v 1.195 2004/12/30 05:31:55 sniper Exp $ */
+/* $Id: php_imap.c,v 1.196 2005/01/11 04:56:06 sniper Exp $ */
 
 #define IMAP41
 
@@ -694,7 +694,9 @@
 PHP_MINFO_FUNCTION(imap)
 {
php_info_print_table_start();
-#if HAVE_IMAP2001
+#if HAVE_IMAP2004
+   php_info_print_table_row(2, IMAP c-Client Version, 2004);
+#elif HAVE_IMAP2001
php_info_print_table_row(2, IMAP c-Client Version, 2001);
 #elif HAVE_IMAP2000
php_info_print_table_row(2, IMAP c-Client Version, 2000);
@@ -706,7 +708,7 @@
 #if HAVE_IMAP_SSL
php_info_print_table_row(2, SSL Support, enabled);
 #endif
-#if HAVE_IMAP_KRB
+#if HAVE_IMAP_KRB  HAVE_IMAP_AUTH_GSS
php_info_print_table_row(2, Kerberos Support, enabled);
 #endif
php_info_print_table_end();

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

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

2004-12-19 Thread Ilia Alshanetsky 
iliaa   Sun Dec 19 13:16:50 2004 EDT

  Modified files:  
/php-src/ext/imap   config.m4 
  Log:
  Fixed bug #31103 (Better error message when c-client cannot be found).
  
  
  
http://cvs.php.net/diff.php/php-src/ext/imap/config.m4?r1=1.64r2=1.65ty=u
Index: php-src/ext/imap/config.m4
diff -u php-src/ext/imap/config.m4:1.64 php-src/ext/imap/config.m4:1.65
--- php-src/ext/imap/config.m4:1.64 Wed Nov  3 09:32:50 2004
+++ php-src/ext/imap/config.m4  Sun Dec 19 13:16:50 2004
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.64 2004/11/03 14:32:50 jorton Exp $
+dnl $Id: config.m4,v 1.65 2004/12/19 18:16:50 iliaa Exp $
 dnl
 
 AC_DEFUN(IMAP_INC_CHK,[if test -r $i$1/c-client.h; then
@@ -161,7 +161,7 @@
 PHP_EXPAND_PATH($IMAP_DIR, IMAP_DIR)
 
 if test -z $IMAP_DIR; then
-  AC_MSG_ERROR(Cannot find rfc822.h. Please check your IMAP installation.)
+  AC_MSG_ERROR(Cannot find rfc822.h. Please check your c-client 
installation.)
 fi
 
 if test -r $IMAP_DIR/c-client/c-client.a; then
@@ -177,7 +177,7 @@
 done
 
 if test -z $IMAP_LIBDIR; then
-  AC_MSG_ERROR(Cannot find imap library (libc-client.a). Please check your 
IMAP installation.)
+  AC_MSG_ERROR(Cannot find imap library (libc-client.a). Please check your 
c-client installation.)
 fi
 
 PHP_ADD_INCLUDE($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 /ext/imap config.m4

2004-01-16 Thread Jani Taskinen 
sniper  Fri Jan 16 19:00:11 2004 EDT

  Modified files:  
/php-src/ext/imap   config.m4 
  Log:
  Fixed bug #26923 (ext/imap: pam and crypt libraries missing when build as shared)
  
Index: php-src/ext/imap/config.m4
diff -u php-src/ext/imap/config.m4:1.61 php-src/ext/imap/config.m4:1.62
--- php-src/ext/imap/config.m4:1.61 Fri Oct  3 01:24:22 2003
+++ php-src/ext/imap/config.m4  Fri Jan 16 19:00:11 2004
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.61 2003/10/03 05:24:22 sniper Exp $
+dnl $Id: config.m4,v 1.62 2004/01/17 00:00:11 sniper Exp $
 dnl
 
 AC_DEFUN(IMAP_INC_CHK,[if test -r $i$1/c-client.h; then
@@ -158,8 +158,17 @@
 ],[])
 CPPFLAGS=$old_CPPFLAGS
 
-AC_CHECK_LIB(pam, pam_start) 
-AC_CHECK_LIB(crypt, crypt)
+PHP_CHECK_LIBRARY(pam, pam_start, 
+[
+  PHP_ADD_LIBRARY(pam,, IMAP_SHARED_LIBADD)
+  AC_DEFINE(HAVE_LIBPAM,1,[ ])
+])
+
+PHP_CHECK_LIBRARY(crypt, crypt, 
+[
+  PHP_ADD_LIBRARY(crypt,, IMAP_SHARED_LIBADD)
+  AC_DEFINE(HAVE_LIBCRYPT,1,[ ])
+])

 PHP_EXPAND_PATH($IMAP_DIR, IMAP_DIR)
 

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

[PHP-CVS] cvs: php-src /ext/imap config.m4 /ext/odbc config.m4

2003-10-02 Thread Moriyoshi Koizumi 
moriyoshi   Thu Oct  2 21:13:45 2003 EDT

  Modified files:  
/php-src/ext/odbc   config.m4 
/php-src/ext/imap   config.m4 
  Log:
  Alignment fix
  
  
Index: php-src/ext/odbc/config.m4
diff -u php-src/ext/odbc/config.m4:1.61 php-src/ext/odbc/config.m4:1.62
--- php-src/ext/odbc/config.m4:1.61 Fri Jul 11 11:56:23 2003
+++ php-src/ext/odbc/config.m4  Thu Oct  2 21:13:43 2003
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.61 2003/07/11 15:56:23 sniper Exp $
+dnl $Id: config.m4,v 1.62 2003/10/03 01:13:43 moriyoshi Exp $
 dnl
 
 dnl
@@ -212,7 +212,7 @@
 if test -z $ODBC_TYPE; then
 AC_MSG_CHECKING(for Empress support)
 AC_ARG_WITH(empress,
-[  --with-empress[=DIR]Include Empress support.  DIR is the Empress base
+[  --with-empress[=DIR]  Include Empress support.  DIR is the Empress base
   install directory, defaults to \$EMPRESSPATH.
   From PHP4, this option only supports Empress Version
   8.60 and above],
Index: php-src/ext/imap/config.m4
diff -u php-src/ext/imap/config.m4:1.59 php-src/ext/imap/config.m4:1.60
--- php-src/ext/imap/config.m4:1.59 Tue Sep 30 22:53:09 2003
+++ php-src/ext/imap/config.m4  Thu Oct  2 21:13:44 2003
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.59 2003/10/01 02:53:09 sniper Exp $
+dnl $Id: config.m4,v 1.60 2003/10/03 01:13:44 moriyoshi Exp $
 dnl
 
 AC_DEFUN(IMAP_INC_CHK,[if test -r $i$1/c-client.h; then
@@ -103,7 +103,7 @@
 
 AC_DEFUN(PHP_IMAP_SSL_CHK, [
   AC_ARG_WITH(imap-ssl,
-  [  --with-imap-ssl=DIR IMAP: Include SSL support. DIR is the OpenSSL install 
dir.],[
+  [  --with-imap-ssl=DIR   IMAP: Include SSL support. DIR is the OpenSSL install 
dir.],[
 PHP_IMAP_SSL=$withval
   ],[
 PHP_IMAP_SSL=no

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