Skip to content

John McEleney / mailutils

Go to a project
Toggle navigation
Toggle navigation pinning
Commit 6e814733 6e8147334cf9ffe36367760c06002a1e5b7ae0d5 by Sergey Poznyakoff
Options

Raise shared library version number 

* configure.ac (VI_CURRENT): Set to 5
Don't link intprops.h
* gnulib: Upgrade.
* gnulib.modules (intprops) Remove.
* libmailutils/cfg/parser.y: Don't incluse intprops.h
* po/POTFILES.in: Add new files.
1 parent 045898ff
Inline Side-by-side
Showing 5 changed files with 9 additions and 10 deletions
...@@ -31,7 +31,7 @@ dnl Autobuild stuff ...@@ -31,7 +31,7 @@ dnl Autobuild stuff
31 AB_INIT 31 AB_INIT
32 32
33 dnl Library versioning 33 dnl Library versioning
34 AC_SUBST(VI_CURRENT, 4) 34 AC_SUBST(VI_CURRENT, 5)
35 AC_SUBST(VI_REVISION, 0) 35 AC_SUBST(VI_REVISION, 0)
36 AC_SUBST(VI_AGE, 0) 36 AC_SUBST(VI_AGE, 0)
37 37
...@@ -111,15 +111,12 @@ AC_CHECK_TYPE(iconv_t,:, ...@@ -111,15 +111,12 @@ AC_CHECK_TYPE(iconv_t,:,
111 ]) 111 ])
112 112
113 # NOTE: Generally speaking, Mailutils libraries are not allowed to include 113 # NOTE: Generally speaking, Mailutils libraries are not allowed to include
114 # gnulib headers. The only exceptions are: gettext.h, which is needed for 114 # gnulib headers. The only exception is gettext.h, which is needed for
115 # proper i18n, and intprops.h, which is used in libmailutils/cfg_parser.y. 115 # proper i18n.
116 # This latter will probably be rewritten to remove the need for intprops.h.
117 # 116 #
118 # To make these two headers accessible for the libraries, they are linked 117 # To make it accessible for the libraries, it is linked to include/.
119 # to include/.
120 # 118 #
121 AC_CONFIG_LINKS(include/gettext.h:lib/gnu/gettext.h) 119 AC_CONFIG_LINKS(include/gettext.h:lib/gnu/gettext.h)
122 AC_CONFIG_LINKS(include/intprops.h:lib/gnu/intprops.h)
123 120
124 AH_BOTTOM([ 121 AH_BOTTOM([
125 #define DEFAULT_TEXT_DOMAIN PACKAGE 122 #define DEFAULT_TEXT_DOMAIN PACKAGE
......
gnulib @ 2692e23a
1 Subproject commit a6aa0b6f74864a94e940b310f6200e18f7d9dcc9 1 Subproject commit 2692e23a48e21f6daa029e8af9f1a143b7532f47
......
...@@ -8,7 +8,6 @@ argp ...@@ -8,7 +8,6 @@ argp
8 crypto/des 8 crypto/des
9 gettext 9 gettext
10 gitlog-to-changelog 10 gitlog-to-changelog
11 intprops
12 inttostr 11 inttostr
13 mbchar 12 mbchar
14 mbiter 13 mbiter
......
...@@ -25,7 +25,6 @@ ...@@ -25,7 +25,6 @@
25 #include <stdarg.h> 25 #include <stdarg.h>
26 #include <string.h> 26 #include <string.h>
27 #include <netdb.h> 27 #include <netdb.h>
28 #include "intprops.h"
29 #include <mailutils/argcv.h> 28 #include <mailutils/argcv.h>
30 #include <mailutils/wordsplit.h> 29 #include <mailutils/wordsplit.h>
31 #include <mailutils/nls.h> 30 #include <mailutils/nls.h>
......
...@@ -123,6 +123,9 @@ libmailutils/diag/debug.c ...@@ -123,6 +123,9 @@ libmailutils/diag/debug.c
123 libmailutils/diag/diag.c 123 libmailutils/diag/diag.c
124 libmailutils/diag/errors 124 libmailutils/diag/errors
125 125
126 libmailutils/opt/opt.c
127 libmailutils/opt/help.c
128
126 libmailutils/server/acl.c 129 libmailutils/server/acl.c
127 130
128 libmailutils/stream/file_stream.c 131 libmailutils/stream/file_stream.c
...@@ -147,6 +150,7 @@ libmailutils/base/version.c ...@@ -147,6 +150,7 @@ libmailutils/base/version.c
147 libmailutils/base/tempfile.c 150 libmailutils/base/tempfile.c
148 151
149 libmailutils/string/trueans.c 152 libmailutils/string/trueans.c
153 libmailutils/string/str_to_c.c
150 154
151 libmailutils/stdstream/basestr.c 155 libmailutils/stdstream/basestr.c
152 libmailutils/stdstream/strerr.c 156 libmailutils/stdstream/strerr.c
......