Define new libdovecot library called lib-json

diff --git a/configure.ac b/configure.ac
index 5a771bd851afce24c3d0821a9e8ce45e28c0b57c..c5d65fab4aa6156948baafb65d1668a7b1d88c30 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -546,6 +546,7 @@ LIBDOVECOT_LA_LIBS='\
        $(top_builddir)/src/lib-charset/libcharset.la \
        $(top_builddir)/src/lib-ssl-iostream/libssl_iostream.la \
        $(top_builddir)/src/lib-dcrypt/libdcrypt.la \
+       $(top_builddir)/src/lib-json/libjson.la \
        $(top_builddir)/src/lib-test/libtest.la \
        $(top_builddir)/src/lib/liblib.la'
 # This is used in dovecot-config, which is grepped in dovecot.m4,
@@ -757,6 +758,7 @@ src/lib-imap-storage/Makefile
 src/lib-imap-client/Makefile
 src/lib-imap-urlauth/Makefile
 src/lib-index/Makefile
+src/lib-json/Makefile
 src/lib-lda/Makefile
 src/lib-ldap/Makefile
 src/lib-lua/Makefile

diff --git a/dovecot-config.in.in b/dovecot-config.in.in
index 52376d9147282b4446748a86ca4cf0a4cb073bb6..92efbfc1c2b2363ae8167a95fbbfed8f86ba45cc 100644 (file)
--- a/dovecot-config.in.in
+++ b/dovecot-config.in.in
@@ -28,7 +28,7 @@ LIBDOVECOT_DSYNC_DEPS="@LIBDOVECOT_DSYNC@"
 LIBDOVECOT_LIBFTS_DEPS="@LIBDOVECOT_LIBFTS@"
 LIBDOVECOT_LUA_DEPS="@LIBDOVECOT_LUA@"
 
-LIBDOVECOT_INCLUDE="-I$(incdir) -I$(incdir)/src/lib -I$(incdir)/src/lib-dict -I$(incdir)/src/lib-dns -I$(incdir)/src/lib-http -I$(incdir)/src/lib-mail -I$(incdir)/src/lib-smtp -I$(incdir)/src/lib-imap -I$(incdir)/src/lib-imap -I$(incdir)/src/lib-fs -I$(incdir)/src/lib-charset -I$(incdir)/src/lib-auth -I$(incdir)/src/lib-auth-client -I$(incdir)/src/lib-login -I$(incdir)/src/lib-master -I$(incdir)/src/lib-ssl-iostream -I$(incdir)/src/lib-compression -I$(incdir)/src/lib-settings -I$(incdir)/src/lib-test -I$(incdir)/src/lib-sasl -I$(incdir)/src/lib-dcrypt -I$(incdir)/src/lib-program-client"
+LIBDOVECOT_INCLUDE="-I$(incdir) -I$(incdir)/src/lib -I$(incdir)/src/lib-json -I$(incdir)/src/lib-dict -I$(incdir)/src/lib-dns -I$(incdir)/src/lib-http -I$(incdir)/src/lib-mail -I$(incdir)/src/lib-smtp -I$(incdir)/src/lib-imap -I$(incdir)/src/lib-imap -I$(incdir)/src/lib-fs -I$(incdir)/src/lib-charset -I$(incdir)/src/lib-auth -I$(incdir)/src/lib-auth-client -I$(incdir)/src/lib-login -I$(incdir)/src/lib-master -I$(incdir)/src/lib-ssl-iostream -I$(incdir)/src/lib-compression -I$(incdir)/src/lib-settings -I$(incdir)/src/lib-test -I$(incdir)/src/lib-sasl -I$(incdir)/src/lib-dcrypt -I$(incdir)/src/lib-program-client"
 LIBDOVECOT_LDA_INCLUDE="-I$(incdir)/src/lib-lda -I$(incdir)/src/lda"
 LIBDOVECOT_AUTH_INCLUDE="-I$(incdir)/src/auth"
 LIBDOVECOT_DOVEADM_INCLUDE="-I$(incdir)/src/lib-doveadm -I$(incdir)/src/doveadm"

diff --git a/src/Makefile.am b/src/Makefile.am
index 408933e9c1a417190f5bbed2dd5532b170738f85..5aacefc7e239d8af8604f54dbd693420096dca8b 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -17,6 +17,7 @@ LIBDOVECOT_SUBDIRS = \
        lib-master \
        lib-login \
        lib-charset \
+       lib-json \
        lib-dcrypt \
        lib-dict \
        lib-sasl \

diff --git a/src/lib-json/Makefile.am b/src/lib-json/Makefile.am
new file mode 100644 (file)
index 0000000..cf30aa1
--- /dev/null
+++ b/src/lib-json/Makefile.am
@@ -0,0 +1,23 @@
+noinst_LTLIBRARIES = libjson.la
+
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/src/lib \
+       -I$(top_srcdir)/src/lib-test
+
+libjson_la_SOURCES =
+libjson_la_LIBADD = -lm
+
+headers =
+
+test_programs =
+
+noinst_PROGRAMS = $(test_programs)
+
+pkginc_libdir=$(pkgincludedir)
+pkginc_lib_HEADERS = $(headers)
+
+check: check-am check-test
+check-test: all-am
+       for bin in $(test_programs); do \
+         if ! $(RUN_TEST) ./$$bin; then exit 1; fi; \
+       done