dovecot-config: Include used Lua details

diff --git a/Makefile.am b/Makefile.am
index 0150686d8e59bc6ed83c4adab8b1ca4dfe6c9eae..d96aaab6a1000e2be56782c3de814b9aecc442f3 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -80,6 +80,7 @@ install-exec-hook:
        -e "s|^\(LIBDOVECOT_DSYNC\)=.*$$|\1=-ldovecot-dsync|" \
        -e "s|^\(LIBDOVECOT_LDA\)=.*$$|\1=-ldovecot-lda|" \
        -e "s|^\(LIBDOVECOT_LIBFTS\)=.*$$|\1=-ldovecot-fts|" \
+       -e "s|^\(LIBDOVECOT_LUA\)=.*$$|\1=-ldovecot-lua|" \
        -e "s|^\(LIBDOVECOT_STORAGE\)=.*$$|\1='-ldovecot-storage $(LINKED_STORAGE_LDADD)'|" \
        -e "s|^\(LIBDOVECOT_INCLUDE\)=.*$$|\1=-I$(pkgincludedir)|" \
        > $(DESTDIR)$(pkglibdir)/dovecot-config

diff --git a/configure.ac b/configure.ac
index c27989adaa67c7a93396d4f22edaa7352d79bf25..945cbf754890d3360c76d4e2921688b3a5ca246b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -663,6 +663,13 @@ LIBDOVECOT_DSYNC='$(top_builddir)/src/doveadm/dsync/libdovecot-dsync.la'
 LIBDOVECOT_SQL='$(top_builddir)/src/lib-sql/libsql.la'
 LIBDOVECOT_COMPRESS='$(top_builddir)/src/lib-compression/libcompression.la'
 LIBDOVECOT_LIBFTS='$(top_builddir)/src/lib-fts/libfts.la'
+
+if test $with_lua != no; then
+  LIBDOVECOT_LUA='$(top_builddir)/src/lib-lua/libdovecot-lua.la'
+else
+  LIBDOVECOT_LUA=''
+fi
+
 AC_SUBST(LIBDOVECOT)
 AC_SUBST(LIBDOVECOT_LA_LIBS)
 AC_SUBST(LIBDOVECOT_DEPS)
@@ -676,6 +683,8 @@ AC_SUBST(LIBDOVECOT_LDA)
 AC_SUBST(LIBDOVECOT_LDAP)
 AC_SUBST(LIBDOVECOT_LIBFTS)
 AC_SUBST(LIBDOVECOT_LIBFTS_DEPS)
+AC_SUBST(LIBDOVECOT_LUA)
+AC_SUBST(LIBDOVECOT_LUA_DEPS)
 
 dnl **
 dnl ** SQL drivers

diff --git a/dovecot-config.in.in b/dovecot-config.in.in
index 92b039abfce1ad438310a613af0d4ed8cbc66b3c..088c9af4b47bcb834931a325fc0727c7224be85a 100644 (file)
--- a/dovecot-config.in.in
+++ b/dovecot-config.in.in
@@ -3,6 +3,8 @@ DOVECOT_LIBS="@LIBS@"
 DOVECOT_SSL_LIBS="@SSL_LIBS@"
 DOVECOT_SQL_LIBS="@SQL_LIBS@"
 DOVECOT_COMPRESS_LIBS="@COMPRESS_LIBS@"
+DOVECOT_LUA_LIBS="@LUA_LIBS@"
+DOVECOT_LUA_CFLAGS="@LUA_CFLAGS@"
 DOVECOT_BINARY_CFLAGS="@BINARY_CFLAGS@"
 DOVECOT_BINARY_LDFLAGS="@BINARY_LDFLAGS@"
 
@@ -14,6 +16,7 @@ LIBDOVECOT_LDA="@LIBDOVECOT_LDA@"
 LIBDOVECOT_STORAGE="@LIBDOVECOT_STORAGE@"
 LIBDOVECOT_DSYNC="@LIBDOVECOT_DSYNC@"
 LIBDOVECOT_LIBFTS="@LIBDOVECOT_LIBFTS@"
+LIBDOVECOT_LUA="@LIBDOVECOT_LUA@"
 
 LIBDOVECOT_DEPS="@LIBDOVECOT_DEPS@"
 LIBDOVECOT_LOGIN_DEPS="@LIBDOVECOT_LOGIN@"
@@ -23,6 +26,7 @@ LIBDOVECOT_LDA_DEPS="@LIBDOVECOT_LDA@"
 LIBDOVECOT_STORAGE_DEPS="@LIBDOVECOT_STORAGE_DEPS@"
 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-fs -I$(incdir)/src/lib-charset -I$(incdir)/src/lib-auth -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-old-stats -I$(incdir)/src/lib-dcrypt -I$(incdir)/src/lib-program-client"
 LIBDOVECOT_LDA_INCLUDE="-I$(incdir)/src/lib-lda -I$(incdir)/src/lda"

diff --git a/m4/dovecot.m4 b/m4/dovecot.m4
index fcff3ea36c4340a6582c73f9596a1274c9e9dd5e..685cd1df2cee0d5b61968259cde5182def9b1e79 100644 (file)
--- a/m4/dovecot.m4
+++ b/m4/dovecot.m4
@@ -6,7 +6,7 @@ dnl This file is free software; the authors give
 dnl unlimited permission to copy and/or distribute it, with or without
 dnl modifications, as long as this notice is preserved.
 
-# serial 32
+# serial 33
 
 dnl
 dnl Check for support for D_FORTIFY_SOURCE=2
@@ -431,6 +431,7 @@ AC_DEFUN([DC_DOVECOT],[
        AX_SUBST_L([LIBDOVECOT_INCLUDE], [LIBDOVECOT_LDA_INCLUDE], [LIBDOVECOT_AUTH_INCLUDE], [LIBDOVECOT_DOVEADM_INCLUDE], [LIBDOVECOT_SERVICE_INCLUDE], [LIBDOVECOT_STORAGE_INCLUDE], [LIBDOVECOT_LOGIN_INCLUDE], [LIBDOVECOT_SQL_INCLUDE])
        AX_SUBST_L([LIBDOVECOT_IMAP_LOGIN_INCLUDE], [LIBDOVECOT_CONFIG_INCLUDE], [LIBDOVECOT_IMAP_INCLUDE], [LIBDOVECOT_POP3_INCLUDE], [LIBDOVECOT_SUBMISSION_INCLUDE], [LIBDOVECOT_LMTP_INCLUDE], [LIBDOVECOT_DSYNC_INCLUDE], [LIBDOVECOT_IMAPC_INCLUDE], [LIBDOVECOT_FTS_INCLUDE])
        AX_SUBST_L([LIBDOVECOT_NOTIFY_INCLUDE], [LIBDOVECOT_PUSH_NOTIFICATION_INCLUDE], [LIBDOVECOT_ACL_INCLUDE], [LIBDOVECOT_LIBFTS_INCLUDE])
+       AX_SUBST_L([DOVECOT_LUA_LIBS], [DOVECOT_LUA_CFLAGS], [LIBDOVECOT_LUA], [LIBDOVECOT_LUA_DEPS])
 
        AM_CONDITIONAL(DOVECOT_INSTALLED, test "$DOVECOT_INSTALLED" = "yes")