diff options
| author | foobar <sniper@php.net> | 2002-09-04 17:40:36 +0000 |
|---|---|---|
| committer | foobar <sniper@php.net> | 2002-09-04 17:40:36 +0000 |
| commit | 25e91506cb16c117e9afd5391a58c3ffc8cbb641 (patch) | |
| tree | 4a697f43197a336aedfe159fb2911a1cc476542f /ext/cyrus | |
| parent | af4243b90829df092d88f62cb53b44e43ef5c25f (diff) | |
| download | php-git-25e91506cb16c117e9afd5391a58c3ffc8cbb641.tar.gz | |
Fix the shared build (nobody ever build this as shared?)
Diffstat (limited to 'ext/cyrus')
| -rw-r--r-- | ext/cyrus/config.m4 | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/ext/cyrus/config.m4 b/ext/cyrus/config.m4 index d61dea87e6..7ba80610a1 100644 --- a/ext/cyrus/config.m4 +++ b/ext/cyrus/config.m4 @@ -12,26 +12,21 @@ if test "$PHP_CYRUS" != "no"; then 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 @@ if test "$PHP_CYRUS" != "no"; then 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 |