2 files changed, 8 insertions, 10 deletions

diff --git a/configure.ac b/configure.ac
index 73b2d8f..8bec28d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
 # This file is part of Smap.  -*- autoconf -*-
-# Copyright (C) 2010, 2014, 2015 Sergey Poznyakoff
+# Copyright (C) 2010, 2014-2016 Sergey Poznyakoff
 #
 # Smap is free software; you can redistribute it and/or modify
@@ -18,5 +18,5 @@ AC_PREREQ(2.63)
 m4_define([SMAP_VERSION_MAJOR], 2)
 m4_define([SMAP_VERSION_MINOR], 0)
-dnl m4_define([SMAP_VERSION_PATCH], 90)
+m4_define([SMAP_VERSION_PATCH], 90)
 AC_INIT([smap],
         SMAP_VERSION_MAJOR.SMAP_VERSION_MINOR[]m4_ifdef([SMAP_VERSION_PATCH],.SMAP_VERSION_PATCH),
@@ -102,5 +102,5 @@ AC_ARG_WITH([mailutils],
 
 if test $status_mailutils != no; then
-  AM_GNU_MAILUTILS(2.99.98, [all cfg auth],
+  AM_GNU_MAILUTILS(2.99.992, [all],
                    [status_mailutils=yes],
                    [if test $status_mailutils = yes; then
diff --git a/modules/mailutils/mailutils.c b/modules/mailutils/mailutils.c
index fff7429..26d04d6 100644
--- a/modules/mailutils/mailutils.c
+++ b/modules/mailutils/mailutils.c
@@ -1,4 +1,4 @@
 /* This file is part of Smap.
-   Copyright (C) 2006-2010, 2014 Sergey Poznyakoff
+   Copyright (C) 2006-2010, 2014, 2016 Sergey Poznyakoff
 
    Smap is free software; you can redistribute it and/or modify
@@ -19,6 +19,4 @@
 #endif
 #include <mailutils/mailutils.h>
-#include <mailutils/cfg.h>
-#include <mailutils/libcfg.h>
 #include <mailutils/sys/stream.h>
 #include <sysexits.h>
@@ -375,9 +373,9 @@ static const char *capa[] = {
 
 static struct mu_cfg_param cfg_param[] = {
-        { "positive-reply", mu_cfg_string, &dfl_positive_reply, 0, NULL,
+        { "positive-reply", mu_c_string, &dfl_positive_reply, 0, NULL,
           "set default positive reply text" },
-        { "negative-reply", mu_cfg_string, &dfl_negative_reply, 0, NULL,
+        { "negative-reply", mu_c_string, &dfl_negative_reply, 0, NULL,
           "set default negative reply text" },
-        { "onerror-reply", mu_cfg_string, &dfl_onerror_reply, 0, NULL,
+        { "onerror-reply", mu_c_string, &dfl_onerror_reply, 0, NULL,
           "set default error reply text" },
         { NULL }
@@ -578,5 +576,5 @@ init_hints(struct mu_cfg_parse_hints *hints)
         hints->flags |= MU_PARSE_CONFIG_PLAIN | 
                         MU_CFG_PARSE_SITE_RCFILE | MU_CFG_PARSE_PROGRAM;
-        hints->site_rcfile = mu_site_rcfile;
+        hints->site_rcfile = mu_site_config_file();
         hints->program = (char*) mu_program_name;
 }