From 1a7fa59cdd28b00f1b5ec1d2e16ea9e1c91062bc Mon Sep 17 00:00:00 2001
From: Aki Tuomi <aki.tuomi@open-xchange.com>
Date: Wed, 19 Nov 2025 12:10:27 +0200
Subject: [PATCH] lib-dovecot: Make it possible to do semistatic libdovecot.so

This can be now done with setting
 - ZLIB_LIBS_STATIC to libz.a location
 - LIBPCRE_LIBS_STATIC to libpcre2-32.a location
 - SSL_LIBS to both libssl.a and libcrypto.a location
---
 configure.ac                | 4 +++-
 src/lib-dovecot/Makefile.am | 3 +++
 src/lib-regex/Makefile.am   | 2 +-
 src/lib/Makefile.am         | 2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 15d95953f6..798c3d39eb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -644,9 +644,11 @@ LIBDOVECOT_LIBLANG='$(top_builddir)/src/lib-language/libdovecot-language.la'
 LIBDOVECOT_OPENSSL='$(top_builddir)/src/lib-ssl-iostream/libssl_iostream_openssl.la'
 LIBDOVECOT_OPENSSL_DEPS="$LIBDOVECOT_OPENSSL"
 
-LIBDOVECOT_TEST_LIBS="\$(LIBPCRE_LIBS) \$(ZLIB_LIBS) \$(MODULE_LIBS) \$(DLLIB) -lm"
+LIBDOVECOT_TEST_LIBS="\$(LIBPCRE_LIBS_STATIC) \$(LIBPCRE_LIBS) \$(ZLIB_LIBS_STATIC) \$(ZLIB_LIBS) \$(MODULE_LIBS) \$(DLLIB) -lm"
 
 AC_SUBST(LIBDOVECOT)
+AC_SUBST(LIBPCRE_LIBS_STATIC)
+AC_SUBST(ZLIB_LIBS_STATIC)
 AC_SUBST(LIBDOVECOTTEST_LIBS)
 AC_SUBST(LIBDOVECOT_LA_LIBS)
 AC_SUBST(LIBDOVECOT_DEPS)
diff --git a/src/lib-dovecot/Makefile.am b/src/lib-dovecot/Makefile.am
index feb9d064ae..b69fc8269c 100644
--- a/src/lib-dovecot/Makefile.am
+++ b/src/lib-dovecot/Makefile.am
@@ -5,6 +5,9 @@ libdovecot_la_SOURCES =
 libdovecot_la_LIBADD = \
 	$(LIBDOVECOT_LA_LIBS) \
 	$(MODULE_LIBS) \
+	$(ZLIB_LIBS_STATIC) \
+	$(ZLIB_LIBS) \
+	$(LIBPCRE_LIBS_STATIC) \
 	$(LIBPCRE_LIBS) \
 	$(RELRO_LDFLAGS)
 
diff --git a/src/lib-regex/Makefile.am b/src/lib-regex/Makefile.am
index 56ac72940a..71494678c7 100644
--- a/src/lib-regex/Makefile.am
+++ b/src/lib-regex/Makefile.am
@@ -23,7 +23,7 @@ noinst_LTLIBRARIES=libdregex.la
 
 if BUILD_LIBREGEX
 libdregex_la_SOURCES = regex.c
-libdregex_la_LIBADD = $(LIBPCRE_LIBS)
+libdregex_la_LIBADD = $(LIBPCRE_LIBS_STATIC) $(LIBPCRE_LIBS)
 
 EXTRA_DIST =
 
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index f83435e30d..382bbd3b29 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -83,7 +83,7 @@ $(srcdir)/unicode-data-tables.c $(srcdir)/unicode-data-tables.h \
 	$(srcdir)/unicode-ucd-compile.py $(UCD_FILES)
 	$(AM_V_GEN)$(PYTHON) $(srcdir)/unicode-ucd-compile.py $(UCD_DIR) $(srcdir)
 
-liblib_la_LIBADD = $(LIBUNWIND_LIBS) $(ZLIB_LIBS)
+liblib_la_LIBADD = $(LIBUNWIND_LIBS) $(ZLIB_LIBS_STATIC) $(ZLIB_LIBS)
 liblib_la_SOURCES = \
 	array.c \
 	aqueue.c \
-- 
2.47.3