diff options
-rw-r--r-- | configure.ac | 11 | ||||
m--------- | gnulib | 0 | ||||
-rw-r--r-- | gnulib.modules | 1 | ||||
-rw-r--r-- | libmailutils/cfg/parser.y | 1 | ||||
-rw-r--r-- | po/POTFILES.in | 4 |
5 files changed, 8 insertions, 9 deletions
diff --git a/configure.ac b/configure.ac index 7bd364118..dc244dea5 100644 --- a/configure.ac +++ b/configure.ac @@ -31,7 +31,7 @@ dnl Autobuild stuff AB_INIT dnl Library versioning -AC_SUBST(VI_CURRENT, 4) +AC_SUBST(VI_CURRENT, 5) AC_SUBST(VI_REVISION, 0) AC_SUBST(VI_AGE, 0) @@ -111,15 +111,12 @@ AC_CHECK_TYPE(iconv_t,:, ]) # NOTE: Generally speaking, Mailutils libraries are not allowed to include -# gnulib headers. The only exceptions are: gettext.h, which is needed for -# proper i18n, and intprops.h, which is used in libmailutils/cfg_parser.y. -# This latter will probably be rewritten to remove the need for intprops.h. +# gnulib headers. The only exception is gettext.h, which is needed for +# proper i18n. # -# To make these two headers accessible for the libraries, they are linked -# to include/. +# To make it accessible for the libraries, it is linked to include/. # AC_CONFIG_LINKS(include/gettext.h:lib/gnu/gettext.h) -AC_CONFIG_LINKS(include/intprops.h:lib/gnu/intprops.h) AH_BOTTOM([ #define DEFAULT_TEXT_DOMAIN PACKAGE diff --git a/gnulib b/gnulib -Subproject a6aa0b6f74864a94e940b310f6200e18f7d9dcc +Subproject 2692e23a48e21f6daa029e8af9f1a143b7532f4 diff --git a/gnulib.modules b/gnulib.modules index afea68206..a55228275 100644 --- a/gnulib.modules +++ b/gnulib.modules @@ -8,7 +8,6 @@ argp crypto/des gettext gitlog-to-changelog -intprops inttostr mbchar mbiter diff --git a/libmailutils/cfg/parser.y b/libmailutils/cfg/parser.y index 68770636f..e36b513b0 100644 --- a/libmailutils/cfg/parser.y +++ b/libmailutils/cfg/parser.y @@ -25,7 +25,6 @@ #include <stdarg.h> #include <string.h> #include <netdb.h> -#include "intprops.h" #include <mailutils/argcv.h> #include <mailutils/wordsplit.h> #include <mailutils/nls.h> diff --git a/po/POTFILES.in b/po/POTFILES.in index 433c3c9e4..135171ce4 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -123,6 +123,9 @@ libmailutils/diag/debug.c libmailutils/diag/diag.c libmailutils/diag/errors +libmailutils/opt/opt.c +libmailutils/opt/help.c + libmailutils/server/acl.c libmailutils/stream/file_stream.c @@ -147,6 +150,7 @@ libmailutils/base/version.c libmailutils/base/tempfile.c libmailutils/string/trueans.c +libmailutils/string/str_to_c.c libmailutils/stdstream/basestr.c libmailutils/stdstream/strerr.c |