If we need -lcrypto for randomness, put it to $LIBS instead of $RAND_LIBS

since it needs to be linked to all binaries anyway.

--HG--
branch : HEAD

diff --git a/configure.in b/configure.in
index 4f193ac4c0041fc3ca81cfeadbcd3a9d814e2d25..1fcf7da11a051d047ccb4e2467f3d33b6ee0d3a4 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -909,10 +909,9 @@ else
 
   AC_CHECK_HEADER(openssl/rand.h, [
     AC_DEFINE(HAVE_OPENSSL_RAND_H,, Define if you have openssl/rand.h)
-    RAND_LIBS=-lcrypto
+    LIBS="$LIBS -lcrypto"
   ])
 fi
-AC_SUBST(RAND_LIBS)
 
 dnl * do we have tm_gmtoff
 AC_MSG_CHECKING([for tm_gmtoff])

diff --git a/dovecot-config.in.in b/dovecot-config.in.in
index e31cae7e0b6467a2fe14e1983bf984c5796adc5d..efc7e3215ae13c9b09596091570a0e7df14785d0 100644 (file)
--- a/dovecot-config.in.in
+++ b/dovecot-config.in.in
@@ -4,7 +4,6 @@ SSL_LIBS="@SSL_LIBS@"
 
 STORAGE_LIBS="@STORAGE_LIBS@"
 LIBICONV="@LIBICONV@"
-RAND_LIBS="@RAND_LIBS@"
 MODULE_LIBS="@MODULE_LIBS@"
 
 dovecot_incdir=

diff --git a/src/auth/Makefile.am b/src/auth/Makefile.am
index 1265782bb2bb00b5a8135683ea5e6b1c7db2e2b3..35451326b725f8bce0600c3b5c04a63e9f88a83b 100644 (file)
--- a/src/auth/Makefile.am
+++ b/src/auth/Makefile.am
@@ -44,7 +44,6 @@ dovecot_auth_LDADD = \
        ../lib-sql/libsql.a \
        ../lib/liblib.a \
        $(AUTH_LIBS) \
-       $(RAND_LIBS) \
        $(MODULE_LIBS)
 
 ldap_sources = db-ldap.c passdb-ldap.c userdb-ldap.c

diff --git a/src/deliver/Makefile.am b/src/deliver/Makefile.am
index 6b86ed47a351c06324701d607c32147f2028f4be..025c3673441a468d9ac9962087343e9c1baa028f 100644 (file)
--- a/src/deliver/Makefile.am
+++ b/src/deliver/Makefile.am
@@ -36,7 +36,6 @@ libs = \
 deliver_LDADD = \
        $(libs) \
        $(LIBICONV) \
-       $(RAND_LIBS) \
        $(MODULE_LIBS)
 
 deliver_DEPENDENCIES = $(libs)

diff --git a/src/dict/Makefile.am b/src/dict/Makefile.am
index d50f8cd606bac9638a272f5a0977e6c00a387980..660b3045443f753d06fe15ee59a53bdb16dc16f6 100644 (file)
--- a/src/dict/Makefile.am
+++ b/src/dict/Makefile.am
@@ -19,7 +19,6 @@ libs = \
 
 dict_LDADD = \
        $(libs) \
-       $(RAND_LIBS) \
        $(MODULE_LIBS) \
        $(DICT_LIBS) \
        $(SQL_LIBS)

diff --git a/src/imap/Makefile.am b/src/imap/Makefile.am
index b98ab0fc8c734ce90b3158bf79c72407ce237fd1..4ff5218431c6d7a6c8b084cec04b0512a19764a1 100644 (file)
--- a/src/imap/Makefile.am
+++ b/src/imap/Makefile.am
@@ -32,7 +32,6 @@ libs = \
 imap_LDADD = \
        $(libs) \
        $(LIBICONV) \
-       $(RAND_LIBS) \
        $(MODULE_LIBS)
 
 imap_DEPENDENCIES = $(libs)

diff --git a/src/plugins/convert/Makefile.am b/src/plugins/convert/Makefile.am
index 4cde041287035695d83e1fa7f930306213d8c5c2..d6ca8949a2bcabddea82f1e50dd81ec0ad104774 100644 (file)
--- a/src/plugins/convert/Makefile.am
+++ b/src/plugins/convert/Makefile.am
@@ -40,8 +40,7 @@ libs = \
 convert_tool_LDADD = \
        $(common_objects) \
        $(libs) \
-       $(LIBICONV) \
-       $(RAND_LIBS)
+       $(LIBICONV)
 
 convert_tool_DEPENDENCIES = $(libs) $(common_objects)
 

diff --git a/src/plugins/expire/Makefile.am b/src/plugins/expire/Makefile.am
index 22b3c0a992f9ed9f29edbe4578367e81f2b722a6..4c3442090a35f539eac081ba716fe716bb3dfb4a 100644 (file)
--- a/src/plugins/expire/Makefile.am
+++ b/src/plugins/expire/Makefile.am
@@ -42,8 +42,7 @@ libs = \
 
 expire_tool_LDADD = \
        $(libs) \
-       $(LIBICONV) \
-       $(RAND_LIBS)
+       $(LIBICONV)
 
 expire_tool_DEPENDENCIES = $(libs)
 

diff --git a/src/plugins/fts-squat/Makefile.am b/src/plugins/fts-squat/Makefile.am
index e5cd1cc34516fe487c9977e1c86553445c36f75b..fb32277b456a200aae4ef27d8556d2d8e6de287f 100644 (file)
--- a/src/plugins/fts-squat/Makefile.am
+++ b/src/plugins/fts-squat/Makefile.am
@@ -43,8 +43,7 @@ libs = \
 squat_test_LDADD = \
        $(common_objects) \
        $(libs) \
-       $(LIBICONV) \
-       $(RAND_LIBS)
+       $(LIBICONV)
 
 squat_test_DEPENDENCIES = $(libs) $(common_objects)
 

diff --git a/src/pop3/Makefile.am b/src/pop3/Makefile.am
index 455921db69fe6d26935b3e557e31540a61df7a8b..b53d99a1be32294b59d3232b03a81c6b48cae985 100644 (file)
--- a/src/pop3/Makefile.am
+++ b/src/pop3/Makefile.am
@@ -30,7 +30,6 @@ libs = \
 pop3_LDADD = \
        $(libs) \
        $(LIBICONV) \
-       $(RAND_LIBS) \
        $(MODULE_LIBS)
 
 pop3_DEPENDENCIES = $(libs)

diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
index 418a5861dbd5337eb61647d1a8d70ef5ea1dc7b5..9408cc362ec8211107a1610c9172df2bb9e21d39 100644 (file)
--- a/src/tests/Makefile.am
+++ b/src/tests/Makefile.am
@@ -17,7 +17,6 @@ test_lib_SOURCES = \
        test-lib.c
 
 test_lib_LDADD = \
-       $(RAND_LIBS) \
        libtest.a \
        ../lib/liblib.a
 
@@ -33,7 +32,6 @@ noinst_HEADERS = \
 
 test_mail_LDADD = \
        $(LIBICONV) \
-       $(RAND_LIBS) \
        libtest.a \
        ../lib-mail/libmail.a \
        ../lib-charset/libcharset.a \
@@ -41,7 +39,6 @@ test_mail_LDADD = \
 
 test_imap_LDADD = \
        $(LIBICONV) \
-       $(RAND_LIBS) \
        libtest.a \
        ../lib-imap/libimap.a \
        ../lib-mail/libmail.a \

diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index 1e4ed09f08aa7a9494372fef9538b7f929e334bd..faf9024ef5c6fd26511edb0778dd7d06f925662c 100644 (file)
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -46,7 +46,6 @@ dovecotpw_LDADD = \
        ../lib-otp/libotp.a \
        ../lib/liblib.a \
        $(AUTH_LIBS) \
-       $(RAND_LIBS) \
        $(MODULE_LIBS)
 
 dovecotpw_SOURCES = \