sniper Mon Dec 9 13:05:37 2002 EDT
Modified files:
/php4/ext/cyrus config.m4
Log:
Fix the build with new cyrus and sasl2 libs
Index: php4/ext/cyrus/config.m4
diff -u php4/ext/cyrus/config.m4:1.8 php4/ext/cyrus/config.m4:1.9
--- php4/ext/cyrus/config.m4:1.8 Sun Sep 8 16:59:53 2002
+++ php4/ext/cyrus/config.m4 Mon Dec 9 13:05:37 2002
@@ -1,9 +1,9 @@
dnl
-dnl $Id: config.m4,v 1.8 2002/09/08 20:59:53 jon Exp $
+dnl $Id: config.m4,v 1.9 2002/12/09 18:05:37 sniper Exp $
dnl
PHP_ARG_WITH(cyrus, for cyrus imap support,
-[ --with-cyrus Include Cyrus IMAP support])
+[ --with-cyrus[=dir] Include Cyrus IMAP support])
if test "$PHP_CYRUS" != "no"; then
found_cyrus=no
@@ -19,12 +19,18 @@
if test -r $i/include/sasl.h && test "$found_sasl" = "no"; then
PHP_ADD_INCLUDE($i/include)
- PHP_ADD_LIBRARY_WITH_PATH(sasl, $i/lib, CYRUS_SHARED_LIBADD)
found_sasl=yes
elif test -r $i/include/sasl/sasl.h && test "$found_sasl" = "no"; then
PHP_ADD_INCLUDE($i/include/sasl)
- PHP_ADD_LIBRARY_WITH_PATH(sasl, $i/lib, CYRUS_SHARED_LIBADD)
found_sasl=yes
+ fi
+
+ if test "$found_sasl" = "yes"; then
+ if test -f $i/lib/libsasl2.a || test -f $i/lib/libsasl2.$SHLIB_SUFFIX_NAME; then
+ PHP_ADD_LIBRARY_WITH_PATH(sasl2, $i/lib, CYRUS_SHARED_LIBADD)
+ else
+ PHP_ADD_LIBRARY_WITH_PATH(sasl, $i/lib, CYRUS_SHARED_LIBADD)
+ fi
fi
if test -r $i/include/openssl/ssl.h && test "$found_openssl" = "no" && test
"$PHP_OPENSSL" = "no"; then
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
