Mercurial > dovecot > core-2.2
changeset 12092:711b5f193f04
dovecot.m4: Added --with-moduledir and export dovecotdir
author | Timo Sirainen <tss@iki.fi> |
---|---|
date | Wed, 08 Sep 2010 15:35:32 +0100 |
parents | 7fef89fea00e |
children | d377c610b19d |
files | configure.in dovecot.m4 |
diffstat | 2 files changed, 12 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- 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)],
--- 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])