summaryrefslogtreecommitdiffabout
authorSergey Poznyakoff <gray@gnu.org>2016-10-29 20:38:35 (GMT)
committer Sergey Poznyakoff <gray@gnu.org>2016-10-29 20:38:35 (GMT)
commit30da6df2e8795478914a601feebf9cc4ab2f0cfc (patch) (side-by-side diff)
tree5a1628ff0dcedece57d7884e6814a414ddbad29f
parent8c13b3fe9a3c64471f3e2d0c07a9045c67c6269b (diff)
downloadsmap-30da6df2e8795478914a601feebf9cc4ab2f0cfc.tar.gz
smap-30da6df2e8795478914a601feebf9cc4ab2f0cfc.tar.bz2
Convert to mailutils 2.99.992
Diffstat (more/less context) (ignore whitespace changes)
-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,5 +1,5 @@
# 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
@@ -17,7 +17,7 @@
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])
@@ -101,7 +101,7 @@ AC_ARG_WITH([mailutils],
[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])
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,5 +1,5 @@
/* 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
@@ -18,8 +18,6 @@
# 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>
@@ -374,11 +372,11 @@ 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 }
};
@@ -577,7 +575,7 @@ 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;
}

Return to:

Send suggestions and report system problems to the System administrator.