cvs: php4 /ext/cyrus config.m4

sniper Wed Sep 4 13:40:37 2002 EDT Modified files: /php4/ext/cyrus config.m4 Log: Fix the shared build (nobody ever build this as shared?) Index: php4/ext/cyrus/config.m4 diff -u php4/ext/cyrus/config.m4:1.5 php4/ext/cyrus/config.m4:1.6 --- php4/ext/cyrus/config.m4:1.5 Wed Sep 4 10:41:29 2002 +++ php4/ext/cyrus/config.m4 Wed Sep 4 13:40:36 2002 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.5 2002/09/04 14:41:29 martin Exp $ +dnl $Id: config.m4,v 1.6 2002/09/04 17:40:36 sniper Exp $ dnl PHP_ARG_WITH(cyrus, for cyrus imap support, @@ -12,26 +12,21 @@ for i in /usr /usr/local $PHP_CYRUS; do if test -r $i/include/cyrus/imclient.h && test "$found_cyrus" = "no"; then PHP_ADD_INCLUDE($i/include) - PHP_SUBST(CYRUS_SHARED_LIBADD) PHP_ADD_LIBRARY_WITH_PATH(cyrus, $i/lib, CYRUS_SHARED_LIBADD) found_cyrus=yes fi if test -r $i/include/sasl.h && test "$found_sasl" = "no"; then PHP_ADD_INCLUDE($i/include) - PHP_SUBST(SASL_SHARED_LIBADD) - PHP_ADD_LIBRARY_WITH_PATH(sasl, $i/lib, SASL_SHARED_LIBADD) + 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_SUBST(SASL_SHARED_LIBADD) - PHP_ADD_LIBRARY_WITH_PATH(sasl, $i/lib, SASL_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(sasl, $i/lib, CYRUS_SHARED_LIBADD) found_sasl=yes fi if test -r $i/include/openssl/ssl.h && test "$found_openssl" = "no" && test "$PHP_OPENSSL" = "no"; then - PHP_SUBST(OPENSSL_SHARED_LIBADD) - PHP_SUBST(CRYPTO_SHARED_LIBADD) - PHP_ADD_LIBRARY_WITH_PATH(ssl, $i/lib, OPENSSL_SHARED_LIBADD) - PHP_ADD_LIBRARY_WITH_PATH(crypto, $i/lib, CRYPTO_SHARED_LIBADD) + 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 fi done @@ -46,7 +41,7 @@ AC_MSG_ERROR(Please Re-install the cyrus distribution) fi - AC_DEFINE(HAVE_CYRUS,1,[ ]) - PHP_NEW_EXTENSION(cyrus, cyrus.c, $ext_shared) + PHP_SUBST(CYRUS_SHARED_LIBADD) + AC_DEFINE(HAVE_CYRUS,1,[ ]) fi