Mercurial > dovecot > original-hg > dovecot-1.2
changeset 7844:7b39370dae6b HEAD
If we need -lcrypto for randomness, put it to $LIBS instead of $RAND_LIBS
since it needs to be linked to all binaries anyway.
| author | Timo Sirainen <tss@iki.fi> |
|---|---|
| date | Thu, 12 Jun 2008 23:11:45 +0300 |
| parents | 0df78677ea1b |
| children | e4e9cc00d9ba |
| files | configure.in dovecot-config.in.in src/auth/Makefile.am src/deliver/Makefile.am src/dict/Makefile.am src/imap/Makefile.am src/plugins/convert/Makefile.am src/plugins/expire/Makefile.am src/plugins/fts-squat/Makefile.am src/pop3/Makefile.am src/tests/Makefile.am src/util/Makefile.am |
| diffstat | 12 files changed, 4 insertions(+), 18 deletions(-) [+] |
line wrap: on
line diff
--- a/configure.in Tue Jun 17 04:52:57 2008 +0300 +++ b/configure.in Thu Jun 12 23:11:45 2008 +0300 @@ -909,10 +909,9 @@ 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])
--- a/dovecot-config.in.in Tue Jun 17 04:52:57 2008 +0300 +++ b/dovecot-config.in.in Thu Jun 12 23:11:45 2008 +0300 @@ -4,7 +4,6 @@ STORAGE_LIBS="@STORAGE_LIBS@" LIBICONV="@LIBICONV@" -RAND_LIBS="@RAND_LIBS@" MODULE_LIBS="@MODULE_LIBS@" dovecot_incdir=
--- a/src/auth/Makefile.am Tue Jun 17 04:52:57 2008 +0300 +++ b/src/auth/Makefile.am Thu Jun 12 23:11:45 2008 +0300 @@ -44,7 +44,6 @@ ../lib-sql/libsql.a \ ../lib/liblib.a \ $(AUTH_LIBS) \ - $(RAND_LIBS) \ $(MODULE_LIBS) ldap_sources = db-ldap.c passdb-ldap.c userdb-ldap.c
--- a/src/deliver/Makefile.am Tue Jun 17 04:52:57 2008 +0300 +++ b/src/deliver/Makefile.am Thu Jun 12 23:11:45 2008 +0300 @@ -36,7 +36,6 @@ deliver_LDADD = \ $(libs) \ $(LIBICONV) \ - $(RAND_LIBS) \ $(MODULE_LIBS) deliver_DEPENDENCIES = $(libs)
--- a/src/dict/Makefile.am Tue Jun 17 04:52:57 2008 +0300 +++ b/src/dict/Makefile.am Thu Jun 12 23:11:45 2008 +0300 @@ -19,7 +19,6 @@ dict_LDADD = \ $(libs) \ - $(RAND_LIBS) \ $(MODULE_LIBS) \ $(DICT_LIBS) \ $(SQL_LIBS)
--- a/src/imap/Makefile.am Tue Jun 17 04:52:57 2008 +0300 +++ b/src/imap/Makefile.am Thu Jun 12 23:11:45 2008 +0300 @@ -32,7 +32,6 @@ imap_LDADD = \ $(libs) \ $(LIBICONV) \ - $(RAND_LIBS) \ $(MODULE_LIBS) imap_DEPENDENCIES = $(libs)
--- a/src/plugins/convert/Makefile.am Tue Jun 17 04:52:57 2008 +0300 +++ b/src/plugins/convert/Makefile.am Thu Jun 12 23:11:45 2008 +0300 @@ -40,8 +40,7 @@ convert_tool_LDADD = \ $(common_objects) \ $(libs) \ - $(LIBICONV) \ - $(RAND_LIBS) + $(LIBICONV) convert_tool_DEPENDENCIES = $(libs) $(common_objects)
--- a/src/plugins/expire/Makefile.am Tue Jun 17 04:52:57 2008 +0300 +++ b/src/plugins/expire/Makefile.am Thu Jun 12 23:11:45 2008 +0300 @@ -42,8 +42,7 @@ expire_tool_LDADD = \ $(libs) \ - $(LIBICONV) \ - $(RAND_LIBS) + $(LIBICONV) expire_tool_DEPENDENCIES = $(libs)
--- a/src/plugins/fts-squat/Makefile.am Tue Jun 17 04:52:57 2008 +0300 +++ b/src/plugins/fts-squat/Makefile.am Thu Jun 12 23:11:45 2008 +0300 @@ -43,8 +43,7 @@ squat_test_LDADD = \ $(common_objects) \ $(libs) \ - $(LIBICONV) \ - $(RAND_LIBS) + $(LIBICONV) squat_test_DEPENDENCIES = $(libs) $(common_objects)
--- a/src/pop3/Makefile.am Tue Jun 17 04:52:57 2008 +0300 +++ b/src/pop3/Makefile.am Thu Jun 12 23:11:45 2008 +0300 @@ -30,7 +30,6 @@ pop3_LDADD = \ $(libs) \ $(LIBICONV) \ - $(RAND_LIBS) \ $(MODULE_LIBS) pop3_DEPENDENCIES = $(libs)
--- a/src/tests/Makefile.am Tue Jun 17 04:52:57 2008 +0300 +++ b/src/tests/Makefile.am Thu Jun 12 23:11:45 2008 +0300 @@ -17,7 +17,6 @@ test-lib.c test_lib_LDADD = \ - $(RAND_LIBS) \ libtest.a \ ../lib/liblib.a @@ -33,7 +32,6 @@ test_mail_LDADD = \ $(LIBICONV) \ - $(RAND_LIBS) \ libtest.a \ ../lib-mail/libmail.a \ ../lib-charset/libcharset.a \ @@ -41,7 +39,6 @@ test_imap_LDADD = \ $(LIBICONV) \ - $(RAND_LIBS) \ libtest.a \ ../lib-imap/libimap.a \ ../lib-mail/libmail.a \