Merge branch 'maint'

[bison.git] / tests / atlocal.in

diff --git a/tests/atlocal.in b/tests/atlocal.in
index 2f68259288179815590bdc989037ad8a06bc902e..e350d137b23905cb445e4db3653c2028ca8034a9 100644 (file)
--- a/tests/atlocal.in
+++ b/tests/atlocal.in
@@ -1,4 +1,4 @@
-# @configure_input@                                    -*- shell-script -*-
+# @configure_input@                                     -*- shell-script -*-
 # Configurable variable values for Bison test suite.
 
 # Copyright (C) 2000-2012 Free Software Foundation, Inc.
@@ -62,8 +62,9 @@ CONF_JAVAC='@CONF_JAVAC@'
 # Empty if no Java VM was found
 CONF_JAVA='@CONF_JAVA@'
 
-# We need egrep.
+# We need egrep and perl.
 : ${EGREP='@EGREP@'}
+: ${PERL='@PERL@'}
 
 # Use simple quotes (lib/quote.c).
 LC_CTYPE=C
@@ -78,4 +79,9 @@ LIBS="$abs_top_builddir/lib/libbison.a @LIBS@ @INTLLIBS@"
 # Empty if no xsltproc was found
 : ${XSLTPROC='@XSLTPROC@'}
 
-: ${PERL='@PERL@'}
+
+# Handle --compile-c-with-cxx here, once CXX and CXXFLAGS are known.
+if "$at_arg_compile_c_with_cxx"; then
+  CC=$CXX
+  CFLAGS=$CXXFLAGS
+fi