global: Fix libauth and libotp linking issues using --without-shared-libs

diff --git a/src/auth/Makefile.am b/src/auth/Makefile.am
index 2de1067e117b7a692f25b919224719e99afe91fc..c2ee34d00307cb42661bc880d1916f454cad44f0 100644 (file)
--- a/src/auth/Makefile.am
+++ b/src/auth/Makefile.am
@@ -63,7 +63,6 @@ auth_LDFLAGS = -export-dynamic
 
 auth_libs = \
        libauth.la \
-       ../lib-otp/libotp.la \
        $(AUTH_LUA_LIBS) \
        $(LIBDOVECOT_SQL)
 

diff --git a/src/doveadm/Makefile.am b/src/doveadm/Makefile.am
index 0705995b96d580721d6bff9951e89ae13741da1b..0460fcc0cdb4f5edb29bed91853c34e1e1158fe8 100644 (file)
--- a/src/doveadm/Makefile.am
+++ b/src/doveadm/Makefile.am
@@ -38,9 +38,6 @@ AM_CPPFLAGS = \
        -DMANDIR=\""$(mandir)"\" \
        $(BINARY_CFLAGS)
 
-cmd_pw_libs = \
-       ../lib-auth/libauth.la \
-       ../lib-otp/libotp.la
 
 libs = \
        dsync/libdsync.la \
@@ -48,7 +45,6 @@ libs = \
 
 doveadm_LDADD = \
        $(libs) \
-       $(cmd_pw_libs) \
        $(CRYPT_LIBS) \
        $(LIBDOVECOT_STORAGE) \
        $(LIBDOVECOT) \
@@ -58,7 +54,6 @@ doveadm_LDADD = \
 
 doveadm_DEPENDENCIES = \
        $(libs) \
-       $(cmd_pw_libs) \
        $(LIBDOVECOT_STORAGE_DEPS) \
        $(LIBDOVECOT_DEPS)
 

diff --git a/src/lib-imap-client/Makefile.am b/src/lib-imap-client/Makefile.am
index fdc63a07889c26f450739dd81b9e7529cf295d91..f0f049a088eed9b6b68d1b5a9f5e338fe055a81c 100644 (file)
--- a/src/lib-imap-client/Makefile.am
+++ b/src/lib-imap-client/Makefile.am
@@ -37,6 +37,7 @@ test_deps = \
        ../lib-charset/libcharset.la \
        ../lib-dns/libdns.la \
        ../lib-auth/libauth.la \
+       ../lib-otp/libotp.la \
        ../lib-test/libtest.la \
        ../lib/liblib.la
 

diff --git a/src/lib-smtp/Makefile.am b/src/lib-smtp/Makefile.am
index f4ebef0cc6da18252ddd175292f2ce276a3dabd2..20162778751e677dba4ecf67bd6019a5e7c41efd 100644 (file)
--- a/src/lib-smtp/Makefile.am
+++ b/src/lib-smtp/Makefile.am
@@ -112,6 +112,7 @@ test_libs = \
        ../lib-settings/libsettings.la \
        ../lib-sasl/libsasl.la \
        ../lib-auth/libauth.la \
+       ../lib-otp/libotp.la \
        ../lib-test/libtest.la \
        ../lib/liblib.la \
        $(MODULE_LIBS)