dovecot-2.0-pigeonhole: Fixed make distcheck to work.
pigeonhole at rename-it.nl
pigeonhole at rename-it.nl
Fri Sep 10 01:16:32 EEST 2010
details: http://hg.rename-it.nl/dovecot-2.0-pigeonhole/rev/a3caf6bb2b4f
changeset: 1421:a3caf6bb2b4f
user: Stephan Bosch <stephan at rename-it.nl>
date: Fri Sep 10 00:16:10 2010 +0200
description:
Fixed make distcheck to work.
diffstat:
configure.in | 1 +
m4/dovecot.m4 | 38 ++++++++++++++++++++++++++++++++++++--
2 files changed, 37 insertions(+), 2 deletions(-)
diffs (75 lines):
diff -r e4ed076aead7 -r a3caf6bb2b4f configure.in
--- a/configure.in Thu Sep 09 23:59:56 2010 +0200
+++ b/configure.in Fri Sep 10 00:16:10 2010 +0200
@@ -26,6 +26,7 @@
#
DC_DOVECOT
+DC_DOVECOT_MODULEDIR
LIBDOVECOT_INCLUDE="$LIBDOVECOT_INCLUDE $LIBDOVECOT_STORAGE_INCLUDE"
CFLAGS="$DOVECOT_CFLAGS"
LIBS="$DOVECOT_LIBS"
diff -r e4ed076aead7 -r a3caf6bb2b4f m4/dovecot.m4
--- a/m4/dovecot.m4 Thu Sep 09 23:59:56 2010 +0200
+++ b/m4/dovecot.m4 Fri Sep 10 00:16:10 2010 +0200
@@ -6,7 +6,16 @@
# unlimited permission to copy and/or distribute it, with or without
# modifications, as long as this notice is preserved.
-# serial 2
+# serial 4
+
+AC_DEFUN([DC_DOVECOT_MODULEDIR],[
+ AC_ARG_WITH(moduledir,
+ [ --with-moduledir=DIR Base directory for dynamically loadable modules],
+ moduledir="$withval",
+ moduledir=$libdir/dovecot
+ )
+ AC_SUBST(moduledir)
+])
AC_DEFUN([DC_PLUGIN_DEPS],[
_plugin_deps=yes
@@ -37,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])
@@ -47,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([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], [dovecot_moduledir], [dovecot_pkgincludedir], [dovecot_pkglibexecdir], [dovecot_pkglibdir], [dovecot_docdir])
AX_SUBST_L([DOVECOT_CFLAGS], [DOVECOT_LIBS], [DOVECOT_SSL_LIBS])
AX_SUBST_L([LIBDOVECOT], [LIBDOVECOT_LOGIN], [LIBDOVECOT_SQL], [LIBDOVECOT_LDA], [LIBDOVECOT_STORAGE])
AX_SUBST_L([LIBDOVECOT_DEPS], [LIBDOVECOT_LOGIN_DEPS], [LIBDOVECOT_SQL_DEPS], [LIBDOVECOT_LDA_DEPS], [LIBDOVECOT_STORAGE_DEPS])
More information about the dovecot-cvs
mailing list