From 6102133ebbf68bcb85aa0b108da7317b007468ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim Rühsen?= <address@hidden>
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 <address@hidden>
---
 bootstrap.conf |  1 +
 src/wget.h     | 10 +---------
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/bootstrap.conf b/bootstrap.conf
index 40d9e67..4fff711 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 0b2381d..3a186fc 100644
--- a/src/wget.h
+++ b/src/wget.h
@@ -58,16 +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 <libintl.h>
+#include "gettext.h"
 # define _(STRING) gettext(STRING)
-#else
-# ifdef solaris
-#  include <libintl.h>
-# endif
-# define _(STRING) STRING
-# define ngettext(STRING1,STRING2,N) STRING2
-#endif

 /* A pseudo function call that serves as a marker for the automated
    extraction of messages, but does not call gettext().  The run-time
--
2.1.4