Merge branch 'maint'

[bison.git] / tests / atlocal.in

diff --git a/tests/atlocal.in b/tests/atlocal.in
index 5e3cb723a48837d92e3782cc56616ab3b4b82587..16e6fda89ef75ab6b0a22f04270aa3ef79fe2e69 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.
 # 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@'
 
 # Empty if no Java VM was found
 CONF_JAVA='@CONF_JAVA@'
 

-# We need egrep.
+# We need egrep and perl.

 : ${EGREP='@EGREP@'}
 : ${EGREP='@EGREP@'}

+: ${PERL='@PERL@'}

 
 # Use simple quotes (lib/quote.c).
 LC_CTYPE=C
 
 # Use simple quotes (lib/quote.c).
 LC_CTYPE=C


@@ -78,8 +79,6 @@ LIBS="$abs_top_builddir/lib/libbison.a @LIBS@ @INTLLIBS@"
 # Empty if no xsltproc was found
 : ${XSLTPROC='@XSLTPROC@'}
 
 # Empty if no xsltproc was found
 : ${XSLTPROC='@XSLTPROC@'}
 

-: ${PERL='@PERL@'}
-

 # Don't just check if $POSIXLY_CORRECT is set, as Bash, when launched
 # as /bin/sh, sets the shell variable POSIXLY_CORRECT to y, but not
 # the environment variable.
 # Don't just check if $POSIXLY_CORRECT is set, as Bash, when launched
 # as /bin/sh, sets the shell variable POSIXLY_CORRECT to y, but not
 # the environment variable.


@@ -89,3 +88,9 @@ if env | grep '^POSIXLY_CORRECT=' >/dev/null; then
 else
   POSIXLY_CORRECT_IS_EXPORTED=false
 fi
 else
   POSIXLY_CORRECT_IS_EXPORTED=false
 fi

+
+# 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