cvs: php4 /ext/imap config.m4

sniper Sat May 5 22:39:17 2001 EDT Modified files: /php4/ext/imap config.m4 Log: Added a check that libc-client support SSL. Index: php4/ext/imap/config.m4 diff -u php4/ext/imap/config.m4:1.27 php4/ext/imap/config.m4:1.28 --- php4/ext/imap/config.m4:1.27 Tue Apr 10 10:31:35 2001 +++ php4/ext/imap/config.m4 Sat May 5 22:39:16 2001 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.27 2001/04/10 17:31:35 jon Exp $ +dnl $Id: config.m4,v 1.28 2001/05/06 05:39:16 sniper Exp $ AC_DEFUN(IMAP_INC_CHK,[if test -r "$i$1/c-client.h"; then AC_DEFINE(HAVE_IMAP2000, 1, [ ]) @@ -42,11 +42,12 @@ PHP_SSL_LIBDIR=$PHP_IMAP_SSL/lib fi + PHP_ARG_WITH(imap,for IMAP support, [ --with-imap[=DIR] Include IMAP support. DIR is the IMAP include and c-client.a directory.]) - if test "$PHP_IMAP" != "no"; then +if test "$PHP_IMAP" != "no"; then for i in /usr/local /usr $PHP_IMAP; do IMAP_INC_CHK() el[]IMAP_INC_CHK(/include/c-client) @@ -97,13 +98,45 @@ fi if test "$PHP_IMAP_SSL" != "no"; then - AC_DEFINE(HAVE_IMAP_SSL,1,[ ]) - PHP_ADD_LIBPATH($PHP_SSL_LIBDIR, IMAP_SHARED_LIBADD) - PHP_ADD_LIBRARY(ssl,, IMAP_SHARED_LIBADD) - PHP_ADD_LIBRARY(crypto,, IMAP_SHARED_LIBADD) + old_LIBS=$LIBS + old_LDFLAGS=$LDFLAGS + + LIBS="-lssl -lcrypto -lc-client" + LDFLAGS="-L$IMAP_LIBDIR -L$PHP_SSL_LIBDIR" + AC_TRY_RUN([ + 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){} + char ssl_onceonlyinit(); + int main() { + ssl_onceonlyinit(); + return 0; + } + ],[ + LIBS=$old_LIBS + LDFLAGS=$old_LDFLAGS + + AC_DEFINE(HAVE_IMAP_SSL,1,[ ]) + PHP_ADD_LIBPATH($PHP_SSL_LIBDIR, IMAP_SHARED_LIBADD) + PHP_ADD_LIBRARY(ssl,, IMAP_SHARED_LIBADD) + PHP_ADD_LIBRARY(crypto,, IMAP_SHARED_LIBADD) + ], [ + AC_MSG_ERROR(This c-client library does not support SSL. Recompile or remove --with-imap-ssl from configure line.) + ]) fi PHP_EXTENSION(imap, $ext_shared) - AC_DEFINE(HAVE_IMAP,1,[ ]) - fi +fi