From: Bruno Haible Date: Thu, 18 May 2017 20:49:58 +0000 (+0200) Subject: gettext: Update macros from gettext git. X-Git-Tag: v1.0~6136 X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=05daec7dcca4f516f39dcc0ce414c65cdcf6d2f0;p=gnulib.git gettext: Update macros from gettext git. * m4/intldir.m4: Require Autoconf >= 2.60. * m4/progtest.m4: Fix typos in copyright notice. --- diff --git a/ChangeLog b/ChangeLog index 5eb36babf4..a33ad588e9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2017-05-18 Bruno Haible + + gettext: Update macros from gettext git. + * m4/intldir.m4: Require Autoconf >= 2.60. + * m4/progtest.m4: Fix typos in copyright notice. + 2017-05-18 Bruno Haible copy-file tests: Fix link error (regression from 2017-05-01). diff --git a/m4/intldir.m4 b/m4/intldir.m4 index c688f46956..8d74bda4c0 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-2014, 2016 Free Software Foundation, Inc. +# intldir.m4 serial 3 (gettext-0.19.9) +dnl Copyright (C) 2006, 2009-2014, 2016-2017 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. @@ -13,7 +13,7 @@ dnl by the GNU Library General Public License, and the rest of the GNU dnl gettext package is covered by the GNU General Public License. dnl They are *not* in the public domain. -AC_PREREQ([2.52]) +AC_PREREQ([2.60]) dnl Tells the AM_GNU_GETTEXT macro to consider an intl/ directory. AC_DEFUN([AM_GNU_GETTEXT_INTL_SUBDIR], []) diff --git a/m4/progtest.m4 b/m4/progtest.m4 index 3f39135940..303bc31824 100644 --- a/m4/progtest.m4 +++ b/m4/progtest.m4 @@ -4,13 +4,13 @@ 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. dnl -dnl This file can can be used in projects which are not available under +dnl This file can be used in projects which are not available under dnl the GNU General Public License or the GNU Library General Public dnl License but which still want to provide support for the GNU gettext dnl functionality. dnl Please note that the actual code of the GNU gettext library is covered dnl by the GNU Library General Public License, and the rest of the GNU -dnl gettext package package is covered by the GNU General Public License. +dnl gettext package is covered by the GNU General Public License. dnl They are *not* in the public domain. dnl Authors: