Index: ChangeLog
from  Akim Demaille  <address@hidden>
	* data/glr.cc, data/lalr1.cc: Using %defines is mandatory.
	* data/glr.cc: b4_location_flag is now b4_locations_flag.

+2006-05-14  Akim Demaille  <address@hidden>
+
 	Implement --trace=m4.
 	* src/getargs.c (trace_types, trace_args): Accept trace_m4.
 	* src/output.c (output_skeleton): When set, pass -dV to m4.
Index: data/glr.cc
===================================================================
RCS file: /cvsroot/bison/bison/data/glr.cc,v
retrieving revision 1.18
diff -u -r1.18 glr.cc
--- data/glr.cc 14 May 2006 20:40:34 -0000 1.18
+++ data/glr.cc 14 May 2006 20:46:25 -0000
@@ -46,10 +46,13 @@
 #   user must initialize the first positions (in particular the
 #   filename member).
 
-
 # We require a pure interface using locations.
-m4_define([b4_location_flag], [1])
-m4_define([b4_pure_flag],     [1])
+m4_define([b4_locations_flag], [1])
+m4_define([b4_pure_flag],      [1])
+
+# The header is mandatory.
+b4_defines_if([],
+              [m4_fatal(b4_skeleton[: using %defines is mandatory])])
 
 m4_include(b4_pkgdatadir/[c++.m4])
 m4_include(b4_pkgdatadir/[location.cc])
Index: data/lalr1.cc
===================================================================
RCS file: /cvsroot/bison/bison/data/lalr1.cc,v
retrieving revision 1.129
diff -u -r1.129 lalr1.cc
--- data/lalr1.cc 14 May 2006 20:40:34 -0000 1.129
+++ data/lalr1.cc 14 May 2006 20:46:25 -0000
@@ -20,6 +20,11 @@
 # 02110-1301  USA
 
 m4_include(b4_pkgdatadir/[c++.m4])
+
+# The header is mandatory.
+b4_defines_if([],
+              [m4_fatal(b4_skeleton[: using %defines is mandatory])])
+
 # Backward compatibility.
 m4_define([b4_location_constructors])
 m4_include(b4_pkgdatadir/[location.cc])