dovecot-2.2: dovecot.m4: Updates from Pigeonhole
dovecot at dovecot.org
dovecot at dovecot.org
Sat Jul 28 18:03:35 EEST 2012
details: http://hg.dovecot.org/dovecot-2.2/rev/73ce16df6b16
changeset: 14730:73ce16df6b16
user: Timo Sirainen <tss at iki.fi>
date: Sat Jul 28 18:03:25 2012 +0300
description:
dovecot.m4: Updates from Pigeonhole
diffstat:
dovecot.m4 | 29 +++++++++++++++++++++++++++--
1 files changed, 27 insertions(+), 2 deletions(-)
diffs (55 lines):
diff -r 0de6b238d6eb -r 73ce16df6b16 dovecot.m4
--- a/dovecot.m4 Sat Jul 28 17:55:46 2012 +0300
+++ b/dovecot.m4 Sat Jul 28 18:03:25 2012 +0300
@@ -6,7 +6,7 @@
# unlimited permission to copy and/or distribute it, with or without
# modifications, as long as this notice is preserved.
-# serial 4
+# serial 6
AC_DEFUN([DC_DOVECOT_MODULEDIR],[
AC_ARG_WITH(moduledir,
@@ -46,6 +46,16 @@
]
)
+ AC_ARG_WITH(dovecot-install-dirs,
+ [AC_HELP_STRING([--with-dovecot-install-dirs],
+ [Use install directories configured for Dovecot (default)])],
+ if test x$withval = xno; then
+ use_install_dirs=no
+ else
+ use_install_dirs=yes
+ fi,
+ use_install_dirs=yes)
+
AC_MSG_CHECKING([for dovecot-config in "$dovecotdir"])
if test -f "$dovecotdir/dovecot-config"; then
AC_MSG_RESULT([$dovecotdir/dovecot-config])
@@ -56,9 +66,24 @@
AC_MSG_ERROR([dovecot-config not found])
fi
+ old=`pwd`
+ cd $dovecotdir
+ abs_dovecotdir=`pwd`
+ cd $old
+ DISTCHECK_CONFIGURE_FLAGS="--with-dovecot=$abs_dovecotdir --without-dovecot-install-dirs"
+
eval `grep -i '^dovecot_[[a-z_]]*=' "$dovecotdir"/dovecot-config`
eval `grep '^LIBDOVECOT[[A-Z_]]*=' "$dovecotdir"/dovecot-config`
- AX_SUBST_L([dovecotdir], [dovecot_moduledir], [dovecot_pkgincludedir], [dovecot_pkglibexecdir], [dovecot_pkglibdir], [dovecot_docdir])
+
+ if test "$use_install_dirs" = "no"; then
+ dovecot_pkgincludedir='$(pkgincludedir)'
+ dovecot_pkglibdir='$(pkglibdir)'
+ dovecot_pkglibexecdir='$(libexecdir)/dovecot'
+ dovecot_docdir='$(docdir)'
+ 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])
AX_SUBST_L([LIBDOVECOT], [LIBDOVECOT_LOGIN], [LIBDOVECOT_SQL], [LIBDOVECOT_SSL], [LIBDOVECOT_LDA], [LIBDOVECOT_STORAGE])
AX_SUBST_L([LIBDOVECOT_DEPS], [LIBDOVECOT_LOGIN_DEPS], [LIBDOVECOT_SQL_DEPS], [LIBDOVECOT_SSL_DEPS], [LIBDOVECOT_LDA_DEPS], [LIBDOVECOT_STORAGE_DEPS])
More information about the dovecot-cvs
mailing list