Fix C++ test cases after recent Gnulib changes. Discussed starting at

<http://lists.gnu.org/archive/html/bug-bison/2007-07/msg00000.html>.
* examples/calc++/Makefile.am (DEFAULT_INCLUDES): Override Automake's
definition in order to avoid Gnulib headers since we don't use config.h
here.
* tests/output.at (AT_CHECK_OUTPUT_FILE_NAME): Use AT_DATA_GRAMMAR
rather than AT_DATA so that config.h is included.

diff --git a/ChangeLog b/ChangeLog
index f1ff2fb8c7d828fe65a597c35906fa46906ef481..9c2618947c081f1438f38598b1d9198e2c872053 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2007-07-02  Joel E. Denny  <jdenny@ces.clemson.edu>
+
+       Fix C++ test cases after recent Gnulib changes.  Discussed starting at
+       <http://lists.gnu.org/archive/html/bug-bison/2007-07/msg00000.html>.
+       * examples/calc++/Makefile.am (DEFAULT_INCLUDES): Override Automake's
+       definition in order to avoid Gnulib headers since we don't use config.h
+       here.
+       * tests/output.at (AT_CHECK_OUTPUT_FILE_NAME): Use AT_DATA_GRAMMAR
+       rather than AT_DATA so that config.h is included.
+
 2007-07-01  Joel E. Denny  <jdenny@ces.clemson.edu>
 
        * data/glr.c (yy_yypstack, yypstates, yypdumpstack): Use YYFPRINTF

diff --git a/examples/calc++/Makefile.am b/examples/calc++/Makefile.am
index f4573d72ed15557b012390b2f1e81ce8e17d33d2..29fdafe80054057718ac9fb85f378c491cf637bb 100644 (file)
--- a/examples/calc++/Makefile.am
+++ b/examples/calc++/Makefile.am
@@ -44,6 +44,7 @@ $(calc_extracted): $(doc) $(extexi)
 ## Parser generation.  ##
 ## ------------------- ##
 
+DEFAULT_INCLUDES = -I. -I$(srcdir)
 BUILT_SOURCES = $(calc_extracted) $(calc_sources_generated)
 CLEANFILES = $(srcdir)/*.output *.tmp
 MAINTAINERCLEANFILES = $(srcdir)/*.stamp $(BUILT_SOURCES)

diff --git a/tests/output.at b/tests/output.at
index 06f30c7916bafca2bb0ef9e93698e71c6c84c94a..1343b99abb5a23617ec5fe3d25ccb52fb3505943 100644 (file)
--- a/tests/output.at
+++ b/tests/output.at
@@ -157,7 +157,7 @@ AT_CHECK_CONFLICTING_OUTPUT([foo.y],
 m4_define([AT_CHECK_OUTPUT_FILE_NAME],
 [AT_SETUP([Output file name: $1])
 
-AT_DATA([glr.y],
+AT_DATA_GRAMMAR([glr.y],
 [[%glr-parser
 %code {
   int yylex (void);
@@ -171,7 +171,7 @@ AT_CHECK([ls "AS_ESCAPE([$1.c])" "AS_ESCAPE([$1.h])"], [], [ignore])
 AT_COMPILE([glr.o], [-c "AS_ESCAPE([$1.c])"])
 $2
 
-AT_DATA([cxx.y],
+AT_DATA_GRAMMAR([cxx.y],
 [[%skeleton "lalr1.cc"
 %code { int yylex (yy::parser::semantic_type*); }
 %%