cvs: php4 /ext/imap config.m4

sniper Sun May 6 13:16:49 2001 EDT Modified files: /php4/ext/imap config.m4 Log: Attempt to fix the build when a c-client lib with kerberos, pam and ssl is used. Index: php4/ext/imap/config.m4 diff -u php4/ext/imap/config.m4:1.29 php4/ext/imap/config.m4:1.30 --- php4/ext/imap/config.m4:1.29 Sat May 5 23:14:12 2001 +++ php4/ext/imap/config.m4 Sun May 6 13:16:49 2001 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.29 2001/05/06 06:14:12 sniper Exp $ +dnl $Id: config.m4,v 1.30 2001/05/06 20:16:49 sniper Exp $ AC_DEFUN(IMAP_INC_CHK,[if test -r "$i$1/c-client.h"; then AC_DEFINE(HAVE_IMAP2000, 1, [ ]) @@ -20,6 +20,7 @@ done ]) + PHP_ARG_WITH(kerberos,for Kerberos support in IMAP, [ --with-kerberos[=DIR] Include Kerberos support in IMAP.]) @@ -58,6 +59,8 @@ fi done + AC_CHECK_LIB(pam, pam_start) + PHP_EXPAND_PATH($IMAP_DIR, IMAP_DIR) if test -z "$IMAP_DIR"; then @@ -81,13 +84,8 @@ fi PHP_ADD_INCLUDE($IMAP_INC_DIR) - if test "$ext_shared" = "yes"; then - PHP_ADD_LIBRARY_WITH_PATH($IMAP_LIB, $IMAP_LIBDIR, IMAP_SHARED_LIBADD) - PHP_SUBST(IMAP_SHARED_LIBADD) - else - PHP_ADD_LIBPATH($IMAP_LIBDIR) - PHP_ADD_LIBRARY_DEFER($IMAP_LIB) - fi + PHP_ADD_LIBRARY_WITH_PATH($IMAP_LIB, $IMAP_LIBDIR, IMAP_SHARED_LIBADD) + PHP_SUBST(IMAP_SHARED_LIBADD) if test "$PHP_KERBEROS" != "no"; then AC_DEFINE(HAVE_IMAP_KRB,1,[ ]) @@ -99,11 +97,10 @@ fi if test "$PHP_IMAP_SSL" != "no"; then - old_LIBS=$LIBS - old_LDFLAGS=$LDFLAGS - - LIBS="-lssl -lcrypto -lc-client" - LDFLAGS="-L$IMAP_LIBDIR -L$PHP_SSL_LIBDIR" + PHP_ADD_LIBPATH($PHP_SSL_LIBDIR, IMAP_SHARED_LIBADD) + PHP_ADD_LIBRARY(ssl,, IMAP_SHARED_LIBADD) + PHP_ADD_LIBRARY(crypto,, IMAP_SHARED_LIBADD) + AC_TRY_RUN([ void mm_log(void){} void mm_dlog(void){} @@ -126,13 +123,7 @@ 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.) ])