From: Timo Sirainen <tss@iki.fi>
Date: Wed, 8 Sep 2010 14:35:32 +0000 (+0100)
Subject: dovecot.m4: Added --with-moduledir and export dovecotdir
X-Git-Tag: 2.0.2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1d23a49264a258ad8c418a70dca84d6507ae60d8;p=thirdparty%2Fdovecot%2Fcore.git

dovecot.m4: Added --with-moduledir and export dovecotdir
---

diff --git a/configure.in b/configure.in
index 959f077230..31a505aa9f 100644
--- a/configure.in
+++ b/configure.in
@@ -238,12 +238,7 @@ AC_ARG_WITH(storages,
 	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 --git a/dovecot.m4 b/dovecot.m4
index 147859b3e3..304464ab67 100644
--- a/dovecot.m4
+++ b/dovecot.m4
@@ -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 @@ AC_DEFUN([DC_DOVECOT],[
 
 	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])