ldap: Fix cyclic dependency

diff --git a/configure.ac b/configure.ac
index 791c960f30b64228352c8a48511c3eceb750bb1f..060ab3acb3640200a67837404f20d51c1b4b59fe 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2929,6 +2929,7 @@ src/plugins/Makefile
 src/plugins/acl/Makefile
 src/plugins/imap-acl/Makefile
 src/plugins/autocreate/Makefile
+src/plugins/dict-ldap/Makefile
 src/plugins/expire/Makefile
 src/plugins/fs-compress/Makefile
 src/plugins/fts/Makefile

diff --git a/src/Makefile.am b/src/Makefile.am
index b456be5db5a1cfeee3f9d0788155443a53291be2..086b7c8fb5bb927921d69dd753452146c66aaaf4 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -23,9 +23,9 @@ LIBDOVECOT_SUBDIRS = \
 
 SUBDIRS = \
        $(LIBDOVECOT_SUBDIRS) \
-       $(LIB_LDAP) \
        lib-dict-extra \
        lib-dovecot \
+       $(LIB_LDAP) \
        lib-fts \
        lib-imap-client \
        lib-imap-urlauth \

diff --git a/src/lib-dict-extra/Makefile.am b/src/lib-dict-extra/Makefile.am
index 7cf50114a06bb550b9429350452625afb90dfb1c..e39d112ad8d69e2d3d248b8943e2a0c3624ebad3 100644 (file)
--- a/src/lib-dict-extra/Makefile.am
+++ b/src/lib-dict-extra/Makefile.am
@@ -6,7 +6,6 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/src/lib \
        -I$(top_srcdir)/src/lib-dict \
        -I$(top_srcdir)/src/lib-fs \
-       -I$(top_srcdir)/src/lib-ldap \
        -I$(top_srcdir)/src/lib-settings
 
 libdict_extra_la_SOURCES = \
@@ -14,19 +13,3 @@ libdict_extra_la_SOURCES = \
        dict-register.c
 
 NOPLUGIN_LDFLAGS =
-
-if HAVE_LDAP
-LIBDICT_LDAP = libdict_ldap.la
-endif
-libdict_ldap_la_LDFLAGS = -module -avoid-version $(LIBDOVECOT_LDAP)
-
-module_dictdir = $(moduledir)/dict
-module_dict_LTLIBRARIES = \
-       $(LIBDICT_LDAP)
-
-libdict_ldap_la_SOURCES = \
-       dict-ldap.c \
-       dict-ldap-settings.c
-
-noinst_HEADERS = \
-       dict-ldap-settings.h

diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
index b9196b38f73ec93049aee4acc0a5e167d320a583..7e0d00b17d98b42d054e07e874149ccc325be9e7 100644 (file)
--- a/src/plugins/Makefile.am
+++ b/src/plugins/Makefile.am
@@ -10,6 +10,10 @@ if BUILD_SOLR
 FTS_SOLR = fts-solr
 endif
 
+if HAVE_LDAP
+DICT_LDAP = dict-ldap
+endif
+
 SUBDIRS = \
        acl \
        imap-acl \
@@ -38,4 +42,5 @@ SUBDIRS = \
        $(ZLIB) \
        $(FTS_LUCENE) \
        $(FTS_SOLR) \
+       $(DICT_LDAP) \
        fs-compress

diff --git a/src/plugins/dict-ldap/Makefile.am b/src/plugins/dict-ldap/Makefile.am
new file mode 100644 (file)
index 0000000..7caeba6
--- /dev/null
+++ b/src/plugins/dict-ldap/Makefile.am
@@ -0,0 +1,21 @@
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/src/lib \
+       -I$(top_srcdir)/src/lib-dict \
+       -I$(top_srcdir)/src/lib-ldap \
+       -I$(top_srcdir)/src/lib-settings
+
+LIBDICT_LDAP = libdict_ldap.la
+libdict_ldap_la_DEPENDENCIES = $(LIBDOVECOT_LDAP)
+libdict_ldap_la_LDFLAGS = -module -avoid-version
+libdict_ldap_la_LIBADD = $(LIBDOVECOT_LDAP)
+
+module_dictdir = $(moduledir)/dict
+module_dict_LTLIBRARIES = \
+       $(LIBDICT_LDAP)
+
+libdict_ldap_la_SOURCES = \
+       dict-ldap.c \
+       dict-ldap-settings.c
+
+noinst_HEADERS = \
+       dict-ldap-settings.h

diff --git a/src/lib-dict-extra/dict-ldap-settings.c b/src/plugins/dict-ldap/dict-ldap-settings.c
similarity index 100%
rename from src/lib-dict-extra/dict-ldap-settings.c
rename to src/plugins/dict-ldap/dict-ldap-settings.c

diff --git a/src/lib-dict-extra/dict-ldap-settings.h b/src/plugins/dict-ldap/dict-ldap-settings.h
similarity index 100%
rename from src/lib-dict-extra/dict-ldap-settings.h
rename to src/plugins/dict-ldap/dict-ldap-settings.h

diff --git a/src/lib-dict-extra/dict-ldap.c b/src/plugins/dict-ldap/dict-ldap.c
similarity index 100%
rename from src/lib-dict-extra/dict-ldap.c
rename to src/plugins/dict-ldap/dict-ldap.c