dovecot-1.3: Link -liconv to libdovecot.so if necessary.

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-1.3/rev/f8cc52698a42
changeset: 9030:f8cc52698a42
user:      Timo Sirainen <tss at iki.fi>
date:      Mon Apr 06 17:10:44 2009 -0400
description:
Link -liconv to libdovecot.so if necessary.

diffstat:

8 files changed, 7 insertions(+), 19 deletions(-)
src/auth/Makefile.am        |    3 +--
src/deliver/Makefile.am     |    5 +----
src/dict/Makefile.am        |    1 -
src/imap/Makefile.am        |    4 +---
src/lib-dovecot/Makefile.am |    3 ++-
src/pop3/Makefile.am        |    5 +----
src/tests/Makefile.am       |    2 --
src/util/Makefile.am        |    3 +--

diffs (109 lines):

diff -r 3195c1b157c9 -r f8cc52698a42 src/auth/Makefile.am
--- a/src/auth/Makefile.am	Mon Apr 06 17:02:49 2009 -0400
+++ b/src/auth/Makefile.am	Mon Apr 06 17:10:44 2009 -0400
@@ -43,8 +43,7 @@ dovecot_auth_LDADD = \
 	../lib-otp/libotp.a \
 	../lib-sql/libsql.la \
 	../lib-dovecot/libdovecot.la \
-	$(AUTH_LIBS) \
-	$(MODULE_LIBS)
+	$(AUTH_LIBS)
 
 ldap_sources = db-ldap.c passdb-ldap.c userdb-ldap.c
 
diff -r 3195c1b157c9 -r f8cc52698a42 src/deliver/Makefile.am
--- a/src/deliver/Makefile.am	Mon Apr 06 17:02:49 2009 -0400
+++ b/src/deliver/Makefile.am	Mon Apr 06 17:10:44 2009 -0400
@@ -25,10 +25,7 @@ libs = \
 	../lib-storage/libdovecot-storage.la \
 	../lib-dovecot/libdovecot.la
 
-deliver_LDADD = \
-	$(libs) \
-	$(LIBICONV) \
-	$(MODULE_LIBS)
+deliver_LDADD = $(libs)
 
 deliver_DEPENDENCIES = $(libs)
 
diff -r 3195c1b157c9 -r f8cc52698a42 src/dict/Makefile.am
--- a/src/dict/Makefile.am	Mon Apr 06 17:02:49 2009 -0400
+++ b/src/dict/Makefile.am	Mon Apr 06 17:10:44 2009 -0400
@@ -18,7 +18,6 @@ libs = \
 
 dict_LDADD = \
 	$(libs) \
-	$(MODULE_LIBS) \
 	$(DICT_LIBS) \
 	$(SQL_LIBS)
 
diff -r 3195c1b157c9 -r f8cc52698a42 src/imap/Makefile.am
--- a/src/imap/Makefile.am	Mon Apr 06 17:02:49 2009 -0400
+++ b/src/imap/Makefile.am	Mon Apr 06 17:10:44 2009 -0400
@@ -20,9 +20,7 @@ libs = \
 	../lib-dovecot/libdovecot.la
 
 imap_LDADD = \
-	$(libs) \
-	$(LIBICONV) \
-	$(MODULE_LIBS)
+	$(libs)
 
 imap_DEPENDENCIES = $(libs)
 
diff -r 3195c1b157c9 -r f8cc52698a42 src/lib-dovecot/Makefile.am
--- a/src/lib-dovecot/Makefile.am	Mon Apr 06 17:02:49 2009 -0400
+++ b/src/lib-dovecot/Makefile.am	Mon Apr 06 17:10:44 2009 -0400
@@ -13,7 +13,8 @@ libs = \
 
 libdovecot_la_LIBADD = \
 	$(libs) \
-	$(MODULE_LIBS)
+	$(MODULE_LIBS) \
+	$(LIBICONV)
 
 libdovecot_la_DEPENDENCIES = $(libs)
 
diff -r 3195c1b157c9 -r f8cc52698a42 src/pop3/Makefile.am
--- a/src/pop3/Makefile.am	Mon Apr 06 17:02:49 2009 -0400
+++ b/src/pop3/Makefile.am	Mon Apr 06 17:10:44 2009 -0400
@@ -17,10 +17,7 @@ libs = \
 	../lib-storage/libdovecot-storage.la \
 	../lib-dovecot/libdovecot.la
 
-pop3_LDADD = \
-	$(libs) \
-	$(LIBICONV) \
-	$(MODULE_LIBS)
+pop3_LDADD = $(libs)
 
 pop3_DEPENDENCIES = $(libs)
 
diff -r 3195c1b157c9 -r f8cc52698a42 src/tests/Makefile.am
--- a/src/tests/Makefile.am	Mon Apr 06 17:02:49 2009 -0400
+++ b/src/tests/Makefile.am	Mon Apr 06 17:10:44 2009 -0400
@@ -31,11 +31,9 @@ noinst_HEADERS = \
 	test-lib.h
 
 test_mail_LDADD = \
-	$(LIBICONV) \
 	libtest.a \
 	../lib-dovecot/libdovecot.la
 
 test_imap_LDADD = \
-	$(LIBICONV) \
 	libtest.a \
 	../lib-dovecot/libdovecot.la
diff -r 3195c1b157c9 -r f8cc52698a42 src/util/Makefile.am
--- a/src/util/Makefile.am	Mon Apr 06 17:02:49 2009 -0400
+++ b/src/util/Makefile.am	Mon Apr 06 17:10:44 2009 -0400
@@ -66,8 +66,7 @@ dovecotpw_LDADD = \
 	../lib-ntlm/libntlm.a \
 	../lib-otp/libotp.a \
 	../lib-dovecot/libdovecot.la \
-	$(AUTH_LIBS) \
-	$(MODULE_LIBS)
+	$(AUTH_LIBS)
 
 dovecotpw_SOURCES = \
 	dovecotpw.c