dovecot-2.0: dovecot.m4: Added --with-moduledir and export dovec...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.0/rev/711b5f193f04
changeset: 12092:711b5f193f04
user:      Timo Sirainen <tss at iki.fi>
date:      Wed Sep 08 15:35:32 2010 +0100
description:
dovecot.m4: Added --with-moduledir and export dovecotdir

diffstat:

 configure.in |   7 +------
 dovecot.m4   |  13 +++++++++++--
 2 files changed, 12 insertions(+), 8 deletions(-)

diffs (47 lines):

diff -r 7fef89fea00e -r 711b5f193f04 configure.in
--- a/configure.in	Wed Sep 08 15:11:03 2010 +0100
+++ b/configure.in	Wed Sep 08 15:35:32 2010 +0100
@@ -238,12 +238,7 @@
 	mail_storages="shared maildir mbox sdbox mdbox cydir")
 AC_SUBST(mail_storages)
 
-AC_ARG_WITH(moduledir,
-[  --with-moduledir=DIR    Base directory for dynamically loadable modules],
-	moduledir="$withval",
-	moduledir=$libdir/dovecot
-)
-AC_SUBST(moduledir)
+DC_DOVECOT_MODULEDIR
 
 AC_ARG_WITH(docs,
 [  --with-docs             Install documentation (default)],
diff -r 7fef89fea00e -r 711b5f193f04 dovecot.m4
--- a/dovecot.m4	Wed Sep 08 15:11:03 2010 +0100
+++ b/dovecot.m4	Wed Sep 08 15:35:32 2010 +0100
@@ -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 3
+
+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
@@ -49,7 +58,7 @@
 
 	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])
+	AX_SUBST_L([dovecotdir], [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])