glr: fix ambiguity reports.

[bison.git] / data / java-skel.m4

diff --git a/data/java-skel.m4 b/data/java-skel.m4
index f00981a42ec4f185b525eaab9a21e50c6babd5ca..81bf02aed98684975afb550c749863407d3609bb 100644 (file)
--- a/data/java-skel.m4
+++ b/data/java-skel.m4
@@ -1,26 +1,24 @@
                                                             -*- Autoconf -*-
 
 # Java skeleton dispatching for Bison.
-# Copyright (C) 2007 Free Software Foundation, Inc.
 
-# This program is free software; you can redistribute it and/or modify
+# Copyright (C) 2007, 2009-2012 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
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
-
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-
+#
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301  USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 b4_glr_if(             [b4_complain([%%glr-parser not supported for Java])])
 b4_nondeterministic_if([b4_complain([%%nondeterministic-parser not supported for Java])])
-b4_push_if(            [b4_complain([%%push-parser is not supported for Java])])
 
 m4_define_default([b4_used_skeleton], [b4_pkgdatadir/[lalr1.java]])
 m4_define_default([b4_skeleton], ["b4_basename(b4_used_skeleton)"])