merge with 0.10.17

8 files changed, 67 insertions, 11 deletions

diff --git a/intl/ChangeLog b/intl/ChangeLog
index 6b9e9f5..1aa2a96 100644
--- a/intl/ChangeLog
+++ b/intl/ChangeLog
@@ -1,5 +1,39 @@
+Tue Jun 11 17:05:13 1996  Ulrich Drepper  <drepper@cygnus.com>
+
+	* l10nflist.c, localealias.c, dcgettext.c: Define _GNU_SOURCE to
+        get prototype for stpcpy and strcasecmp.
+
+	* intlh.inst.in, libgettext.h: Move declaration of
+	`_nl_msg_cat_cntr' outside __extension__ block to prevent warning
+	from gcc's -Wnested-extern option.
+
+Fri Jun  7 01:58:00 1996  Ulrich Drepper  <drepper@cygnus.com>
+
+	* Makefile.in (install): Remove comment.
+
+Thu Jun  6 17:28:17 1996  Ulrich Drepper  <drepper@cygnus.com>
+
+	* Makefile.in (install): Work around for another Buglix stupidity.
+	Always use an `else' close for `if's.  Reported by Nelson Beebe.
+
+	* Makefile.in (intlh.inst): Correct typo in phony rule.
+	Reported by Nelson Beebe.
+
 Thu Jun  6 01:49:52 1996  Ulrich Drepper  <drepper@cygnus.com>
 
+	* dcgettext.c (read_alias_file): Rename variable alloca_list to
+	block_list as the macro calls assume.
+	Patch by Eric Backus.
+
+	* localealias.c [!HAVE_ALLOCA]: Define alloca as macro using
+        malloc.
+	(read_alias_file): Rename varriabe alloca_list to block_list as the
+	macro calls assume.
+	Patch by Eric Backus.
+
+	* l10nflist.c: Correct conditional for <argz.h> inclusion.
+	Reported by Roland McGrath.
+
 	* Makefile.in (all): Depend on all-@USE_INCLUDED_LIBINTL@, not
         all-@USE_NLS@.
 
diff --git a/intl/Makefile.in b/intl/Makefile.in
index 0c4d40d..761ae62 100644
--- a/intl/Makefile.in
+++ b/intl/Makefile.in
@@ -109,6 +109,8 @@ install: all
 	  for file in $(DISTFILES.common); do \
 	    $(INSTALL_DATA) $$file $(gettextsrcdir)/$$file; \
 	  done; \
+	else \
+	  : ; \
 	fi
 
 # Define this as empty until I found a useful application.
@@ -178,7 +180,7 @@ Makefile: Makefile.in ../config.status
 @GT_YES@	&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= \
 @GT_YES@	  $(SHELL) ./config.status
 @GT_NO@.PHONY: intlh.inst
-@GT_NO@inthl.inst:
+@GT_NO@intlh.inst:
 
 # Tell versions [3.59,3.63) of GNU make not to export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/intl/VERSION b/intl/VERSION
index 2e966b5..20dd2ca 100644
--- a/intl/VERSION
+++ b/intl/VERSION
@@ -1 +1 @@
-GNU gettext library from gettext-0.10.16
+GNU gettext library from gettext-0.10.17
diff --git a/intl/dcgettext.c b/intl/dcgettext.c
index c3adee3..9ce1b3a 100644
--- a/intl/dcgettext.c
+++ b/intl/dcgettext.c
@@ -55,6 +55,9 @@ void free ();
 #endif
 
 #if defined HAVE_STRING_H || defined _LIBC
+# ifndef _GNU_SOURCE
+#  define _GNU_SOURCE	1
+# endif
 # include <string.h>
 #else
 # include <strings.h>
@@ -217,7 +220,7 @@ DCGETTEXT (domainname, msgid, category)
      int category;
 {
 #ifndef HAVE_ALLOCA
-  struct block_list *alloca_list = NULL;
+  struct block_list *block_list = NULL;
 #endif
   struct loaded_l10nfile *domain;
   struct binding *binding;
diff --git a/intl/explodename.c b/intl/explodename.c
index 2fd8be0..a51556e 100644
--- a/intl/explodename.c
+++ b/intl/explodename.c
@@ -17,6 +17,10 @@ License along with the GNU C Library; see the file COPYING.LIB.  If
 not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
 #include <stdlib.h>
 #include <string.h>
 
@@ -38,7 +42,7 @@ _nl_explode_name (name, language, modifier, territory, codeset,
   enum { undecided, xpg, cen } syntax;
   char *cp;
   int mask;
-  
+
   *modifier = NULL;
   *territory = NULL;
   *codeset = NULL;
diff --git a/intl/l10nflist.c b/intl/l10nflist.c
index 4f955a9..dc763cc 100644
--- a/intl/l10nflist.c
+++ b/intl/l10nflist.c
@@ -21,7 +21,8 @@ Boston, MA 02111-1307, USA.  */
 # include <config.h>
 #endif
 
-#if defined _LIBC && (defined __ARGZ_COUNT || defined __ARGZ_STRINGIFY)
+#if defined _LIBC || \
+    defined __ARGZ_COUNT || defined __ARGZ_STRINGIFY || defined __ARGZ_NEXT
 # include <argz.h>
 #endif
 #include <ctype.h>
@@ -31,6 +32,9 @@ Boston, MA 02111-1307, USA.  */
 #endif
 
 #if defined HAVE_STRING_H || defined _LIBC
+# ifndef _GNU_SOURCE
+#  define _GNU_SOURCE	1
+# endif
 # include <string.h>
 #else
 # include <strings.h>
diff --git a/intl/libgettext.h b/intl/libgettext.h
index 528b0f2..05463ec 100644
--- a/intl/libgettext.h
+++ b/intl/libgettext.h
@@ -1,5 +1,5 @@
 /* libgettext.h -- Message catalogs for internationalization.
-   Copyright (C) 1995 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1996 Free Software Foundation, Inc.
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -128,20 +128,24 @@ extern char *bindtextdomain__ PARAMS ((const char *__domainname,
    has dcgettext.  */
 # if !HAVE_CATGETS && (!HAVE_GETTEXT || HAVE_DCGETTEXT)
 
-#  define gettext(Msgid) \
+#  define gettext(Msgid)						      \
      dgettext (NULL, Msgid)
 
-#  define dgettext(Domainname, Msgid) \
+#  define dgettext(Domainname, Msgid)					      \
      dcgettext (Domainname, Msgid, LC_MESSAGES)
 
 #  if defined __GNUC__ && __GNUC__ == 2 && __GNUC_MINOR__ >= 7
-#   define dcgettext(Domainname, Msgid, Category) \
+/* This global variable is defined in loadmsgcat.c.  We need a sign,
+   whether a new catalog was loaded, which can be associated with all
+   translations.  */
+extern int _nl_msg_cat_cntr;
+
+#   define dcgettext(Domainname, Msgid, Category)			      \
   (__extension__							      \
    ({									      \
      char *result;							      \
      if (__builtin_constant_p (Msgid))					      \
        {								      \
-	 extern int _nl_msg_cat_cntr;					      \
 	 static char *__translation__;					      \
 	 static int __catalog_counter__;				      \
 	 if (! __translation__ || __catalog_counter__ != _nl_msg_cat_cntr)    \
diff --git a/intl/localealias.c b/intl/localealias.c
index fb5c26c..7aee6a8 100644
--- a/intl/localealias.c
+++ b/intl/localealias.c
@@ -52,6 +52,9 @@ void free ();
 #endif
 
 #if defined HAVE_STRING_H || defined _LIBC
+# ifndef _GNU_SOURCE
+#  define _GNU_SOURCE	1
+# endif
 # include <string.h>
 #else
 # include <strings.h>
@@ -106,6 +109,8 @@ struct block_list
       free (old);							      \
     }									      \
   } while (0)
+# undef alloca
+# define alloca(size) (malloc (size))
 #endif	/* have alloca */
 
 
@@ -184,7 +189,7 @@ read_alias_file (fname, fname_len)
      int fname_len;
 {
 #ifndef HAVE_ALLOCA
-  struct block_list *alloca_list = NULL;
+  struct block_list *block_list = NULL;
 #endif
   FILE *fp;
   char *full_fname;