diff options
| author | foobar <sniper@php.net> | 2002-12-09 18:05:37 +0000 |
|---|---|---|
| committer | foobar <sniper@php.net> | 2002-12-09 18:05:37 +0000 |
| commit | 44aec93861d18244965f235dfeb634efdb3c9f35 (patch) | |
| tree | ae40f817fc5614e2d96778b4333b8fcc2e7fd1f8 | |
| parent | 85f1caeb14dcdb106e08d3103b8ee6f2106ce82f (diff) | |
| download | php-git-44aec93861d18244965f235dfeb634efdb3c9f35.tar.gz | |
Fix the build with new cyrus and sasl2 libs
| -rw-r--r-- | ext/cyrus/config.m4 | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/ext/cyrus/config.m4 b/ext/cyrus/config.m4 index 0c72a19445..87d3d68e54 100644 --- a/ext/cyrus/config.m4 +++ b/ext/cyrus/config.m4 @@ -3,7 +3,7 @@ dnl $Id$ 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,14 +19,20 @@ if test "$PHP_CYRUS" != "no"; then 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_ADD_LIBRARY_WITH_PATH(ssl, $i/lib, CYRUS_SHARED_LIBADD) PHP_ADD_LIBRARY_WITH_PATH(crypto, $i/lib, CYRUS_SHARED_LIBADD) |