cvs: php4 /ext/imap config.m4
| From: | Jani Taskinen | Date: | Tue, 11 Mar 2003 02:11:57 +0000 |
| Subject: | cvs: php4 /ext/imap config.m4 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-19514@lists.php.net to get a copy of this message | ||
sniper Mon Mar 10 21:11:57 2003 EDT
Modified files:
/php4/ext/imap config.m4
Log:
Fixed bug #22616 (Wrong order of -lssl and -lcrypto with IMAP)
Index: php4/ext/imap/config.m4
diff -u php4/ext/imap/config.m4:1.53 php4/ext/imap/config.m4:1.54
--- php4/ext/imap/config.m4:1.53 Sun Feb 23 03:14:25 2003
+++ php4/ext/imap/config.m4 Mon Mar 10 21:11:57 2003
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.53 2003/02/23 08:14:25 sniper Exp $
+dnl $Id: config.m4,v 1.54 2003/03/11 02:11:57 sniper Exp $
dnl
AC_DEFUN(IMAP_INC_CHK,[if test -r "$i$1/c-client.h"; then
@@ -118,8 +118,8 @@
if test "$PHP_IMAP_SSL" != "no"; then
AC_MSG_RESULT([$PHP_IMAP_SSL/lib])
AC_DEFINE(HAVE_IMAP_SSL,1,[ ])
- PHP_ADD_LIBRARY_DEFER(crypto,, IMAP_SHARED_LIBADD)
- PHP_ADD_LIBRARY_DEFER(ssl,, IMAP_SHARED_LIBADD)
+ PHP_ADD_LIBRARY_DEFER(ssl, 1, IMAP_SHARED_LIBADD)
+ PHP_ADD_LIBRARY_DEFER(crypto, 1, IMAP_SHARED_LIBADD)
PHP_ADD_LIBPATH($PHP_IMAP_SSL/lib, IMAP_SHARED_LIBADD)
else
TST_LIBS="-L$IMAP_LIBDIR -l$IMAP_LIB"
@@ -197,10 +197,10 @@
fi
PHP_ADD_INCLUDE($IMAP_INC_DIR)
- PHP_IMAP_KRB_CHK
- PHP_IMAP_SSL_CHK
PHP_ADD_LIBRARY_DEFER($IMAP_LIB,, IMAP_SHARED_LIBADD)
PHP_ADD_LIBPATH($IMAP_LIBDIR, IMAP_SHARED_LIBADD)
+ PHP_IMAP_KRB_CHK
+ PHP_IMAP_SSL_CHK
dnl Test the build in the end
TST_LIBS="$DLIBS $IMAP_SHARED_LIBADD"