* src/output.c (output_skeleton): Don't hard wire the inclusion of

c.m4.
* data/c++.m4, data/glr.c, data/yacc.c: Include c.m4.
* data/glr.cc: Do not include stack.hh.

diff --git a/ChangeLog b/ChangeLog
index b0b2c861e41de87ffd7bb5e8edf71d8d0800f6fd..346b675b2b60bd3759b5c673ebf47685279bc158 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,7 +2,7 @@
 
        * src/output.c (output_skeleton): Don't hard wire the inclusion of
        c.m4.
-       * data/c++.m4: Include c.m4.
+       * data/c++.m4, data/glr.c, data/yacc.c: Include c.m4.
        * data/glr.cc: Do not include stack.hh.
 
 2006-01-02  Joel E. Denny  <jdenny@ces.clemson.edu>

diff --git a/data/glr.c b/data/glr.c
index ead86ab8181a484a9b4c0f33637ab4d90ff7d7af..94f4c0c2111e6f957428ad5dbcc67a04063745f4 100644 (file)
--- a/data/glr.c
+++ b/data/glr.c
@@ -1,7 +1,7 @@
 m4_divert(-1)                                                       -*- C -*-
 
 # GLR skeleton for Bison
-# Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2004, 2005, 2006 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
@@ -19,6 +19,8 @@ m4_divert(-1)                                                       -*- C -*-
 # 02110-1301  USA
 
 
+m4_include(b4_pkgdatadir/[c.m4])
+
 ## ---------------- ##
 ## Default values.  ##
 ## ---------------- ##

diff --git a/data/yacc.c b/data/yacc.c
index 3a9314dbf86f612d0d317ec3a5a6863533a8b571..561ee3207707ddaa074c28ed01903ef5c3e0ea7b 100644 (file)
--- a/data/yacc.c
+++ b/data/yacc.c
@@ -20,7 +20,7 @@ m4_divert(-1)                                                -*- C -*-
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 # 02110-1301  USA
 
-
+m4_include(b4_pkgdatadir/[c.m4])
 
 ## ---------------- ##
 ## Default values.  ##