dovecot-2.2: dovecot-config: Added DOVECOT_INSTALLED parameter.
dovecot at dovecot.org
dovecot at dovecot.org
Fri Feb 13 12:36:12 UTC 2015
details: http://hg.dovecot.org/dovecot-2.2/rev/16c21c12e21f
changeset: 18246:16c21c12e21f
user: Timo Sirainen <tss at iki.fi>
date: Fri Feb 13 14:35:54 2015 +0200
description:
dovecot-config: Added DOVECOT_INSTALLED parameter.
Also added dovecot_installed_moduledir to dovecot.m4
These can be used by external plugins to access some headers and libraries
that don't already have existing DOVECOT_* parameters in dovecot-config.
diffstat:
Makefile.am | 5 +++--
dovecot.m4 | 10 +++++++---
2 files changed, 10 insertions(+), 5 deletions(-)
diffs (67 lines):
diff -r f10725a5eed8 -r 16c21c12e21f Makefile.am
--- a/Makefile.am Thu Feb 12 14:38:18 2015 +0200
+++ b/Makefile.am Fri Feb 13 14:35:54 2015 +0200
@@ -37,7 +37,7 @@
dovecot-config: dovecot-config.in Makefile
old=`pwd` && cd $(top_builddir) && abs_builddir=`pwd` && cd $$old && \
cd $(top_srcdir) && abs_srcdir=`pwd` && cd $$old && \
- cat dovecot-config.in | sed \
+ (echo "DOVECOT_INSTALLED=no"; cat dovecot-config.in | sed \
-e "s|\$$(top_builddir)|$$abs_builddir|g" \
-e "s|\$$(incdir)|$$abs_srcdir|g" \
-e "s|\$$(LIBICONV)|$(LIBICONV)|g" \
@@ -47,7 +47,7 @@
-e "s|^\(dovecot_pkglibexecdir\)=|\1=$(libexecdir)/dovecot|" \
-e "s|^\(dovecot_docdir\)=|\1=$(docdir)|" \
-e "s|^\(dovecot_moduledir\)=|\1=$(moduledir)|" \
- > dovecot-config
+ ) > dovecot-config
if HAVE_SYSTEMD
%.service: %.service.in
@@ -64,6 +64,7 @@
$(mkdir_p) $(DESTDIR)$(pkglibdir); \
grep -v '^LIBDOVECOT_.*_INCLUDE' dovecot-config | \
grep -v '^LIBDOVECOT.*_DEPS' | sed \
+ -e "s|^\(DOVECOT_INSTALLED\)=.*$$|\1=yes|" \
-e "s|^\(LIBDOVECOT\)=.*$$|\1='-L$(pkglibdir) -ldovecot'|" \
-e "s|^\(LIBDOVECOT_LOGIN\)=.*$$|\1='-ldovecot-login $(SSL_LIBS)'|" \
-e "s|^\(LIBDOVECOT_SQL\)=.*$$|\1=-ldovecot-sql|" \
diff -r f10725a5eed8 -r 16c21c12e21f dovecot.m4
--- a/dovecot.m4 Thu Feb 12 14:38:18 2015 +0200
+++ b/dovecot.m4 Fri Feb 13 14:35:54 2015 +0200
@@ -6,7 +6,7 @@
# unlimited permission to copy and/or distribute it, with or without
# modifications, as long as this notice is preserved.
-# serial 13
+# serial 14
AC_DEFUN([DC_DOVECOT_MODULEDIR],[
AC_ARG_WITH(moduledir,
@@ -104,6 +104,8 @@
eval `grep -i '^dovecot_[[a-z_]]*=' "$dovecotdir"/dovecot-config`
eval `grep '^LIBDOVECOT[[A-Z_]]*=' "$dovecotdir"/dovecot-config`
+ dovecot_installed_moduledir="$dovecot_moduledir"
+
if test "$use_install_dirs" = "no"; then
# the main purpose of these is to fix make distcheck for plugins
# other than that, they don't really make much sense
@@ -114,12 +116,14 @@
dovecot_moduledir='$(moduledir)'
fi
- AX_SUBST_L([DISTCHECK_CONFIGURE_FLAGS], [dovecotdir], [dovecot_moduledir], [dovecot_pkgincludedir], [dovecot_pkglibexecdir], [dovecot_pkglibdir], [dovecot_docdir])
- AX_SUBST_L([DOVECOT_CFLAGS], [DOVECOT_LIBS], [DOVECOT_SSL_LIBS], [DOVECOT_SQL_LIBS], [DOVECOT_COMPRESS_LIBS])
+ AX_SUBST_L([DISTCHECK_CONFIGURE_FLAGS], [dovecotdir], [dovecot_moduledir], [dovecot_installed_moduledir], [dovecot_pkgincludedir], [dovecot_pkglibexecdir], [dovecot_pkglibdir], [dovecot_docdir])
+ AX_SUBST_L([DOVECOT_INSTALLED], [DOVECOT_CFLAGS], [DOVECOT_LIBS], [DOVECOT_SSL_LIBS], [DOVECOT_SQL_LIBS], [DOVECOT_COMPRESS_LIBS])
AX_SUBST_L([LIBDOVECOT], [LIBDOVECOT_LOGIN], [LIBDOVECOT_SQL], [LIBDOVECOT_SSL], [LIBDOVECOT_COMPRESS], [LIBDOVECOT_LDA], [LIBDOVECOT_STORAGE], [LIBDOVECOT_DSYNC])
AX_SUBST_L([LIBDOVECOT_DEPS], [LIBDOVECOT_LOGIN_DEPS], [LIBDOVECOT_SQL_DEPS], [LIBDOVECOT_SSL_DEPS], [LIBDOVECOT_COMPRESS_DEPS], [LIBDOVECOT_LDA_DEPS], [LIBDOVECOT_STORAGE_DEPS], [LIBDOVECOT_DSYNC_DEPS])
AX_SUBST_L([LIBDOVECOT_INCLUDE], [LIBDOVECOT_LDA_INCLUDE], [LIBDOVECOT_DOVEADM_INCLUDE], [LIBDOVECOT_SERVICE_INCLUDE], [LIBDOVECOT_STORAGE_INCLUDE], [LIBDOVECOT_LOGIN_INCLUDE], [LIBDOVECOT_CONFIG_INCLUDE], [LIBDOVECOT_IMAP_INCLUDE], [LIBDOVECOT_DSYNC_INCLUDE], [LIBDOVECOT_IMAPC_INCLUDE], [LIBDOVECOT_FTS_INCLUDE], [LIBDOVECOT_NOTIFY_INCLUDE])
+ AM_CONDITIONAL(DOVECOT_INSTALLED, test "$DOVECOT_INSTALLED" = "yes")
+
DC_PLUGIN_DEPS
DC_DOVECOT_TEST_WRAPPER
])
More information about the dovecot-cvs
mailing list