* tests/calc.at: Catch up with 1.30.

* configure.in: Bump to 1.49a.
Adjust to newer Autotest.

diff --git a/ChangeLog b/ChangeLog
index 53f640906bf0afae20aa0c425fb16ed5e44620e7..4168a345ea084254c5d3c2ff8901ba2cd3dafbcc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-11-01  Akim Demaille  <akim@epita.fr>
+
+       * tests/calc.at: Catch up with 1.30.
+       * configure.in: Bump to 1.49a.
+       Adjust to newer Autotest.
+
 2001-10-19  Pascal Bart  <pascal.bart@epita.fr>
 
        * src/conflicts.c: Move global variables rrc_total and src_total ...

diff --git a/NEWS b/NEWS
index 07762541f22324a39d9283c8c3fd74d3142d5377..543947ca0bd225ab7e1ac2486bcdc52a506985db 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,9 @@
 Bison News
 ----------
 
-Changes in version 1.29e:
+Changes in version 1.49a:
+\f
+Changes in version 1.30:
 
 * `--defines' and `--graph' have now an optionnal argument which is the
   output file name. `-d' and `-g' do not change, they do not take any
@@ -10,10 +12,8 @@ Changes in version 1.29e:
 * `%source_extension' and `%header_extension' are removed, failed
   experiment.
 
-* The test suite is more portable.
-
-* Better portability.
-
+* Portability fixes.
+\f
 Changes in version 1.29:
 
 * The output file does not define const, as this caused problems when used
@@ -45,6 +45,9 @@ Changes in version 1.29:
 * New directives.
   `%yacc', `%fixed_output_files', `%defines', `%no_parser', `%verbose',
   `%debug', `%source_extension' and `%header_extension'.
+
+* @$
+  Automatic location tracking.
 \f
 Changes in version 1.28:
 

diff --git a/configure.in b/configure.in
index 27b8d2ecfd5d59efaf6bd2eaae0f5e4615df0f73..3e5f284dd7e00a8e83f8d6ebe03c854bc2f55ef7 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -18,14 +18,15 @@
 # We need a recent Autoconf to run a recent Autotest.
 AC_PREREQ(2.52e)
 
-AC_INIT([GNU Bison], [1.29d], [bug-bison@gnu.org])
+AC_INIT([GNU Bison], [1.49a], [bug-bison@gnu.org])
 AC_CONFIG_AUX_DIR(config)
 
-AM_INIT_AUTOMAKE([bison], [1.29d])
+AM_INIT_AUTOMAKE([bison], [1.49a])
 AM_CONFIG_HEADER(config.h:config.hin)
 
 # Initialize the test suite.
 AC_CONFIG_TESTDIR(tests)
+AC_CONFIG_FILES(tests/Makefile tests/atlocal)
 AC_CONFIG_FILES([tests/bison], [chmod +x tests/bison])
 # Needed by tests/atlocal.in.
 AC_SUBST([GCC])
@@ -105,5 +106,4 @@ AC_OUTPUT([Makefile
            config/Makefile
            intl/Makefile po/Makefile.in
            lib/Makefile src/Makefile doc/Makefile
-           m4/Makefile
-           tests/Makefile])
+           m4/Makefile])

diff --git a/tests/Makefile.am b/tests/Makefile.am
index eefd1f96498d96ec074f80e826cec6ca94cfa26d..3613713f5bf1340cca9c8ea1ab0a8d7f0aac5e45 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -18,7 +18,7 @@
 ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 ## 02111-1307, USA.
 
-EXTRA_DIST = atlocal.in $(TESTSUITE_AT) testsuite
+EXTRA_DIST = $(TESTSUITE_AT) testsuite
 
 DISTCLEANFILES       = atconfig atlocal bison package.m4
 MAINTAINERCLEANFILES = Makefile.in $(TESTSUITE)
@@ -37,9 +37,6 @@ $(srcdir)/$(TESTSUITE): $(TESTSUITE_AT)
 atconfig: $(top_builddir)/config.status
        cd $(top_builddir) && ./config.status tests/$@
 
-atlocal: $(srcdir)/atlocal.in $(top_builddir)/config.status
-       cd $(top_builddir) && ./config.status tests/$@
-
 clean-local:
        $(SHELL) $(TESTSUITE) --clean
 

diff --git a/tests/calc.at b/tests/calc.at
index ba5293f53e5676958c8c08407b67eb2eee6484bf..f1064634cfa2a57fa937ac781530082300f246c6 100644 (file)
--- a/tests/calc.at
+++ b/tests/calc.at
@@ -256,8 +256,8 @@ main (int argc, const char **argv)
 # Produce `calc.y'.
 m4_define([AT_DATA_CALC_Y],
 [_AT_DATA_CALC_Y($[1], $[2], $[3],
-                 [m4_match([$1], [--yyerror-verbose],
-                           [[#define YYERROR_VERBOSE 1]])])])
+                 [m4_bmatch([$1], [--yyerror-verbose],
+                            [[#define YYERROR_VERBOSE]])])])
 
 
 
@@ -338,7 +338,7 @@ AT_CHECK([bison calc.y -o calc.c m4_bpatsubst([$1], [--yyerror-verbose])],
 # warnings, but this place is not the right one for that.
 # So let's keep only GCC warnings, which we know are sane.
 AT_CHECK([$CC $CFLAGS $CPPFLAGS calc.c -o calc], 0, [], [stderr])
-AT_CHECK([test "$GCC" = yes && cat stderr])
+AT_CHECK([if test "$GCC" = yes; then cat stderr; else true; fi])
 
 # Test the priorities.
 _AT_CHECK_CALC([$1],