X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/8ed3234a14bcb83ac43b777bc7a85328ae9526ae..62a87154b3bb1af77ee153603972090a600bafce:/tests/atlocal.in

diff --git a/tests/atlocal.in b/tests/atlocal.in
index 2e034275..764540c8 100644
--- a/tests/atlocal.in
+++ b/tests/atlocal.in
@@ -1,30 +1,47 @@
-# @configure_input@					-*- shell-script -*-
+# @configure_input@                                     -*- shell-script -*-
 # Configurable variable values for Bison test suite.
-# Copyright (C) 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+
+# Copyright (C) 2000-2012 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_TEST@ @WERROR_CFLAGS@'
+
+# Sometimes a test group needs to ignore gcc warnings, so it locally
+# sets CFLAGS to this.
+NO_WERROR_CFLAGS='@O0CFLAGS@ @WARN_CFLAGS_TEST@'
 
 # We need `config.h'.
-CPPFLAGS="-DHAVE_CONFIG_H=1 -I$abs_top_builddir @CPPFLAGS@"
+CPPFLAGS="-I$abs_top_builddir/lib @CPPFLAGS@"
 
 # Is the compiler GCC?
 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_TEST@ @WERROR_CFLAGS@'
 
 # Are special link options needed?
 LDFLAGS='@LDFLAGS@'
 
 # Are special libraries needed?
-LIBS='@LIBS@'
+LIBS="$abs_top_builddir/lib/libbison.a @LIBS@ @INTLLIBS@"
+
+# Empty if no javac was found
+CONF_JAVAC='@CONF_JAVAC@'
+
+# Empty if no Java VM was found
+CONF_JAVA='@CONF_JAVA@'
+
+# Empty if no xsltproc was found
+: ${XSLTPROC='@XSLTPROC@'}
+
+# We need egrep.
+: ${EGREP='@EGREP@'}