From d10043f6f772f2db7a2ec2b8a0f4476ec9b68050 Mon Sep 17 00:00:00 2001 From: Timo Sirainen Date: Thu, 20 Oct 2016 14:23:20 +0300 Subject: [PATCH] dovecot-config: Added dovecot_statedir --- Makefile.am | 1 + dovecot-config.in.in | 1 + dovecot.m4 | 5 +++-- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index f484aa2153..d55e52f31f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -44,6 +44,7 @@ dovecot-config: dovecot-config.in Makefile -e "s|^\(dovecot_pkglibexecdir\)=|\1=$(libexecdir)/dovecot|" \ -e "s|^\(dovecot_docdir\)=|\1=$(docdir)|" \ -e "s|^\(dovecot_moduledir\)=|\1=$(moduledir)|" \ + -e "s|^\(dovecot_statedir\)=|\1=$(statedir)|" \ ) > dovecot-config if HAVE_SYSTEMD diff --git a/dovecot-config.in.in b/dovecot-config.in.in index 539f281913..e465c8a8eb 100644 --- a/dovecot-config.in.in +++ b/dovecot-config.in.in @@ -46,3 +46,4 @@ dovecot_pkglibdir= dovecot_pkglibexecdir= dovecot_docdir= dovecot_moduledir= +dovecot_statedir= diff --git a/dovecot.m4 b/dovecot.m4 index b77a915b09..11dcef0c64 100644 --- a/dovecot.m4 +++ b/dovecot.m4 @@ -6,7 +6,7 @@ # unlimited permission to copy and/or distribute it, with or without # modifications, as long as this notice is preserved. -# serial 24 +# serial 25 AC_DEFUN([DC_DOVECOT_MODULEDIR],[ AC_ARG_WITH(moduledir, @@ -122,9 +122,10 @@ AC_DEFUN([DC_DOVECOT],[ dovecot_pkglibexecdir='$(libexecdir)/dovecot' dovecot_docdir='$(docdir)' dovecot_moduledir='$(moduledir)' + dovecot_statedir='$(statedir)' fi - AX_SUBST_L([DISTCHECK_CONFIGURE_FLAGS], [dovecotdir], [dovecot_moduledir], [dovecot_installed_moduledir], [dovecot_pkgincludedir], [dovecot_pkglibexecdir], [dovecot_pkglibdir], [dovecot_docdir]) + AX_SUBST_L([DISTCHECK_CONFIGURE_FLAGS], [dovecotdir], [dovecot_moduledir], [dovecot_installed_moduledir], [dovecot_pkgincludedir], [dovecot_pkglibexecdir], [dovecot_pkglibdir], [dovecot_docdir], [dovecot_statedir]) 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], [LIBDOVECOT_LIBFTS]) 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], [LIBDOVECOT_LIBFTS_DEPS]) -- 2.47.3