X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/d9735e9e3e09c94b05e5b81e86cce6c7f7cf72af..8ec3110a9ed4e4d26327bbccfc25278c374fd99a:/m4/cxx.m4?ds=inline diff --git a/m4/cxx.m4 b/m4/cxx.m4 index a63593f2..8ef1a250 100644 --- a/m4/cxx.m4 +++ b/m4/cxx.m4 @@ -1,11 +1,11 @@ # -*- Autoconf -*- # Sanity-test a C++ compiler. # -# Copyright (C) 2004, 2006 Free Software Foundation, Inc. +# Copyright (C) 2004, 2006, 2009-2012 Free Software Foundation, Inc. # -# This program is free software; you can redistribute it and/or modify +# This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -14,9 +14,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301 USA +# along with this program. If not, see . # Written by Paul Eggert. @@ -25,25 +23,29 @@ AC_DEFUN([BISON_TEST_FOR_WORKING_CXX_COMPILER], AC_CACHE_CHECK([whether $CXX builds executables that work], bison_cv_cxx_works, [AC_LANG_PUSH([C++]) - AC_RUN_IFELSE( + bison_cv_cxx_works=no + AC_COMPILE_IFELSE( [AC_LANG_PROGRAM( - [#include - #include - #include - #include - using namespace std;], + [#include + #include + #include + #include + using namespace std;], [std::cerr << ""; cout << ""; - typedef std::pair uipair; - std::map m; - std::map::iterator i; - m.insert (uipair (4, -4)); - for (i = m.begin (); i != m.end (); ++i) - if (i->first != 4) - return 1;])], - [bison_cv_cxx_works=yes], - [bison_cv_cxx_works=no], - [bison_cv_cxx_works=cross]) + typedef std::pair uipair; + std::map m; + std::map::iterator i; + m.insert (uipair (4, -4)); + for (i = m.begin (); i != m.end (); ++i) + if (i->first != 4) + return 1;])], + [AS_IF([AC_TRY_COMMAND([$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_objext $LIBS >&AS_MESSAGE_LOG_FD])], + [AS_IF([test "$cross_compiling" = yes], + [bison_cv_cxx_works=cross], + [AS_IF([AC_TRY_COMMAND(./conftest$ac_exeext)], + [bison_cv_cxx_works=yes])])]) + rm -f conftest$ac_exeext]) AC_LANG_POP([C++])]) case $bison_cv_cxx_works in