dovecot-1.1: If we need -lcrypto for randomness, put it to $LIBS...
dovecot at dovecot.org
dovecot at dovecot.org
Thu Jun 12 23:11:51 EEST 2008
details: http://hg.dovecot.org/dovecot-1.1/rev/0d606019f58c
changeset: 7644:0d606019f58c
user: Timo Sirainen <tss at iki.fi>
date: Thu Jun 12 23:11:45 2008 +0300
description:
If we need -lcrypto for randomness, put it to $LIBS instead of $RAND_LIBS
since it needs to be linked to all binaries anyway.
diffstat:
12 files changed, 4 insertions(+), 18 deletions(-)
configure.in | 3 +--
dovecot-config.in.in | 1 -
src/auth/Makefile.am | 1 -
src/deliver/Makefile.am | 1 -
src/dict/Makefile.am | 1 -
src/imap/Makefile.am | 1 -
src/plugins/convert/Makefile.am | 3 +--
src/plugins/expire/Makefile.am | 3 +--
src/plugins/fts-squat/Makefile.am | 3 +--
src/pop3/Makefile.am | 1 -
src/tests/Makefile.am | 3 ---
src/util/Makefile.am | 1 -
diffs (158 lines):
diff -r 33c9cbb520d0 -r 0d606019f58c configure.in
--- a/configure.in Thu Jun 12 13:16:08 2008 +0300
+++ b/configure.in Thu Jun 12 23:11:45 2008 +0300
@@ -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 -r 33c9cbb520d0 -r 0d606019f58c dovecot-config.in.in
--- a/dovecot-config.in.in Thu Jun 12 13:16:08 2008 +0300
+++ b/dovecot-config.in.in Thu Jun 12 23:11:45 2008 +0300
@@ -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 -r 33c9cbb520d0 -r 0d606019f58c src/auth/Makefile.am
--- a/src/auth/Makefile.am Thu Jun 12 13:16:08 2008 +0300
+++ b/src/auth/Makefile.am Thu Jun 12 23:11:45 2008 +0300
@@ -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 -r 33c9cbb520d0 -r 0d606019f58c src/deliver/Makefile.am
--- a/src/deliver/Makefile.am Thu Jun 12 13:16:08 2008 +0300
+++ b/src/deliver/Makefile.am Thu Jun 12 23:11:45 2008 +0300
@@ -36,7 +36,6 @@ deliver_LDADD = \
deliver_LDADD = \
$(libs) \
$(LIBICONV) \
- $(RAND_LIBS) \
$(MODULE_LIBS)
deliver_DEPENDENCIES = $(libs)
diff -r 33c9cbb520d0 -r 0d606019f58c src/dict/Makefile.am
--- a/src/dict/Makefile.am Thu Jun 12 13:16:08 2008 +0300
+++ b/src/dict/Makefile.am Thu Jun 12 23:11:45 2008 +0300
@@ -19,7 +19,6 @@ libs = \
dict_LDADD = \
$(libs) \
- $(RAND_LIBS) \
$(MODULE_LIBS) \
$(DICT_LIBS) \
$(SQL_LIBS)
diff -r 33c9cbb520d0 -r 0d606019f58c src/imap/Makefile.am
--- a/src/imap/Makefile.am Thu Jun 12 13:16:08 2008 +0300
+++ b/src/imap/Makefile.am Thu Jun 12 23:11:45 2008 +0300
@@ -32,7 +32,6 @@ imap_LDADD = \
imap_LDADD = \
$(libs) \
$(LIBICONV) \
- $(RAND_LIBS) \
$(MODULE_LIBS)
imap_DEPENDENCIES = $(libs)
diff -r 33c9cbb520d0 -r 0d606019f58c src/plugins/convert/Makefile.am
--- a/src/plugins/convert/Makefile.am Thu Jun 12 13:16:08 2008 +0300
+++ b/src/plugins/convert/Makefile.am Thu Jun 12 23:11:45 2008 +0300
@@ -40,8 +40,7 @@ convert_tool_LDADD = \
convert_tool_LDADD = \
$(common_objects) \
$(libs) \
- $(LIBICONV) \
- $(RAND_LIBS)
+ $(LIBICONV)
convert_tool_DEPENDENCIES = $(libs) $(common_objects)
diff -r 33c9cbb520d0 -r 0d606019f58c src/plugins/expire/Makefile.am
--- a/src/plugins/expire/Makefile.am Thu Jun 12 13:16:08 2008 +0300
+++ b/src/plugins/expire/Makefile.am Thu Jun 12 23:11:45 2008 +0300
@@ -42,8 +42,7 @@ libs = \
expire_tool_LDADD = \
$(libs) \
- $(LIBICONV) \
- $(RAND_LIBS)
+ $(LIBICONV)
expire_tool_DEPENDENCIES = $(libs)
diff -r 33c9cbb520d0 -r 0d606019f58c src/plugins/fts-squat/Makefile.am
--- a/src/plugins/fts-squat/Makefile.am Thu Jun 12 13:16:08 2008 +0300
+++ b/src/plugins/fts-squat/Makefile.am Thu Jun 12 23:11:45 2008 +0300
@@ -43,8 +43,7 @@ squat_test_LDADD = \
squat_test_LDADD = \
$(common_objects) \
$(libs) \
- $(LIBICONV) \
- $(RAND_LIBS)
+ $(LIBICONV)
squat_test_DEPENDENCIES = $(libs) $(common_objects)
diff -r 33c9cbb520d0 -r 0d606019f58c src/pop3/Makefile.am
--- a/src/pop3/Makefile.am Thu Jun 12 13:16:08 2008 +0300
+++ b/src/pop3/Makefile.am Thu Jun 12 23:11:45 2008 +0300
@@ -30,7 +30,6 @@ pop3_LDADD = \
pop3_LDADD = \
$(libs) \
$(LIBICONV) \
- $(RAND_LIBS) \
$(MODULE_LIBS)
pop3_DEPENDENCIES = $(libs)
diff -r 33c9cbb520d0 -r 0d606019f58c src/tests/Makefile.am
--- a/src/tests/Makefile.am Thu Jun 12 13:16:08 2008 +0300
+++ b/src/tests/Makefile.am Thu Jun 12 23:11:45 2008 +0300
@@ -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 -r 33c9cbb520d0 -r 0d606019f58c src/util/Makefile.am
--- a/src/util/Makefile.am Thu Jun 12 13:16:08 2008 +0300
+++ b/src/util/Makefile.am Thu Jun 12 23:11:45 2008 +0300
@@ -46,7 +46,6 @@ dovecotpw_LDADD = \
../lib-otp/libotp.a \
../lib/liblib.a \
$(AUTH_LIBS) \
- $(RAND_LIBS) \
$(MODULE_LIBS)
dovecotpw_SOURCES = \
More information about the dovecot-cvs
mailing list