From: Timo Sirainen Date: Fri, 13 Feb 2026 05:49:32 +0000 (+0200) Subject: lib-dovecot: Split off libdovecot-gssapi.la linking to lib-dovecot-gssapi X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c7664b29b0a395e57152e335fda982df072971d6;p=thirdparty%2Fdovecot%2Fcore.git lib-dovecot: Split off libdovecot-gssapi.la linking to lib-dovecot-gssapi --- diff --git a/configure.ac b/configure.ac index 71bbccc93c..1e3e0bcc5e 100644 --- a/configure.ac +++ b/configure.ac @@ -619,7 +619,7 @@ if test "$want_shared_libs" = "yes"; then LIBDOVECOT_LUA='$(top_builddir)/src/lib-lua/libdovecot-lua.la' fi if test $want_gssapi != no; then - LIBDOVECOT_GSSAPI='$(top_builddir)/src/lib-dovecot/libdovecot-gssapi.la' + LIBDOVECOT_GSSAPI='$(top_builddir)/src/lib-dovecot-gssapi/libdovecot-gssapi.la' fi else LIBDOVECOT_DEPS="$LIBDOVECOT_LA_LIBS" @@ -872,6 +872,7 @@ src/lib-login/Makefile src/lib-program-client/Makefile src/lib-otp/Makefile src/lib-dovecot/Makefile +src/lib-dovecot-gssapi/Makefile src/lib-sasl/Makefile src/lib-settings/Makefile src/lib-smtp/Makefile diff --git a/src/Makefile.am b/src/Makefile.am index 56d6311742..244822a29e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -8,6 +8,9 @@ endif if BUILD_IMAP_HIBERNATE IMAP_HIBERNATE=imap-hibernate endif +if HAVE_GSSAPI +LIBDOVEOT_GSSAPI_DIR=lib-dovecot-gssapi +endif LIBDOVECOT_SUBDIRS = \ lib-test \ @@ -44,6 +47,7 @@ SUBDIRS = \ $(LIBDOVECOT_SUBDIRS) \ lib-dict-extra \ lib-dovecot \ + $(LIBDOVEOT_GSSAPI_DIR) \ $(LIB_LDAP) \ $(LIB_LUA) \ lib-language \ diff --git a/src/lib-dovecot-gssapi/Makefile.am b/src/lib-dovecot-gssapi/Makefile.am new file mode 100644 index 0000000000..2e1fd5eef2 --- /dev/null +++ b/src/lib-dovecot-gssapi/Makefile.am @@ -0,0 +1,14 @@ +pkglib_LTLIBRARIES = libdovecot-gssapi.la + +libdovecot_gssapi_la_CPPFLAGS = $(AM_CPPFLAGS) $(KRB5_CFLAGS) +libdovecot_gssapi_la_SOURCES = +libdovecot_gssapi_la_LIBADD = \ + $(top_builddir)/src/lib-sasl/libsasl-gssapi.la \ + $(top_builddir)/src/lib-auth/libauth-gssapi.la \ + $(MODULE_LIBS) \ + $(KRB5_LIBS) \ + $(RELRO_LDFLAGS) +libdovecot_gssapi_la_DEPENDENCIES = \ + $(top_builddir)/src/lib-sasl/libsasl-gssapi.la \ + $(top_builddir)/src/lib-auth/libauth-gssapi.la +libdovecot_gssapi_la_LDFLAGS = -export-dynamic diff --git a/src/lib-dovecot/Makefile.am b/src/lib-dovecot/Makefile.am index c3ed501de6..cca7630e8d 100644 --- a/src/lib-dovecot/Makefile.am +++ b/src/lib-dovecot/Makefile.am @@ -13,20 +13,3 @@ libdovecot_la_LIBADD = \ libdovecot_la_DEPENDENCIES = $(LIBDOVECOT_LA_LIBS) libdovecot_la_LDFLAGS = -export-dynamic - -if HAVE_GSSAPI -pkglib_LTLIBRARIES += libdovecot-gssapi.la - -libdovecot_gssapi_la_CPPFLAGS = $(AM_CPPFLAGS) $(KRB5_CFLAGS) -libdovecot_gssapi_la_SOURCES = -libdovecot_gssapi_la_LIBADD = \ - $(top_builddir)/src/lib-sasl/libsasl-gssapi.la \ - $(top_builddir)/src/lib-auth/libauth-gssapi.la \ - $(MODULE_LIBS) \ - $(KRB5_LIBS) \ - $(RELRO_LDFLAGS) -libdovecot_gssapi_la_DEPENDENCIES = \ - $(top_builddir)/src/lib-sasl/libsasl-gssapi.la \ - $(top_builddir)/src/lib-auth/libauth-gssapi.la -libdovecot_gssapi_la_LDFLAGS = -export-dynamic -endif