From 3d8e765c1da15164c6d1be158bc70d5a75e52a39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20R=C3=BChsen?= Date: Mon, 9 Feb 2015 10:08:19 +0100 Subject: [PATCH] gettext: Use gnulib's gettext.h for compatibility Fixes issues with gettext on Solaris Reported-by: Kiyoshi KANAZAWA --- bootstrap.conf | 1 + src/wget.h | 9 ++------- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/bootstrap.conf b/bootstrap.conf index 40d9e670..4fff711f 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -47,6 +47,7 @@ getopt-gnu getpass-gnu getpeername getsockname +gettext gitlog-to-changelog git-version-gen gnupload diff --git a/src/wget.h b/src/wget.h index cddacdc8..cdc4c4b6 100644 --- a/src/wget.h +++ b/src/wget.h @@ -58,13 +58,8 @@ as that of the covered work. */ /* `gettext (FOO)' is long to write, so we use `_(FOO)'. If NLS is unavailable, _(STRING) simply returns STRING. */ -#if ENABLE_NLS -# include -# define _(STRING) gettext(STRING) -#else -# define _(STRING) STRING -# define ngettext(STRING1,STRING2,N) STRING2 -#endif +#include "gettext.h" +#define _(STRING) gettext(STRING) /* A pseudo function call that serves as a marker for the automated extraction of messages, but does not call gettext(). The run-time