FYI: merge maint into master

[Akim Demaille]

I installed this.

commit 520144aadc34f57ac0572ded66ab62fc32cb3069
Merge: 72cd9a9 7020e5f
Author: Akim Demaille <address@hidden>
Date:   Fri May 4 15:04:30 2012 +0200

    Merge remote-tracking branch 'origin/master'
    
    * origin/master:
      glr.c: untabify.
      glr.cc: untabify.
      glr.cc: formatting changes.
      glr.cc: remove unused signature.
      glr.cc: properly declare locations are const where appropriate.
      doc: fix @xref.
    
    Conflicts:
        data/glr.cc

diff --git a/data/glr.cc b/data/glr.cc
index 59533a2..117c714 100644
--- a/data/glr.cc
+++ b/data/glr.cc
@@ -94,7 +94,8 @@ m4_append([b4_post_prologue],
 
 b4_c_ansi_function_decl([yyerror],
     [static void],
-    [[b4_namespace_ref::b4_parser_class_name::location_type *yylocationp], 
[yylocationp]],
+    [[const b4_namespace_ref::b4_parser_class_name::location_type 
*yylocationp],
+                        [yylocationp]],
     b4_parse_param,
     [[const char* msg], [msg]])])
 
@@ -108,7 +109,8 @@ m4_append([b4_epilogue],
 
 ]b4_c_ansi_function_def([yyerror],
     [static void],
-    [[b4_namespace_ref::b4_parser_class_name::location_type *yylocationp], 
[yylocationp]],
+    [[const b4_namespace_ref::b4_parser_class_name::location_type 
*yylocationp],
+                        [yylocationp]],
     b4_parse_param,
     [[const char* msg], [msg]])[
 {
@@ -146,7 +148,8 @@ m4_pushdef([b4_parse_param], 
m4_defn([b4_parse_param_orig]))dnl
 
   inline void
   ]b4_parser_class_name[::yy_symbol_value_print_ (int yytype,
-                           const semantic_type* yyvaluep, const location_type* 
yylocationp)
+                           const semantic_type* yyvaluep,
+                           const location_type* yylocationp)
   {
     YYUSE (yylocationp);
     YYUSE (yyvaluep);
@@ -164,7 +167,8 @@ m4_pushdef([b4_parse_param], 
m4_defn([b4_parse_param_orig]))dnl
 
   void
   ]b4_parser_class_name[::yy_symbol_print_ (int yytype,
-                           const semantic_type* yyvaluep, const location_type* 
yylocationp)
+                           const semantic_type* yyvaluep,
+                           const location_type* yylocationp)
   {
     *yycdebug_ << (yytype < YYNTOKENS ? "token" : "nterm")
                << ' ' << yytname[yytype] << " ("
@@ -314,16 +318,6 @@ b4_copyright([Skeleton interface for Bison GLR parsers in 
C++],
     std::ostream* yycdebug_;
 #endif
 
-    /// \brief Reclaim the memory associated to a symbol.
-    /// \param yymsg        Why this token is reclaimed.
-    /// \param yytype       The symbol type.
-    /// \param yyvaluep     Its semantic value.
-    /// \param yylocationp  Its location.
-    inline void yydestruct_ (const char* yymsg,
-                             int yytype,
-                             semantic_type* yyvaluep,
-                             location_type* yylocationp);
-
 ]b4_parse_param_vars[
   };
 
diff --git a/doc/bison.texinfo b/doc/bison.texinfo
index 4aac8d3..7740c77 100644
--- a/doc/bison.texinfo
+++ b/doc/bison.texinfo
@@ -10886,7 +10886,7 @@ values have a common base type: @code{Object} or as 
specified by
 an union.  The type of @code{$$}, even with angle brackets, is the base
 type since Java casts are not allow on the left-hand side of assignments.
 Also, @address@hidden and @code{@@@var{n}} are not allowed on the
-left-hand side of assignments. @xref{Java Semantic Values} and
+left-hand side of assignments. @xref{Java Semantic Values}, and
 @ref{Java Action Features}.
 
 @item
diff --git a/gnulib b/gnulib
index 1a0e0ae..cbf7a84 160000
--- a/gnulib
+++ b/gnulib
@@ -1 +1 @@
-Subproject commit 1a0e0aefd4b1fbef0c6e5d990bc01499fd153a0d
+Subproject commit cbf7a84bcf8194d6687244fb0e0701539aeeee21-dirty
diff --git a/submodules/autoconf b/submodules/autoconf
index 0db9c1a..9e71645 160000
--- a/submodules/autoconf
+++ b/submodules/autoconf
@@ -1 +1 @@
-Subproject commit 0db9c1a19fbbdbf8728ec8d9c5a020d070ec23b2
+Subproject commit 9e71645ffc703f8e3a5e201d7d1b02e390cc1661