Style changes and factoring.

[bison.git] / tests / atlocal.in

diff --git a/tests/atlocal.in b/tests/atlocal.in
index 9fd930e57d684e7f6f73069decc7cf142963c50f..91ba6742108e348d476ba0b06baa9a922ff9a203 100644 (file)
--- a/tests/atlocal.in
+++ b/tests/atlocal.in
@@ -1,14 +1,14 @@
 # @configure_input@                                    -*- shell-script -*-
 # Configurable variable values for Bison test suite.
 
-# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software
-# Foundation, Inc.
+# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+# 2009 Free Software Foundation, Inc.
 
 # We need a C compiler.
-CC='@CC@'
+: ${CC='@CC@'}
 
 # We want no optimization.
-CFLAGS='@O0CFLAGS@ @WARNING_CFLAGS@ @WERROR_CFLAGS@'
+CFLAGS='@O0CFLAGS@ @WARN_CFLAGS@ @WERROR_CFLAGS@'
 
 # We need `config.h'.
 CPPFLAGS="-I$abs_top_builddir/lib @CPPFLAGS@"
@@ -17,13 +17,13 @@ CPPFLAGS="-I$abs_top_builddir/lib @CPPFLAGS@"
 GCC='@GCC@'
 
 # The C++ compiler.
-CXX='@CXX@'
+: ${CXX='@CXX@'}
 
 # If 'exit 77'; skip all C++ tests; otherwise ':'.
 BISON_CXX_WORKS='@BISON_CXX_WORKS@'
 
 # We want no optimization with C++, too.
-CXXFLAGS='@O0CXXFLAGS@ @WARNING_CXXFLAGS@ @WERROR_CFLAGS@'
+CXXFLAGS='@O0CXXFLAGS@ @WARN_CXXFLAGS@ @WERROR_CFLAGS@'
 
 # Are special link options needed?
 LDFLAGS='@LDFLAGS@'
@@ -38,4 +38,7 @@ CONF_JAVAC='@CONF_JAVAC@'
 CONF_JAVA='@CONF_JAVA@'
 
 # Empty if no xsltproc was found
-XSLTPROC='@XSLTPROC@'
+: ${XSLTPROC='@XSLTPROC@'}
+
+# We need egrep.
+: ${EGREP='@EGREP@'}