Merge branch 'maint'

[bison.git] / tests / atlocal.in

diff --git a/tests/atlocal.in b/tests/atlocal.in
index b66e95439c10138eb17b8e975d1c5a5812f73763..e350d137b23905cb445e4db3653c2028ca8034a9 100644 (file)
--- a/tests/atlocal.in
+++ b/tests/atlocal.in
@@ -16,36 +16,45 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 

-# We need a C compiler.
-: ${CC='@CC@'}
-
-# We want no optimization.
-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="-I$abs_top_builddir/lib @CPPFLAGS@"
 
 # We need `config.h'.
 CPPFLAGS="-I$abs_top_builddir/lib @CPPFLAGS@"
 

+## ------------------- ##
+## C/C++ Compilation.  ##
+## ------------------- ##
+
+: ${CC='@CC@'}
+: ${CXX='@CXX@'}
+

 # Is the compiler GCC?
 GCC='@GCC@'
 
 # Is the compiler GCC?
 GCC='@GCC@'
 

-# The C++ compiler.
-: ${CXX='@CXX@'}
+# Sometimes a test group needs to ignore gcc warnings, so it locally
+# sets CFLAGS to this.
+  NO_WERROR_CFLAGS='@CFLAGS@   @WARN_CFLAGS@   @WARN_CFLAGS_TEST@'
+NO_WERROR_CXXFLAGS='@CXXFLAGS@ @WARN_CXXFLAGS@ @WARN_CXXFLAGS_TEST@'
+
+# But most of the time, we want -Werror.
+  CFLAGS="$NO_WERROR_CFLAGS   @WERROR_CFLAGS@"
+CXXFLAGS="$NO_WERROR_CXXFLAGS @WERROR_CXXFLAGS@"

 
 # If 'exit 77'; skip all C++ tests; otherwise ':'.
 BISON_CXX_WORKS='@BISON_CXX_WORKS@'
 
 
 # If 'exit 77'; skip all C++ tests; otherwise ':'.
 BISON_CXX_WORKS='@BISON_CXX_WORKS@'
 

-# We want no optimization with C++, too.
-CXXFLAGS='@O0CXXFLAGS@ @WARN_CXXFLAGS_TEST@ @WERROR_CFLAGS@'
+# Handle --compile-c-with-cxx here, once CXX and CXXFLAGS are known.
+if "$at_arg_compile_c_with_cxx"; then
+  CC_IS_CXX=1
+  CC=$CXX
+  NO_WERROR_CFLAGS=$NO_WERROR_CXXFLAGS
+  CFLAGS=$CXXFLAGS
+else
+  CC_IS_CXX=0
+fi

 
 

-# Are special link options needed?
-LDFLAGS='@LDFLAGS@'

 
 

-# Are special libraries needed?
-LIBS="$abs_top_builddir/lib/libbison.a @LIBS@ @INTLLIBS@"
+## ------- ##
+## Other.  ##
+## ------- ##

 
 # Empty if no javac was found
 CONF_JAVAC='@CONF_JAVAC@'
 
 # Empty if no javac was found
 CONF_JAVAC='@CONF_JAVAC@'


@@ -53,12 +62,26 @@ 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@'
 

-# Empty if no xsltproc was found
-: ${XSLTPROC='@XSLTPROC@'}
-
-# We need egrep.
+# We need egrep and perl.

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

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

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

+
+# Are special link options needed?
+LDFLAGS='@LDFLAGS@'
+
+# Are special libraries needed?
+LIBS="$abs_top_builddir/lib/libbison.a @LIBS@ @INTLLIBS@"
+
+# Empty if no xsltproc was found
+: ${XSLTPROC='@XSLTPROC@'}
+
+
+# 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