sync gettext .m4 files from gettext

12 files changed, 75 insertions, 25 deletions

diff --git a/ChangeLog b/ChangeLog
index bca02d7196..be92f08a4d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2015-04-07  Karl Berry  <karl@gnu.org>
+
+	* config/srclistvars.sh (GETTEXT): new definition.
+	* config/srclist.txt: use it for gettext .m4 files.
+	Thread starting at http://lists.gnu.org/archive/html/bug-gnulib/201
+	and confirmed at http://lists.gnu.org/archive/html/bug-gnulib/2015-02/msg00146.html
+	and continuing into April.
+
 2015-04-07  Daiki Ueno  <ueno@gnu.org>
 
 	uniname/uniname-tests: fix failure due to alias
diff --git a/config/srclist.txt b/config/srclist.txt
index e5621cd351..ea4630764e 100644
--- a/config/srclist.txt
+++ b/config/srclist.txt
@@ -3,38 +3,38 @@
 
 $GNUCONFIG/config.guess		build-aux
 $GNUCONFIG/config.sub		build-aux
-#
+
 $AUTOMAKE/lib/ar-lib		build-aux
 $AUTOMAKE/lib/compile		build-aux
 $AUTOMAKE/lib/depcomp		build-aux
 $AUTOMAKE/lib/install-sh	build-aux
 $AUTOMAKE/lib/mdate-sh		build-aux
 $AUTOMAKE/lib/mkinstalldirs	build-aux
-#
+
 $TEXINFOSRC/doc/texinfo.tex		build-aux
-#
+
 # we generate INSTALL from this via a rule in doc/Makefile.
 $AUTOCONF/doc/install.texi	doc
-#
+
 $GNUSTANDARDS/maintain.texi	doc
 $GNUSTANDARDS/standards.texi	doc
 $GNUSTANDARDS/make-stds.texi	doc
 $GNUSTANDARDS/gnu-oids.texi	doc
 $GNUSTANDARDS/fdl.texi		doc
-#
+
 $GNUWWWLICENSES/lgpl-3.0.txt			doc/COPYING.LESSERv3
 $GNUWWWLICENSES/old-licenses/lgpl-2.1.txt	doc/COPYING.LESSERv2
 $GNUWWWLICENSES/gpl-3.0.txt			doc/COPYINGv3
 $GNUWWWLICENSES/old-licenses/gpl-2.0.txt	doc/COPYINGv2
 $GNUWWWLICENSES/old-licenses/lgpl-2.1.texi	doc
 $GNUWWWLICENSES/old-licenses/gpl-2.0.texi	doc
-# no longer used or maintained and fails @acronym checks
+# no longer modified and fails @acronym checks
 #$GNUWWWLICENSES/old-licenses/fdl-1.2.texi	doc
 $GNUWWWLICENSES/agpl-3.0.texi			doc
 $GNUWWWLICENSES/fdl-1.3.texi			doc
 $GNUWWWLICENSES/gpl-3.0.texi			doc
 $GNUWWWLICENSES/lgpl-3.0.texi			doc
-#
+
 # The official forms for contributors to fill out, mentioned in maintain.
 $GNUORG/conditions.text				doc/Copyright
 $GNUORG/Copyright/request-assign.changes	doc/Copyright
@@ -49,6 +49,21 @@ $GNUORG/disclaim.manual				doc/Copyright
 $GNUORG/disclaim.changes.manual			doc/Copyright
 $GNUORG/disclaim.program			doc/Copyright
 
+# Although gettext-runtime/m4 has other .m4 files, they are maintained
+# in gnulib.
+$GETTEXT/gettext-runtime/m4/codeset.m4		m4
+$GETTEXT/gettext-runtime/m4/gettext.m4		m4
+$GETTEXT/gettext-runtime/m4/iconv.m4		m4
+$GETTEXT/gettext-runtime/m4/intl.m4		m4
+$GETTEXT/gettext-runtime/m4/intldir.m4		m4
+$GETTEXT/gettext-runtime/m4/intlmacosx.m4	m4
+$GETTEXT/gettext-runtime/m4/lcmessage.m4	m4
+$GETTEXT/gettext-runtime/m4/nls.m4		m4
+$GETTEXT/gettext-runtime/m4/po.m4		m4
+
+# 
+# All below here commented out in forlorn hope of future syncs.
+
 # new argp not in glibc yet --13feb06.
 #$LIBCSRC/argp/argp-ba.c			lib gpl
 #$LIBCSRC/argp/argp-eexst.c		lib gpl
diff --git a/config/srclistvars.sh b/config/srclistvars.sh
index 4756d56373..b7e8d33e94 100644
--- a/config/srclistvars.sh
+++ b/config/srclistvars.sh
@@ -1,8 +1,7 @@
 # Variables for srclist-update and srclist.txt.
-# Will change for each user.
+# Will likely change for each user.
 
-# Copyright (C) 2002, 2003, 2004 2005, 2006, 2008
-# Free Software Foundation, Inc.
+# Copyright 2002-2015 Free Software Foundation, Inc.
 
 # This file is free software: you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -21,6 +20,7 @@
 case $LOGNAME in
 karl)
   : ${ACLOCAL=/usr/local/gnu/share/aclocal}
+  : ${GETTEXT=/usr/local/gnu/src/dist-gettext}
   : ${GNUBIN=/usr/local/gnu/bin}
   : ${GNUORG=$HOME/gnu/gnuorg}
   : ${GNUWWWLICENSES=$HOME/gnu/www/www/licenses}
diff --git a/m4/codeset.m4 b/m4/codeset.m4
index 1c52ffc1be..d7de8d67e0 100644
--- a/m4/codeset.m4
+++ b/m4/codeset.m4
@@ -1,5 +1,5 @@
 # codeset.m4 serial 5 (gettext-0.18.2)
-dnl Copyright (C) 2000-2002, 2006, 2008-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2000-2002, 2006, 2008-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/gettext.m4 b/m4/gettext.m4
index ce5f5ea93a..be247bf7b8 100644
--- a/m4/gettext.m4
+++ b/m4/gettext.m4
@@ -1,5 +1,5 @@
 # gettext.m4 serial 66 (gettext-0.18.2)
-dnl Copyright (C) 1995-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 1995-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/iconv.m4 b/m4/iconv.m4
index 5a6c29bd89..4e37363156 100644
--- a/m4/iconv.m4
+++ b/m4/iconv.m4
@@ -1,5 +1,5 @@
 # iconv.m4 serial 19 (gettext-0.18.2)
-dnl Copyright (C) 2000-2002, 2007-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2000-2002, 2007-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/intl.m4 b/m4/intl.m4
index 24e7ed9389..0c29ad0df8 100644
--- a/m4/intl.m4
+++ b/m4/intl.m4
@@ -1,5 +1,5 @@
-# intl.m4 serial 27 (gettext-0.18.3)
-dnl Copyright (C) 1995-2015 Free Software Foundation, Inc.
+# intl.m4 serial 28 (gettext-0.19)
+dnl Copyright (C) 1995-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -42,6 +42,8 @@ AC_DEFUN([AM_INTL_SUBDIR],
   AC_REQUIRE([gl_XSIZE])dnl
   AC_REQUIRE([gl_FCNTL_O_FLAGS])dnl
   AC_REQUIRE([gt_INTL_MACOSX])dnl
+  AC_REQUIRE([gl_EXTERN_INLINE])dnl
+  AC_REQUIRE([gt_GL_ATTRIBUTE])dnl
 
   dnl Support for automake's --enable-silent-rules.
   case "$enable_silent_rules" in
@@ -240,8 +242,7 @@ AC_DEFUN([gt_INTL_SUBDIR_CORE],
 
   dnl intl/plural.c is generated from intl/plural.y. It requires bison,
   dnl because plural.y uses bison specific features. It requires at least
-  dnl bison-1.26 because earlier versions generate a plural.c that doesn't
-  dnl compile.
+  dnl bison-2.7 for %define api.pure.
   dnl bison is only needed for the maintainer (who touches plural.y). But in
   dnl order to avoid separate Makefiles or --enable-maintainer-mode, we put
   dnl the rule in general Makefile. Now, some people carelessly touch the
@@ -258,7 +259,7 @@ changequote(<<,>>)dnl
     ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'`
     case $ac_prog_version in
       '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
-      1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*)
+      2.[7-9]* | [3-9].*)
 changequote([,])dnl
          ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
       *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
@@ -269,3 +270,29 @@ changequote([,])dnl
     INTLBISON=:
   fi
 ])
+
+dnl Copies _GL_UNUSED and _GL_ATTRIBUTE_PURE definitions from
+dnl gnulib-common.m4 as a fallback, if the project isn't using Gnulib.
+AC_DEFUN([gt_GL_ATTRIBUTE], [
+  m4_ifndef([gl_[]COMMON],
+    AH_VERBATIM([gt_gl_attribute],
+[/* Define as a marker that can be attached to declarations that might not
+    be used.  This helps to reduce warnings, such as from
+    GCC -Wunused-parameter.  */
+#ifndef _GL_UNUSED
+# if __GNUC__ >= 3 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7)
+#  define _GL_UNUSED __attribute__ ((__unused__))
+# else
+#  define _GL_UNUSED
+# endif
+#endif
+
+/* The __pure__ attribute was added in gcc 2.96.  */
+#ifndef _GL_ATTRIBUTE_PURE
+# if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96)
+#  define _GL_ATTRIBUTE_PURE __attribute__ ((__pure__))
+# else
+#  define _GL_ATTRIBUTE_PURE /* empty */
+# endif
+#endif
+]))])
diff --git a/m4/intldir.m4 b/m4/intldir.m4
index 1164148381..73b672a576 100644
--- a/m4/intldir.m4
+++ b/m4/intldir.m4
@@ -1,5 +1,5 @@
 # intldir.m4 serial 2 (gettext-0.18)
-dnl Copyright (C) 2006, 2009-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2006, 2009-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/intlmacosx.m4 b/m4/intlmacosx.m4
index 0d8d2988c9..8a045f6a29 100644
--- a/m4/intlmacosx.m4
+++ b/m4/intlmacosx.m4
@@ -1,5 +1,5 @@
 # intlmacosx.m4 serial 5 (gettext-0.18.2)
-dnl Copyright (C) 2004-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2004-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/lcmessage.m4 b/m4/lcmessage.m4
index 2fcce61be8..7470ec5973 100644
--- a/m4/lcmessage.m4
+++ b/m4/lcmessage.m4
@@ -1,5 +1,5 @@
 # lcmessage.m4 serial 7 (gettext-0.18.2)
-dnl Copyright (C) 1995-2002, 2004-2005, 2008-2015 Free Software Foundation,
+dnl Copyright (C) 1995-2002, 2004-2005, 2008-2014 Free Software Foundation,
 dnl Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
diff --git a/m4/nls.m4 b/m4/nls.m4
index 33d66c188d..53cdc8be8b 100644
--- a/m4/nls.m4
+++ b/m4/nls.m4
@@ -1,5 +1,5 @@
 # nls.m4 serial 5 (gettext-0.18)
-dnl Copyright (C) 1995-2003, 2005-2006, 2008-2015 Free Software Foundation,
+dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014 Free Software Foundation,
 dnl Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
diff --git a/m4/po.m4 b/m4/po.m4
index 203c3f98b6..43012dca1b 100644
--- a/m4/po.m4
+++ b/m4/po.m4
@@ -1,5 +1,5 @@
-# po.m4 serial 23 (gettext-0.18.3)
-dnl Copyright (C) 1995-2015 Free Software Foundation, Inc.
+# po.m4 serial 24 (gettext-0.19)
+dnl Copyright (C) 1995-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -30,7 +30,7 @@ AC_DEFUN([AM_PO_SUBDIRS],
 
   dnl Release version of the gettext macros. This is used to ensure that
   dnl the gettext macros and po/Makefile.in.in are in sync.
-  AC_SUBST([GETTEXT_MACRO_VERSION], [0.18])
+  AC_SUBST([GETTEXT_MACRO_VERSION], [0.19])
 
   dnl Perform the following tests also if --disable-nls has been given,
   dnl because they are needed for "make dist" to work.