From: Timo Sirainen <timo.sirainen@dovecot.fi>
Date: Thu, 21 Apr 2016 15:58:10 +0000 (+0300)
Subject: lib-dict: Moved dict-ldap to lib-dict-extra
X-Git-Tag: 2.3.0.rc1~3955
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=57729dda3e18f02bf3a1eb5ebba5fa2ea18b6d8e;p=thirdparty%2Fdovecot%2Fcore.git

lib-dict: Moved dict-ldap to lib-dict-extra

This also allows moving lib-ldap away from LIBDOVECOT_SUBDIRS in
src/Makefile.am, which was wrong because it's not really part of
libdovecot.la.
---

diff --git a/src/Makefile.am b/src/Makefile.am
index 87501de279..39c62d213a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -10,7 +10,6 @@ LIBDOVECOT_SUBDIRS = \
 	lib-master \
 	lib-charset \
 	lib-dns \
-	$(LIB_LDAP) \
 	lib-dict \
 	lib-sasl \
 	lib-ssl-iostream \
@@ -23,6 +22,7 @@ LIBDOVECOT_SUBDIRS = \
 
 SUBDIRS = \
 	$(LIBDOVECOT_SUBDIRS) \
+	$(LIB_LDAP) \
 	lib-dict-extra \
 	lib-dovecot \
 	lib-fts \
diff --git a/src/lib-dict-extra/Makefile.am b/src/lib-dict-extra/Makefile.am
index c292ba2336..7cf50114a0 100644
--- a/src/lib-dict-extra/Makefile.am
+++ b/src/lib-dict-extra/Makefile.am
@@ -6,9 +6,27 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/src/lib \
 	-I$(top_srcdir)/src/lib-dict \
 	-I$(top_srcdir)/src/lib-fs \
-	-I$(top_srcdir)/src/lib-settings \
-	$(SQL_CFLAGS)
+	-I$(top_srcdir)/src/lib-ldap \
+	-I$(top_srcdir)/src/lib-settings
 
 libdict_extra_la_SOURCES = \
 	dict-fs.c \
 	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/lib-dict/dict-ldap-settings.c b/src/lib-dict-extra/dict-ldap-settings.c
similarity index 100%
rename from src/lib-dict/dict-ldap-settings.c
rename to src/lib-dict-extra/dict-ldap-settings.c
diff --git a/src/lib-dict/dict-ldap-settings.h b/src/lib-dict-extra/dict-ldap-settings.h
similarity index 100%
rename from src/lib-dict/dict-ldap-settings.h
rename to src/lib-dict-extra/dict-ldap-settings.h
diff --git a/src/lib-dict/dict-ldap.c b/src/lib-dict-extra/dict-ldap.c
similarity index 100%
rename from src/lib-dict/dict-ldap.c
rename to src/lib-dict-extra/dict-ldap.c
diff --git a/src/lib-dict/Makefile.am b/src/lib-dict/Makefile.am
index 07fbda079e..805ecc6a7c 100644
--- a/src/lib-dict/Makefile.am
+++ b/src/lib-dict/Makefile.am
@@ -4,7 +4,6 @@ noinst_LIBRARIES = libdict_backend.a
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/src/lib \
 	-I$(top_srcdir)/src/lib-test \
-	-I$(top_srcdir)/src/lib-ldap \
 	-I$(top_srcdir)/src/lib-sql \
 	-I$(top_srcdir)/src/lib-settings \
 	$(SQL_CFLAGS)
@@ -30,25 +29,9 @@ libdict_backend_a_SOURCES = \
 nodist_libdict_backend_a_SOURCES = \
 	dict-drivers-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
-
 headers = \
 	dict.h \
 	dict-client.h \
-	dict-ldap-settings.h \
 	dict-private.h \
 	dict-sql.h \
 	dict-sql-settings.h \