cvs: php4 /ext/imap config.m4
| From: | Jani Taskinen | Date: | Fri, 11 May 2001 10:04:07 +0000 |
| Subject: | cvs: php4 /ext/imap config.m4 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-5657@lists.php.net to get a copy of this message | ||
sniper Fri May 11 03:04:07 2001 EDT
Modified files:
/php4/ext/imap config.m4
Log:
Fixed problems which were caused by the previous patches.
#And the usage of PHP_ADD_LIBRARY_DEFER is clear to me now..:)
Index: php4/ext/imap/config.m4
diff -u php4/ext/imap/config.m4:1.31 php4/ext/imap/config.m4:1.32
--- php4/ext/imap/config.m4:1.31 Wed May 9 23:58:25 2001
+++ php4/ext/imap/config.m4 Fri May 11 03:04:06 2001
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.31 2001/05/10 06:58:25 sniper Exp $
+dnl $Id: config.m4,v 1.32 2001/05/11 10:04:06 sniper Exp $
dnl
AC_DEFUN(IMAP_INC_CHK,[if test -r "$i$1/c-client.h"; then
@@ -52,6 +52,11 @@
PHP_ADD_LIBRARY(ssl,, IMAP_SHARED_LIBADD)
PHP_ADD_LIBRARY(crypto,, IMAP_SHARED_LIBADD)
+ old_LIBS=$LIBS
+ LIBS="$LIBS -lc-client"
+ if test $PHP_KERBEROS != "no"; then
+ LIBS="$LIBS -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err"
+ fi
AC_TRY_RUN([
void mm_log(void){}
void mm_dlog(void){}
@@ -78,6 +83,7 @@
], [
AC_MSG_ERROR(This c-client library does not support SSL. Recompile or remove --with-imap-ssl
from configure line.)
])
+ LIBS=$old_LIBS
fi
])
@@ -128,7 +134,7 @@
PHP_ADD_INCLUDE($IMAP_INC_DIR)
PHP_ADD_LIBPATH($IMAP_LIBDIR, IMAP_SHARED_LIBADD)
- PHP_ADD_LIBRARY($IMAP_LIB,, IMAP_SHARED_LIBADD)
+ PHP_ADD_LIBRARY_DEFER($IMAP_LIB)
PHP_IMAP_KRB_CHK
PHP_IMAP_SSL_CHK
fi