lib-dovecot: Split off libdovecot-gssapi.la linking to lib-dovecot-gssapi

diff --git a/configure.ac b/configure.ac
index 71bbccc93c2cd6f233e88f8a9da907a60275dadb..1e3e0bcc5e07b789006287bdec31b1749a534915 100644 (file)
--- 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 56d631174210a7091485ad3ada533d20f45cdd13..244822a29e45e92950dbf654046b376316927c31 100644 (file)
--- 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 (file)
index 0000000..2e1fd5e
--- /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 c3ed501de65ea9b17f8b57ed0562af9d1fb0baa9..cca7630e8de8852cfd9a0faca1bc719b9bbebf64 100644 (file)
--- 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