From: Timo Sirainen <tss@iki.fi>
Date: Thu, 12 Jun 2008 20:11:45 +0000 (+0300)
Subject: If we need -lcrypto for randomness, put it to $LIBS instead of $RAND_LIBS
X-Git-Tag: 1.2.alpha1~317
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2bfd6c88ee0472467168a9f0ce16ff417ef8edd6;p=thirdparty%2Fdovecot%2Fcore.git

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 4f193ac4c0..1fcf7da11a 100644
--- 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 e31cae7e0b..efc7e3215a 100644
--- 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 1265782bb2..35451326b7 100644
--- 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 6b86ed47a3..025c367344 100644
--- 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 d50f8cd606..660b304544 100644
--- 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 b98ab0fc8c..4ff5218431 100644
--- 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 4cde041287..d6ca8949a2 100644
--- 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 22b3c0a992..4c3442090a 100644
--- 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 e5cd1cc345..fb32277b45 100644
--- 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 455921db69..b53d99a1be 100644
--- 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 418a5861db..9408cc362e 100644
--- 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 1e4ed09f08..faf9024ef5 100644
--- 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 = \