From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Fri, 27 Jan 2023 19:52:04 +0000 (+0200)
Subject: global: Fix libauth and libotp linking issues using --without-shared-libs
X-Git-Tag: 2.4.0~3047
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c1e759a7f195fd69bfb22dae8a1cb9998eb49547;p=thirdparty%2Fdovecot%2Fcore.git

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

diff --git a/src/auth/Makefile.am b/src/auth/Makefile.am
index 2de1067e11..c2ee34d003 100644
--- 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 0705995b96..0460fcc0cd 100644
--- 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 fdc63a0788..f0f049a088 100644
--- 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 f4ebef0cc6..2016277875 100644
--- 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)