Update GNU make to use Autoconf 2.53, Automake 1.6.1, Gettext 0.11.1.

We're using Gettext's "external" feature to avoid including the intl
code in the GNU make distribution.

1 files changed, 9 insertions, 23 deletions

diff --git a/make.h b/make.h
index 6ce11d1..2b82149 100644
--- a/make.h
+++ b/make.h
@@ -44,31 +44,13 @@ Boston, MA 02111-1307, USA.  */
 
 #define _GNU_SOURCE 1
 
-/* Include libintl.h, if it was found: we don't even look for it unless we
-   want to use the system's gettext().  If not, use the included gettext.h.  */
+/* Always use gettext.h  */
 
-#ifdef HAVE_LIBINTL_H
-# include <libintl.h>
-# ifdef HAVE_LOCALE_H
-#  include <locale.h>
-# endif
-#else
-# include "gettext.h"
-#endif
-
-#ifndef gettext_noop
-/* For automatic extraction of messages sometimes no real translation is
-   needed.  Instead the string itself is the result.  */
-# define gettext_noop(Str) (Str)
-#endif
+#include "gettext.h"
 
-#define _(Text)     gettext (Text)
-#define N_(Text)    gettext_noop (Text)
-
-
-#if !HAVE_SETLOCALE
-# define setlocale(Category, Locale) /* empty */
-#endif
+#define _(_s)           gettext (_s)
+#define S_(_1,_2,_n)    ngettext (_1,_2,_n)
+#define N_(_s)          gettext_noop (_s)
 
 
 #ifdef  CRAY
@@ -308,6 +290,10 @@ extern char *alloca ();
 #endif
 #define FILE_TIMESTAMP uintmax_t
 
+#if !defined(HAVE_STRSIGNAL)
+extern char *strsignal PARAMS ((int signum));
+#endif
+
 /* ISDIGIT offers the following features:
    - Its arg may be any int or unsigned int; it need not be an unsigned char.
    - It's guaranteed to evaluate its argument exactly once.