From: Aki Tuomi <aki.tuomi@open-xchange.com>
Date: Mon, 14 Jan 2019 12:37:03 +0000 (+0200)
Subject: m4: Fix moduledir behaviour
X-Git-Tag: 2.3.5~10
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=808f0731ce940002f925ea9630bef75c2600b02b;p=thirdparty%2Fdovecot%2Fcore.git

m4: Fix moduledir behaviour

This is mainly a fix for plugins that depend on dovecot.m4
---

diff --git a/configure.ac b/configure.ac
index 0272d1d1c2..2c6142410a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -264,6 +264,7 @@ if test "$systemdsystemunitdir" != ""; then
 fi
 AM_CONDITIONAL(HAVE_SYSTEMD, test "$systemdsystemunitdir" != "")
 
+dovecot_moduledir="$libdir/dovecot"
 DC_DOVECOT_MODULEDIR
 
 AC_ARG_WITH(docs,
diff --git a/m4/dovecot.m4 b/m4/dovecot.m4
index 980f6309b9..debf1b59a4 100644
--- a/m4/dovecot.m4
+++ b/m4/dovecot.m4
@@ -6,7 +6,7 @@ dnl This file is free software; the authors give
 dnl unlimited permission to copy and/or distribute it, with or without
 dnl modifications, as long as this notice is preserved.
 
-# serial 27
+# serial 29
 
 dnl
 dnl Check for support for D_FORTIFY_SOURCE=2
@@ -236,8 +236,8 @@ AC_DEFUN([AC_CC_F_STACK_PROTECTOR],[
 AC_DEFUN([DC_DOVECOT_MODULEDIR],[
 	AC_ARG_WITH(moduledir,
 	[  --with-moduledir=DIR    Base directory for dynamically loadable modules],
-		moduledir="$withval",
-		moduledir=$libdir/dovecot
+		[moduledir="$withval"],
+		[moduledir="$dovecot_moduledir"]
 	)
 	AC_SUBST(moduledir)
 ])