Mercurial > dovecot > original-hg > dovecot-1.2
changeset 7958:adb7d13d7d97 HEAD
When checking for -lssl, include -ldl if it exists. OpenSSL 0.9.8 uses it.
| author | Timo Sirainen <tss@iki.fi> |
|---|---|
| date | Fri, 27 Jun 2008 09:45:07 +0300 |
| parents | 22244e559776 |
| children | 532e9496fe88 |
| files | configure.in |
| diffstat | 1 files changed, 16 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/configure.in Fri Jun 27 08:18:41 2008 +0300 +++ b/configure.in Fri Jun 27 09:45:07 2008 +0300 @@ -1493,6 +1493,19 @@ AC_DEFINE(VA_COPY_AS_ARRAY,1, ['va_lists' cannot be copies as values]) fi +dnl * dynamic modules? +have_modules=no +AC_CHECK_FUNC(dlopen, [ + have_modules=yes + MODULE_LIBS="-export-dynamic" +], [ + AC_CHECK_LIB(dl, dlopen, [ + have_modules=yes + MODULE_LIBS="-export-dynamic -ldl" + DLLIB=-ldl + ]) +]) + dnl ** dnl ** SSL dnl ** @@ -1505,9 +1518,10 @@ CFLAGS="$CFLAGS $SSL_CFLAGS" have_openssl=yes else + # openssl 0.9.8 wants -ldl and it's required if there's only .a lib AC_CHECK_LIB(ssl, SSL_read, [ AC_CHECK_HEADERS(openssl/ssl.h openssl/err.h, [ - SSL_LIBS="-lssl -lcrypto" + SSL_LIBS="-lssl -lcrypto $DLLIB" AC_SUBST(SSL_LIBS) have_openssl=yes ], [ @@ -1519,7 +1533,7 @@ if test $want_openssl = yes; then AC_ERROR([Can't build with OpenSSL: libssl not found]) fi - ], -lcrypto) + ], -lcrypto $DLLIB) fi if test "$have_openssl" = "yes"; then AC_DEFINE(HAVE_OPENSSL,, Build with OpenSSL support) @@ -2012,18 +2026,6 @@ ]) ]) -dnl * dynamic modules? -have_modules=no -AC_CHECK_FUNC(dlopen, [ - have_modules=yes - MODULE_LIBS="-export-dynamic" -], [ - AC_CHECK_LIB(dl, dlopen, [ - have_modules=yes - MODULE_LIBS="-export-dynamic -ldl" - ]) -]) - if test $have_modules = yes; then AC_DEFINE(HAVE_MODULES,, Define if you have dynamic module support) AC_SUBST(MODULE_LIBS)