From 283ef01bd8aaae0e843d2f6214ae5dbc43cbe383 Mon Sep 17 00:00:00 2001 From: Alexandre Duret-Lutz Date: Sat, 14 May 2005 19:24:27 +0000 Subject: [PATCH] * tests/cxxnoc.test: Adjust grep pattern for CC, because CVS Autoconf currently defines a CCC variable. --- ChangeLog | 3 +++ tests/cxxnoc.test | 10 ++++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2a5a0b9b..721ed4a0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2005-05-14 Alexandre Duret-Lutz + * tests/cxxnoc.test: Adjust grep pattern for CC, because CVS + Autoconf currently defines a CCC variable. + * tests/output11.test, tests/output12.test: Use rm -f. 2005-04-25 Gary V. Vaughan diff --git a/tests/cxxnoc.test b/tests/cxxnoc.test index d0c18687..e9dbc78e 100755 --- a/tests/cxxnoc.test +++ b/tests/cxxnoc.test @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1996, 1997, 2001, 2002 Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 2001, 2002, 2005 Free Software Foundation, Inc. # # This file is part of GNU Automake. # @@ -22,6 +22,8 @@ . ./defs || exit 1 +set -e + cat >> configure.in << 'END' AC_PROG_CXX END @@ -34,8 +36,8 @@ END : > doe.C : > jane.C -$ACLOCAL || exit 1 -$AUTOMAKE || exit 1 +$ACLOCAL +$AUTOMAKE -grep CC Makefile.in | grep -v MKDEP && exit 1 +$FGREP '(CC)' Makefile.in && exit 1 exit 0 -- 2.43.5