aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configure.ac6
-rw-r--r--modules/mailutils/mailutils.c12
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,8 +1,8 @@
# 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
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 3, or (at your option)
# any later version.
#
@@ -14,13 +14,13 @@
# You should have received a copy of the GNU General Public License
# along with Smap. If not, see <http://www.gnu.org/licenses/>.
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),
[gray+smap@gnu.org.ua])
AC_CONFIG_SRCDIR([src/smapd.c])
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_AUX_DIR([build-aux])
@@ -98,13 +98,13 @@ AC_ARG_WITH([mailutils],
AC_HELP_STRING([--with-mailutils],
[use GNU Mailutils]),
[status_mailutils=${withval}],
[status_mailutils=maybe])
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
AC_MSG_ERROR([GNU Mailutils not found])
fi
status_mailutils=no])
fi
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,8 +1,8 @@
/* 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
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3, or (at your option)
any later version.
@@ -15,14 +15,12 @@
along with Smap. If not, see <http://www.gnu.org/licenses/>. */
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
#include <mailutils/mailutils.h>
-#include <mailutils/cfg.h>
-#include <mailutils/libcfg.h>
#include <mailutils/sys/stream.h>
#include <sysexits.h>
#include <smap/stream.h>
#include <smap/diag.h>
#include <smap/module.h>
#include <smap/parseopt.h>
@@ -371,17 +369,17 @@ static const char *capa[] = {
"mailbox",
"logging",
NULL
};
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 }
};
struct cap_buf {
@@ -574,13 +572,13 @@ create_log_stream (mu_stream_t *pstream)
static void
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;
}
static int
mod_mailutils_init(int argc, char **argv)
{

Return to:

Send suggestions and report system problems to the System administrator.