cvs: php4 /ext/cyrus config.m4

sniper Mon Dec 9 13:29:23 2002 EDT Modified files: /php4/ext/cyrus config.m4 Log: Make this actually work too. Index: php4/ext/cyrus/config.m4 diff -u php4/ext/cyrus/config.m4:1.9 php4/ext/cyrus/config.m4:1.10 --- php4/ext/cyrus/config.m4:1.9 Mon Dec 9 13:05:37 2002 +++ php4/ext/cyrus/config.m4 Mon Dec 9 13:29:22 2002 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.9 2002/12/09 18:05:37 sniper Exp $ +dnl $Id: config.m4,v 1.10 2002/12/09 18:29:22 sniper Exp $ dnl PHP_ARG_WITH(cyrus, for cyrus imap support, @@ -10,13 +10,27 @@ found_sasl=no found_openssl=no - for i in /usr /usr/local $PHP_CYRUS; do + dnl + dnl Cyrus + dnl + for i in $PHP_CYRUS /usr/local /usr; do if test -r $i/include/cyrus/imclient.h && test "$found_cyrus" = "no"; then PHP_ADD_INCLUDE($i/include) PHP_ADD_LIBRARY_WITH_PATH(cyrus, $i/lib, CYRUS_SHARED_LIBADD) found_cyrus=yes + break 2 fi + done + + if test "$found_cyrus" = "no"; then + AC_MSG_RESULT(not found) + AC_MSG_ERROR(Please Re-install the cyrus distribution) + fi + dnk + dnl sasl/sasl2 + dnl + for i in $PHP_CYRUS /usr/local /usr; do if test -r $i/include/sasl.h && test "$found_sasl" = "no"; then PHP_ADD_INCLUDE($i/include) found_sasl=yes @@ -31,25 +45,28 @@ 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) - found_openssl=yes + break 2 fi done - - if test "$found_cyrus" = "no"; then - AC_MSG_RESULT(not found) - AC_MSG_ERROR(Please Re-install the cyrus distribution) - fi - + if test "$found_sasl" = "no"; then AC_MSG_RESULT(sasl not found) AC_MSG_ERROR(Please Re-install the cyrus distribution) fi + dnk + dnl OpenSSL + dnl + if test "$PHP_OPENSSL" = "no"; then + for i in $PHP_CYRUS /usr/local /usr; do + if test -r $i/include/openssl/ssl.h; then + PHP_ADD_LIBRARY_WITH_PATH(ssl, $i/lib, CYRUS_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(crypto, $i/lib, CYRUS_SHARED_LIBADD) + break 2 + fi + done + fi + PHP_NEW_EXTENSION(cyrus, cyrus.c, $ext_shared) PHP_SUBST(CYRUS_SHARED_LIBADD) AC_DEFINE(HAVE_CYRUS,1,[ ])