dovecot-2.1-pigeonhole: Updated dovecot.m4.

[pigeonhole at rename-it.nl]

details:   http://hg.rename-it.nl/dovecot-2.1-pigeonhole/rev/a88c63b2d0b0
changeset: 1610:a88c63b2d0b0
user:      Stephan Bosch <stephan at rename-it.nl>
date:      Mon Mar 26 21:07:14 2012 +0200
description:
Updated dovecot.m4.

diffstat:

 m4/dovecot.m4 |  22 +++++++++++-----------
 1 files changed, 11 insertions(+), 11 deletions(-)

diffs (53 lines):

diff -r 916f09fc6a5e -r a88c63b2d0b0 m4/dovecot.m4
--- a/m4/dovecot.m4	Mon Mar 19 22:33:12 2012 +0100
+++ b/m4/dovecot.m4	Mon Mar 26 21:07:14 2012 +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 4
+# serial 5
 
 AC_DEFUN([DC_DOVECOT_MODULEDIR],[
 	AC_ARG_WITH(moduledir,
@@ -48,13 +48,13 @@
 
 	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)
+		[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
@@ -72,7 +72,7 @@
 	cd $old
 	DISTCHECK_CONFIGURE_FLAGS="--with-dovecot=$abs_dovecotdir --without-dovecot-install-dirs"
 
-	eval `grep -i '^dovecot_[[a-z]]*=' "$dovecotdir"/dovecot-config`
+	eval `grep -i '^dovecot_[[a-z_]]*=' "$dovecotdir"/dovecot-config`
 	eval `grep '^LIBDOVECOT[[A-Z_]]*=' "$dovecotdir"/dovecot-config`
 
 	if test "$use_install_dirs" = "no"; then
@@ -83,8 +83,8 @@
 		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([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_LDA], [LIBDOVECOT_STORAGE])
 	AX_SUBST_L([LIBDOVECOT_DEPS], [LIBDOVECOT_LOGIN_DEPS], [LIBDOVECOT_SQL_DEPS], [LIBDOVECOT_LDA_DEPS], [LIBDOVECOT_STORAGE_DEPS])
 	AX_SUBST_L([LIBDOVECOT_INCLUDE], [LIBDOVECOT_LDA_INCLUDE], [LIBDOVECOT_SERVICE_INCLUDE], [LIBDOVECOT_STORAGE_INCLUDE], [LIBDOVECOT_LOGIN_INCLUDE], [LIBDOVECOT_CONFIG_INCLUDE])