From: Akim Demaille <akim@lrde.epita.fr>
Date: Thu, 8 Nov 2012 08:24:51 +0000 (+0100)
Subject: Merge branch 'maint'
X-Git-Tag: v2.7.90~276
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6d58c632025cb6928a90e4176577982bfb9c3981;p=platform%2Fupstream%2Fbison.git

Merge branch 'maint'

* origin/maint:
  regen
  maint: post-release administrivia
  version 2.6.5
  regen
  tests: syntax-check
  tests: beware of compilers that do not support POSIXLY_CORRECT
  gnulib: update

Conflicts:
	src/parse-gram.c
	src/parse-gram.h
	tests/atlocal.in
---

6d58c632025cb6928a90e4176577982bfb9c3981
diff --cc tests/atlocal.in
index e350d13,5e3cb72..16e6fda
--- a/tests/atlocal.in
+++ b/tests/atlocal.in
@@@ -79,9 -78,14 +79,18 @@@ LIBS="$abs_top_builddir/lib/libbison.a 
  # Empty if no xsltproc was found
  : ${XSLTPROC='@XSLTPROC@'}
  
 -: ${PERL='@PERL@'}
 -
+ # Don't just check if $POSIXLY_CORRECT is set, as Bash, when launched
+ # as /bin/sh, sets the shell variable POSIXLY_CORRECT to y, but not
+ # the environment variable.
+ : ${C_COMPILER_POSIXLY_CORRECT='@C_COMPILER_POSIXLY_CORRECT@'}
+ if env | grep '^POSIXLY_CORRECT=' >/dev/null; then
+   POSIXLY_CORRECT_IS_EXPORTED=true
+ else
+   POSIXLY_CORRECT_IS_EXPORTED=false
+ fi
 +
 +# Handle --compile-c-with-cxx here, once CXX and CXXFLAGS are known.
 +if "$at_arg_compile_c_with_cxx"; then
 +  CC=$CXX
 +  CFLAGS=$CXXFLAGS
 +fi
diff --cc tests/local.at
index d120712,88e797f..fb74faf
--- a/tests/local.at
+++ b/tests/local.at
@@@ -472,12 -468,8 +472,8 @@@ m4_define([AT_BISON_CHECK_WARNINGS_]
  [[# Defining POSIXLY_CORRECT causes bison to complain if options are
  # added after the grammar file name, so skip these checks in that
  # case.
- #
- # Don't just check if $POSIXLY_CORRECT is set, as Bash, when launched
- # as /bin/sh, sets the shell variable POSIXLY_CORRECT to y, but not
- # the environment variable.
- if env | grep '^POSIXLY_CORRECT=' >/dev/null; then :; else
+ if test "$POSIXLY_CORRECT_IS_EXPORTED" = false; then
 -  ]AT_SAVE_SPECIAL_FILES[
 +          ]AT_SAVE_SPECIAL_FILES[
  
    # To avoid expanding it repeatedly, store specified stdout.
    ]AT_DATA([expout], [$3])[