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

diff --git a/configure.ac b/configure.ac
index 15d95953f6e3551b243daf55e9a926b8384a909f..798c3d39eb9f65d909cad90be539733d71edf622 100644 (file)
--- 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 feb9d064aecfc965d48f6402645f9f01148a74bb..b69fc8269cb8f128f66901bf5f1789efd02ae62c 100644 (file)
--- 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 56ac72940a3ce00c0fa386b51b79301778cb9bc8..71494678c73ccaa52350bdfe563d144842156a89 100644 (file)
--- 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 f83435e30d58c8463671ba24ce070c5fdbc13a8a..382bbd3b29d2cc04e08749d8c6dde01c6a5545f1 100644 (file)
--- 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 \