dict-ldap: Move from plugins/dict-ldap to lib-dict-backend

diff --git a/configure.ac b/configure.ac
index 3247f5247b3782eb9395924d797e7be57c702ba5..39cb824ca2de4ea10a6e7b5cb8e0b054cc5bd242 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -878,7 +878,6 @@ 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/lib-dict-backend/Makefile.am b/src/lib-dict-backend/Makefile.am
index 4a9f1cf526e3417c72254203b8ace979f25c36ea..66b9bb06119cf0205fb051efcf9940f8010e8198 100644 (file)
--- a/src/lib-dict-backend/Makefile.am
+++ b/src/lib-dict-backend/Makefile.am
@@ -1,11 +1,13 @@
 noinst_LTLIBRARIES = libdict_backend.la
 
+module_dictdir = $(moduledir)/dict
 dict_drivers = @dict_drivers@
 
 AM_CPPFLAGS = \
        -I$(top_srcdir)/src/lib \
        -I$(top_srcdir)/src/lib-test \
        -I$(top_srcdir)/src/lib-dict \
+       -I$(top_srcdir)/src/lib-ldap \
        -I$(top_srcdir)/src/lib-sql \
        -I$(top_srcdir)/src/lib-settings \
        $(SQL_CFLAGS)
@@ -22,10 +24,25 @@ nodist_libdict_backend_la_SOURCES = \
        dict-drivers-register.c
 
 noinst_HEADERS = \
+       dict-ldap-settings.h \
        dict-sql.h \
        dict-sql-private.h \
        dict-sql-settings.h
 
+if HAVE_LDAP
+LIBDICT_LDAP = libdict_ldap.la
+libdict_ldap_la_DEPENDENCIES = $(LIBDOVECOT_LDAP) $(LIBDOVECOT_DEPS)
+libdict_ldap_la_LDFLAGS = -module -avoid-version
+libdict_ldap_la_LIBADD = $(LIBDOVECOT_LDAP) $(LIBDOVECOT)
+
+module_dict_LTLIBRARIES = \
+       $(LIBDICT_LDAP)
+
+libdict_ldap_la_SOURCES = \
+       dict-ldap.c \
+       dict-ldap-settings.c
+endif
+
 EXTRA_DIST = dict.conf
 
 dict-drivers-register.c: Makefile $(top_builddir)/config.h

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

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

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

diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
index 48c9a281da8b7fac0fc397bc627252d3ab389ea1..13db030a778cc1e08c03dd9ccf11a92aaa20c934 100644 (file)
--- a/src/plugins/Makefile.am
+++ b/src/plugins/Makefile.am
@@ -10,10 +10,6 @@ if BUILD_SOLR
 FTS_SOLR = fts-solr
 endif
 
-if HAVE_LDAP
-DICT_LDAP = dict-ldap
-endif
-
 if HAVE_APPARMOR
 APPARMOR = apparmor
 endif

diff --git a/src/plugins/dict-ldap/Makefile.am b/src/plugins/dict-ldap/Makefile.am
deleted file mode 100644 (file)
index a03b915..0000000
--- a/src/plugins/dict-ldap/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-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) $(LIBDOVECOT_DEPS)
-libdict_ldap_la_LDFLAGS = -module -avoid-version
-libdict_ldap_la_LIBADD = $(LIBDOVECOT_LDAP) $(LIBDOVECOT)
-
-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