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 0272d1d1c207243816199280979f826449d2c558..2c6142410a763e21f3f044aa15913a957d6b6008 100644 (file)
--- 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 980f6309b9bdf67bc35ab912a6eb377b3dcf6312..debf1b59a4f1e279c97745fadf2e16c1c43b1712 100644 (file)
--- 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)
 ])