* tests/atlocal.in (GCC): Add.

* tests/calc.at: s/m4_match/m4_bmatch/.
s/m4_patsubst/m4_bpatsubst/.
(AT_CHECK_CALC): Check the compiler's stderr only if it's GCC.
* configure.in: AC_SUBST(GCC).

diff --git a/ChangeLog b/ChangeLog
index 22a13eedcbfce17aa8c63246e75f6a6f85356d58..184236c8504d39be42d75215ca357c88f8c5a1e7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2001-10-18  Akim Demaille  <akim@epita.fr>
+
+       * tests/atlocal.in (GCC): Add.
+       * tests/calc.at: s/m4_match/m4_bmatch/.
+       s/m4_patsubst/m4_bpatsubst/.
+       (AT_CHECK_CALC): Check the compiler's stderr only if it's GCC.
+       * configure.in: AC_SUBST(GCC).
+
 2001-10-10  Akim Demaille  <akim@epita.fr>
 
        * m4/m4.m4: Remove.

diff --git a/Makefile.in b/Makefile.in
index ad63793030e9a729ee0fb9d4c27c25638568eb9f..ea6c1eeabe2ac5dcd52a27317f0730dabd8155ef 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -72,6 +72,7 @@ CC = @CC@
 CPP = @CPP@
 DATADIRNAME = @DATADIRNAME@
 DEPDIR = @DEPDIR@
+GCC = @GCC@
 GENCAT = @GENCAT@
 GLIBC21 = @GLIBC21@
 GMOFILES = @GMOFILES@

diff --git a/NEWS b/NEWS
index af7d37d41350288d9f57c62741f9ccd831affd7d..07762541f22324a39d9283c8c3fd74d3142d5377 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,7 @@
 Bison News
 ----------
 
-Changes in version 1.29d:
+Changes in version 1.29e:
 
 * `--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

diff --git a/config/Makefile.in b/config/Makefile.in
index 4f8b63535967c5f34cd7b9228544fbbfe89f7c9b..c93c983c746bdd88f9a0fe51603c2bb255449f96 100644 (file)
--- a/config/Makefile.in
+++ b/config/Makefile.in
@@ -72,6 +72,7 @@ CC = @CC@
 CPP = @CPP@
 DATADIRNAME = @DATADIRNAME@
 DEPDIR = @DEPDIR@
+GCC = @GCC@
 GENCAT = @GENCAT@
 GLIBC21 = @GLIBC21@
 GMOFILES = @GMOFILES@

diff --git a/configure b/configure
index ea6ad2bea68cd47250cc87e3edb76ab90c5257b0..56d4cec6161fccc937a1129e4f196c7a099e2571 100755 (executable)
--- a/configure
+++ b/configure
@@ -1425,6 +1425,8 @@ fi
 
 ac_config_files="$ac_config_files tests/bison"
 
+# Needed by tests/atlocal.in.
+
 # Checks for programs.
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -9021,6 +9023,7 @@ s,@AMDEP_TRUE@,$AMDEP_TRUE,;t t
 s,@AMDEP_FALSE@,$AMDEP_FALSE,;t t
 s,@AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t
 s,@DEPDIR@,$DEPDIR,;t t
+s,@GCC@,$GCC,;t t
 s,@CC@,$CC,;t t
 s,@CFLAGS@,$CFLAGS,;t t
 s,@LDFLAGS@,$LDFLAGS,;t t

diff --git a/configure.in b/configure.in
index 9689cbe3ed9f0c1a164f2027c7adf87b9d125b18..bd4c9c06f7680cf1a87250a0da61500b4dff5221 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -27,6 +27,8 @@ AM_CONFIG_HEADER(config.h:config.hin)
 # Initialize the test suite.
 AC_CONFIG_TESTDIR(tests)
 AC_CONFIG_FILES([tests/bison], [chmod +x tests/bison])
+# Needed by tests/atlocal.in.
+AC_SUBST([GCC])
 
 # Checks for programs.
 AC_PROG_CC

diff --git a/doc/Makefile.in b/doc/Makefile.in
index 205c3b4e5b784d6245069cc5528b1ecfac346a14..4cb00f4cb6d42d86c04712d5174df29f2921f0f0 100644 (file)
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -72,6 +72,7 @@ CC = @CC@
 CPP = @CPP@
 DATADIRNAME = @DATADIRNAME@
 DEPDIR = @DEPDIR@
+GCC = @GCC@
 GENCAT = @GENCAT@
 GLIBC21 = @GLIBC21@
 GMOFILES = @GMOFILES@

diff --git a/lib/Makefile.in b/lib/Makefile.in
index 57643be9d3365e4a73e2f17be25abc8989b44d56..5fdcd79391e82b4fcc56896527f88729ef02e4e2 100644 (file)
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -72,6 +72,7 @@ CC = @CC@
 CPP = @CPP@
 DATADIRNAME = @DATADIRNAME@
 DEPDIR = @DEPDIR@
+GCC = @GCC@
 GENCAT = @GENCAT@
 GLIBC21 = @GLIBC21@
 GMOFILES = @GMOFILES@

diff --git a/m4/Makefile.in b/m4/Makefile.in
index 95a5bfcbe313915c4aba104ba655caa9f179e26f..9779a01f8814c5d80144fd61bab696206fffdd9a 100644 (file)
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -72,6 +72,7 @@ CC = @CC@
 CPP = @CPP@
 DATADIRNAME = @DATADIRNAME@
 DEPDIR = @DEPDIR@
+GCC = @GCC@
 GENCAT = @GENCAT@
 GLIBC21 = @GLIBC21@
 GMOFILES = @GMOFILES@

diff --git a/src/Makefile.in b/src/Makefile.in
index 9b18665c247f9e5f781c4558ed0c9b29bffd082d..1124906fe531b25b7ccf38e8f3e785031037161b 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -72,6 +72,7 @@ CC = @CC@
 CPP = @CPP@
 DATADIRNAME = @DATADIRNAME@
 DEPDIR = @DEPDIR@
+GCC = @GCC@
 GENCAT = @GENCAT@
 GLIBC21 = @GLIBC21@
 GMOFILES = @GMOFILES@

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 2178284345ad119b4988bc764f1efc355cbd167d..74989e6b9b9747e08fc16bcb3c45c8ec71aba965 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -72,6 +72,7 @@ CC = @CC@
 CPP = @CPP@
 DATADIRNAME = @DATADIRNAME@
 DEPDIR = @DEPDIR@
+GCC = @GCC@
 GENCAT = @GENCAT@
 GLIBC21 = @GLIBC21@
 GMOFILES = @GMOFILES@

diff --git a/tests/atlocal.in b/tests/atlocal.in
index 9a6790afdb6baca92ae5366553064787af92a387..81b0995affde82c6591eef4834b1e8c6052fe0dc 100644 (file)
--- a/tests/atlocal.in
+++ b/tests/atlocal.in
@@ -6,5 +6,8 @@
 CC='@CC@'
 CFLAGS='@CFLAGS@'
 
+# We need to know if the compiler is GCC.
+GCC='@GCC@'
+
 # We need `config.h'.
 CPPFLAGS="-I $top_builddir @CPPFLAGS@"

diff --git a/tests/calc.at b/tests/calc.at
index 8cce6cdce9a8bcbae4a28fa7c57d67806cb98e4d..cf01a886256ee802fe06cfb08d803af2a8e4bb5d 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]])])])
+                 [m4_bmatch([$1], [--yyerror-verbose],
+                            [[#define YYERROR_VERBOSE]])])])
 
 
 
@@ -273,8 +273,8 @@ m4_define([_AT_CHECK_CALC],
 ]])
 AT_CHECK([calc input], 0, [], [stderr])dnl
 AT_CHECK([wc -l <stderr | sed 's/[[^0-9]]//g'], 0,
-         [m4_match([$1], [--debug],
-                   [$3], [0])
+         [m4_bmatch([$1], [--debug],
+                    [$3], [0])
 ])
 ])
 
@@ -302,17 +302,17 @@ AT_CHECK([calc input], 0, [], [stderr])
 
 
 AT_CHECK([wc -l <stderr | sed 's/[[^0-9]]//g'], 0,
-         [m4_match([$1], [--debug],
-                   [$3], [1])
+         [m4_bmatch([$1], [--debug],
+                    [$3], [1])
 ])
 
 egrep -v '^((Start|Enter|Read|Reduc|Shift)ing|state|Error:) ' stderr >at-stderr
 mv at-stderr stderr
 
 AT_CHECK([cat stderr], 0,
-[m4_match([$1], [--location], [$4: ])[]dnl
+[m4_bmatch([$1], [--location], [$4: ])[]dnl
 parse error[]dnl
-m4_match([$1], [--yyerror-verbose], [, $5])[]dnl
+m4_bmatch([$1], [--yyerror-verbose], [, $5])[]dnl
 
 ])
 
@@ -330,9 +330,15 @@ AT_SETUP([Calculator $1])
 AT_DATA_CALC_Y([$1])
 
 # Specify the output files to avoid problems on different file systems.
-AT_CHECK([bison calc.y -o calc.c m4_patsubst([$1], [--yyerror-verbose])],
+AT_CHECK([bison calc.y -o calc.c m4_bpatsubst([$1], [--yyerror-verbose])],
          [0], [], [])
-AT_CHECK([$CC $CFLAGS $CPPFLAGS calc.c -o calc], 0, [], [])
+
+# Some compilers issue warnings we don't want to hear about.
+# Maybe some day we will have proper Autoconf macros to disable these
+# 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])
 
 # Test the priorities.
 _AT_CHECK_CALC([$1],