From: Akim Demaille Date: Thu, 18 Oct 2001 15:24:53 +0000 (+0000) Subject: * tests/atlocal.in (GCC): Add. X-Git-Tag: BISON-1_29e~1 X-Git-Url: https://git.saurik.com/bison.git/commitdiff_plain/94ff2b947539ae8fe3e9f12af8e5176c8ad8e559?ds=sidebyside * 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 22a13eed..184236c8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2001-10-18 Akim Demaille + + * 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 * m4/m4.m4: Remove. diff --git a/Makefile.in b/Makefile.in index ad637930..ea6c1eea 100644 --- 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 af7d37d4..07762541 100644 --- 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 4f8b6353..c93c983c 100644 --- 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 ea6ad2be..56d4cec6 100755 --- 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 9689cbe3..bd4c9c06 100644 --- 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 205c3b4e..4cb00f4c 100644 --- 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 57643be9..5fdcd793 100644 --- 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 95a5bfcb..9779a01f 100644 --- 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 9b18665c..1124906f 100644 --- 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 21782843..74989e6b 100644 --- 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 9a6790af..81b0995a 100644 --- 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 8cce6cdc..cf01a886 100644 --- 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 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],