diff options
author | Sergey Poznyakoff <gray@gnu.org> | 2016-10-29 23:38:35 +0300 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org> | 2016-10-29 23:38:35 +0300 |
commit | 30da6df2e8795478914a601feebf9cc4ab2f0cfc (patch) | |
tree | 5a1628ff0dcedece57d7884e6814a414ddbad29f | |
parent | 8c13b3fe9a3c64471f3e2d0c07a9045c67c6269b (diff) | |
download | smap-30da6df2e8795478914a601feebf9cc4ab2f0cfc.tar.gz smap-30da6df2e8795478914a601feebf9cc4ab2f0cfc.tar.bz2 |
Convert to mailutils 2.99.992
-rw-r--r-- | configure.ac | 6 | ||||
-rw-r--r-- | modules/mailutils/mailutils.c | 12 |
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 @@ | |||
1 | # This file is part of Smap. -*- autoconf -*- | 1 | # This file is part of Smap. -*- autoconf -*- |
2 | # Copyright (C) 2010, 2014, 2015 Sergey Poznyakoff | 2 | # Copyright (C) 2010, 2014-2016 Sergey Poznyakoff |
3 | # | 3 | # |
4 | # Smap is free software; you can redistribute it and/or modify | 4 | # Smap is free software; you can redistribute it and/or modify |
@@ -18,5 +18,5 @@ AC_PREREQ(2.63) | |||
18 | m4_define([SMAP_VERSION_MAJOR], 2) | 18 | m4_define([SMAP_VERSION_MAJOR], 2) |
19 | m4_define([SMAP_VERSION_MINOR], 0) | 19 | m4_define([SMAP_VERSION_MINOR], 0) |
20 | dnl m4_define([SMAP_VERSION_PATCH], 90) | 20 | m4_define([SMAP_VERSION_PATCH], 90) |
21 | AC_INIT([smap], | 21 | AC_INIT([smap], |
22 | SMAP_VERSION_MAJOR.SMAP_VERSION_MINOR[]m4_ifdef([SMAP_VERSION_PATCH],.SMAP_VERSION_PATCH), | 22 | SMAP_VERSION_MAJOR.SMAP_VERSION_MINOR[]m4_ifdef([SMAP_VERSION_PATCH],.SMAP_VERSION_PATCH), |
@@ -102,5 +102,5 @@ AC_ARG_WITH([mailutils], | |||
102 | 102 | ||
103 | if test $status_mailutils != no; then | 103 | if test $status_mailutils != no; then |
104 | AM_GNU_MAILUTILS(2.99.98, [all cfg auth], | 104 | AM_GNU_MAILUTILS(2.99.992, [all], |
105 | [status_mailutils=yes], | 105 | [status_mailutils=yes], |
106 | [if test $status_mailutils = yes; then | 106 | [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 @@ | |||
1 | /* This file is part of Smap. | 1 | /* This file is part of Smap. |
2 | Copyright (C) 2006-2010, 2014 Sergey Poznyakoff | 2 | Copyright (C) 2006-2010, 2014, 2016 Sergey Poznyakoff |
3 | 3 | ||
4 | Smap is free software; you can redistribute it and/or modify | 4 | Smap is free software; you can redistribute it and/or modify |
@@ -19,6 +19,4 @@ | |||
19 | #endif | 19 | #endif |
20 | #include <mailutils/mailutils.h> | 20 | #include <mailutils/mailutils.h> |
21 | #include <mailutils/cfg.h> | ||
22 | #include <mailutils/libcfg.h> | ||
23 | #include <mailutils/sys/stream.h> | 21 | #include <mailutils/sys/stream.h> |
24 | #include <sysexits.h> | 22 | #include <sysexits.h> |
@@ -375,9 +373,9 @@ static const char *capa[] = { | |||
375 | 373 | ||
376 | static struct mu_cfg_param cfg_param[] = { | 374 | static struct mu_cfg_param cfg_param[] = { |
377 | { "positive-reply", mu_cfg_string, &dfl_positive_reply, 0, NULL, | 375 | { "positive-reply", mu_c_string, &dfl_positive_reply, 0, NULL, |
378 | "set default positive reply text" }, | 376 | "set default positive reply text" }, |
379 | { "negative-reply", mu_cfg_string, &dfl_negative_reply, 0, NULL, | 377 | { "negative-reply", mu_c_string, &dfl_negative_reply, 0, NULL, |
380 | "set default negative reply text" }, | 378 | "set default negative reply text" }, |
381 | { "onerror-reply", mu_cfg_string, &dfl_onerror_reply, 0, NULL, | 379 | { "onerror-reply", mu_c_string, &dfl_onerror_reply, 0, NULL, |
382 | "set default error reply text" }, | 380 | "set default error reply text" }, |
383 | { NULL } | 381 | { NULL } |
@@ -578,5 +576,5 @@ init_hints(struct mu_cfg_parse_hints *hints) | |||
578 | hints->flags |= MU_PARSE_CONFIG_PLAIN | | 576 | hints->flags |= MU_PARSE_CONFIG_PLAIN | |
579 | MU_CFG_PARSE_SITE_RCFILE | MU_CFG_PARSE_PROGRAM; | 577 | MU_CFG_PARSE_SITE_RCFILE | MU_CFG_PARSE_PROGRAM; |
580 | hints->site_rcfile = mu_site_rcfile; | 578 | hints->site_rcfile = mu_site_config_file(); |
581 | hints->program = (char*) mu_program_name; | 579 | hints->program = (char*) mu_program_name; |
582 | } | 580 | } |