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

diff --git a/configure.in b/configure.in
index 959f07723087a6347610647cd481674dc5ad57ff..31a505aa9f85a2166cd3e452c66325f484e155c7 100644 (file)
--- 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 147859b3e3e24851097b4f637dd96af170fec9e8..304464ab670958c595f826e7ceee1c62865cfcb7 100644 (file)
--- 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])