From: Joel E. Denny <joeldenny@joeldenny.org>
Date: Sat, 10 Apr 2010 21:37:27 +0000 (-0400)
Subject: tests: fix for newer Sun Studio C++.
X-Git-Tag: v2.7.90~703
X-Git-Url: https://git.saurik.com/bison.git/commitdiff_plain/4586c8cdb7c018de9cd16fdd0faa8ff749e69876?ds=inline

tests: fix for newer Sun Studio C++.

Reported by Dagobert Michelsen at
<http://lists.gnu.org/archive/html/bug-bison/2010-03/msg00023.html>.
* THANKS (Dagobert Michelsen): Add.
* configure.ac (AC_PREREQ): Set to 2.64 so we get the latest
Autoconf macro for handling the restrict keyword.
* gnulib: Update to latest, which no longer overrides that macro
from Autoconf.
(cherry picked from commit 4333ba11c65f428040d54820b6d4c6aa663944d2)

Conflicts:

	configure.ac
---

diff --git a/ChangeLog b/ChangeLog
index f093f2d1..bb9523d1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2010-04-10  Joel E. Denny  <joeldenny@joeldenny.org>
+
+	tests: fix for newer Sun Studio C++.
+	Reported by Dagobert Michelsen at
+	<http://lists.gnu.org/archive/html/bug-bison/2010-03/msg00023.html>.
+	* THANKS (Dagobert Michelsen): Add.
+	* configure.ac (AC_PREREQ): Set to 2.64 so we get the latest
+	Autoconf macro for handling the restrict keyword.
+	* gnulib: Update to latest, which no longer overrides that macro
+	from Autoconf.
+
 2010-04-03  Joel E. Denny  <jdenny@ces.clemson.edu>
 
 	portability: fix pointer arithmetic to conform to C standard.
diff --git a/THANKS b/THANKS
index a417bbc0..75a09bce 100644
--- a/THANKS
+++ b/THANKS
@@ -24,6 +24,7 @@ Christian Burger          cburger@sunysb.edu
 Cris Bailiff              c.bailiff+bison@awayweb.com
 Cris van Pelt             cris@amf03054.office.wxs.nl
 Csaba Raduly              csaba_22@yahoo.co.uk
+Dagobert Michelsen        dam@baltic-online.de
 Daniel Hagerty            hag@gnu.org
 David J. MacKenzie        djm@gnu.org
 Derek M. Jones            derek@knosof.co.uk
diff --git a/configure.ac b/configure.ac
index df6072f3..b0d6c5b0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,8 +15,10 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# testsuite -C appears in 2.62.
-AC_PREREQ(2.62)
+# In order for some versions of Sun Studio to compile our C++ test cases
+# correctly, we need Autoconf 2.64 or better to handle the restrict
+# keyword in at least string.h from gnulib.
+AC_PREREQ(2.64)
 
 AC_INIT([GNU Bison],
         m4_esyscmd([build-aux/git-version-gen .tarball-version]),
diff --git a/gnulib b/gnulib
index 7bacd338..1778ee9e 160000
--- a/gnulib
+++ b/gnulib
@@ -1 +1 @@
-Subproject commit 7bacd338464a463f3ba0c14effd86b71ce3672b4
+Subproject commit 1778ee9e7d0e150a37db66a0e51c1a56755aab4f