cvs: php4 /ext/imap config.m4
| From: | Jani Taskinen | Date: | Thu, 25 Jul 2002 11:33:22 +0000 |
| Subject: | cvs: php4 /ext/imap config.m4 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-12979@lists.php.net to get a copy of this message | ||
sniper Thu Jul 25 07:33:22 2002 EDT
Modified files:
/php4/ext/imap config.m4
Log:
Fixed bug: #18561.
Index: php4/ext/imap/config.m4
diff -u php4/ext/imap/config.m4:1.46 php4/ext/imap/config.m4:1.47
--- php4/ext/imap/config.m4:1.46 Fri Jul 12 18:11:54 2002
+++ php4/ext/imap/config.m4 Thu Jul 25 07:33:21 2002
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.46 2002/07/12 22:11:54 sniper Exp $
+dnl $Id: config.m4,v 1.47 2002/07/25 11:33:21 sniper Exp $
dnl
AC_DEFUN(IMAP_INC_CHK,[if test -r "$i$1/c-client.h"; then
@@ -108,9 +108,9 @@
if test "$PHP_IMAP_SSL" != "no"; then
AC_MSG_RESULT([$PHP_IMAP_SSL/lib])
AC_DEFINE(HAVE_IMAP_SSL,1,[ ])
- PHP_ADD_LIBPATH($PHP_IMAP_SSL/lib, IMAP_SHARED_LIBADD)
PHP_ADD_LIBRARY_DEFER(ssl,, IMAP_SHARED_LIBADD)
PHP_ADD_LIBRARY_DEFER(crypto,, IMAP_SHARED_LIBADD)
+ PHP_ADD_LIBPATH($PHP_IMAP_SSL/lib, IMAP_SHARED_LIBADD)
else
TST_LIBS="-L$IMAP_LIBDIR -l$IMAP_LIB"
if test $PHP_KERBEROS != "no"; then
@@ -187,16 +187,18 @@
fi
PHP_ADD_INCLUDE($IMAP_INC_DIR)
- PHP_ADD_LIBPATH($IMAP_LIBDIR, IMAP_SHARED_LIBADD)
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"
AC_MSG_CHECKING(whether IMAP works)
PHP_IMAP_TEST_BUILD([
AC_MSG_RESULT(yes)
], [
+ AC_MSG_RESULT(no)
AC_MSG_ERROR([build test failed. Please check the config.log for details.])
- ], $DLIBS)
+ ], $TST_LIBS)
fi