Link -liconv to libdovecot.so if necessary.

--HG--
branch : HEAD

diff --git a/src/auth/Makefile.am b/src/auth/Makefile.am
index 74c980f3373056908d5f9731682f6a1ad6d2c8a0..6528609efe1d96ded852a3f78b4eb28357ca607d 100644 (file)
--- a/src/auth/Makefile.am
+++ b/src/auth/Makefile.am
@@ -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 --git a/src/deliver/Makefile.am b/src/deliver/Makefile.am
index 2bbccae729396e5908d196b03a7a416f10e72753..3a727abbc50fa4c1c84a89d02ab5d9df2c5a4bb5 100644 (file)
--- a/src/deliver/Makefile.am
+++ b/src/deliver/Makefile.am
@@ -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 --git a/src/dict/Makefile.am b/src/dict/Makefile.am
index 34808729c6191f1c701926401b47782a6772a3fd..7f91ce49a89d84fd35856f7f2f6cbfe8fd94726b 100644 (file)
--- a/src/dict/Makefile.am
+++ b/src/dict/Makefile.am
@@ -18,7 +18,6 @@ libs = \
 
 dict_LDADD = \
        $(libs) \
-       $(MODULE_LIBS) \
        $(DICT_LIBS) \
        $(SQL_LIBS)
 

diff --git a/src/imap/Makefile.am b/src/imap/Makefile.am
index 5439ec171e31b282d4a5075cb7b9f6c898625c92..9ca4086e8bc2f057fe5503995810e57e294f1c46 100644 (file)
--- a/src/imap/Makefile.am
+++ b/src/imap/Makefile.am
@@ -20,9 +20,7 @@ libs = \
        ../lib-dovecot/libdovecot.la
 
 imap_LDADD = \
-       $(libs) \
-       $(LIBICONV) \
-       $(MODULE_LIBS)
+       $(libs)
 
 imap_DEPENDENCIES = $(libs)
 

diff --git a/src/lib-dovecot/Makefile.am b/src/lib-dovecot/Makefile.am
index 4a26f26a4c73cbec621d35a144578d2c47e56ab3..69ced6bbb15bc9eee6e0d27a4eca3dbd3c077f9a 100644 (file)
--- a/src/lib-dovecot/Makefile.am
+++ b/src/lib-dovecot/Makefile.am
@@ -13,7 +13,8 @@ libs = \
 
 libdovecot_la_LIBADD = \
        $(libs) \
-       $(MODULE_LIBS)
+       $(MODULE_LIBS) \
+       $(LIBICONV)
 
 libdovecot_la_DEPENDENCIES = $(libs)
 

diff --git a/src/pop3/Makefile.am b/src/pop3/Makefile.am
index 0174ce76c0d19d5016e6f2ad1aabc725ceb6f933..8e9324ea8a041fb7ec9e9a03dca226020c313cf8 100644 (file)
--- a/src/pop3/Makefile.am
+++ b/src/pop3/Makefile.am
@@ -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 --git a/src/tests/Makefile.am b/src/tests/Makefile.am
index e8398b7189e9949b84e86dd772d133e46c2870a9..6ed5f50031079a0f63f15a4184fde41acf550831 100644 (file)
--- a/src/tests/Makefile.am
+++ b/src/tests/Makefile.am
@@ -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 --git a/src/util/Makefile.am b/src/util/Makefile.am
index 23a8e37ae820f33206720d57ba5a566913f4a181..d4d7b141831c2c1d96ef1ce6791687c787646476 100644 (file)
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -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