From: Aki Tuomi <aki.tuomi@dovecot.fi>
Date: Wed, 11 May 2016 05:02:29 +0000 (+0300)
Subject: ldap: Fix cyclic dependency
X-Git-Tag: 2.2.25.rc1~155
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cecf8cfdc897d6a35629d8ff4efbd0d4638d7836;p=thirdparty%2Fdovecot%2Fcore.git

ldap: Fix cyclic dependency
---

diff --git a/configure.ac b/configure.ac
index 791c960f30..060ab3acb3 100644
--- 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 b456be5db5..086b7c8fb5 100644
--- 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 7cf50114a0..e39d112ad8 100644
--- 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 b9196b38f7..7e0d00b17d 100644
--- 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
index 0000000000..7caeba67c9
--- /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