diagnostics: improve -fcaret for list of accepted values

[bison.git] / m4 / cxx.m4

diff --git a/m4/cxx.m4 b/m4/cxx.m4
index 2d7318c905a327f90900c5b10ca47150c4fd5caa..f9f06092471f050c081281d571a4d22b4a8ca09f 100644 (file)
--- a/m4/cxx.m4
+++ b/m4/cxx.m4
@@ -1,7 +1,7 @@
 # -*- Autoconf -*-
 # Sanity-test a C++ compiler.
 #
 # -*- Autoconf -*-
 # Sanity-test a C++ compiler.
 #

-# Copyright (C) 2004, 2006, 2009, 2010 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
 # it under the terms of the GNU General Public License as published by
 #
 # 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


@@ -26,25 +26,25 @@ AC_DEFUN([BISON_TEST_FOR_WORKING_CXX_COMPILER],
     bison_cv_cxx_works=no
     AC_COMPILE_IFELSE(
       [AC_LANG_PROGRAM(
     bison_cv_cxx_works=no
     AC_COMPILE_IFELSE(
       [AC_LANG_PROGRAM(

-        [#include <cstdlib>
-         #include <iostream>
-         #include <map>
-         #include <string>
-         using namespace std;],
+         [#include <cstdlib>
+          #include <iostream>
+          #include <map>
+          #include <string>
+          using namespace std;],

          [std::cerr << "";
           cout << "";
          [std::cerr << "";
           cout << "";

-         typedef std::pair<unsigned int, int> uipair;
-         std::map<unsigned int, int> m;
-         std::map<unsigned int, int>::iterator i;
-         m.insert (uipair (4, -4));
-         for (i = m.begin (); i != m.end (); ++i)
-           if (i->first != 4)
-             return 1;])],
+          typedef std::pair<unsigned int, int> uipair;
+          std::map<unsigned int, int> m;
+          std::map<unsigned int, int>::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([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])])])
+         [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++])])
 
        rm -f conftest$ac_exeext])
     AC_LANG_POP([C++])])
 


@@ -58,3 +58,12 @@ AC_DEFUN([BISON_TEST_FOR_WORKING_CXX_COMPILER],
  AC_SUBST([BISON_CXX_WORKS])
  AM_CONDITIONAL(BISON_CXX_WORKS, test $bison_cv_cxx_works = yes)
 ])
  AC_SUBST([BISON_CXX_WORKS])
  AM_CONDITIONAL(BISON_CXX_WORKS, test $bison_cv_cxx_works = yes)
 ])

+
+# BISON_CXX_COMPILER_POSIXLY_CORRECT
+# ----------------------------------
+# Whether the C++ compiler supports -g in POSIXLY_CORRECT mode.
+AC_DEFUN([BISON_CXX_COMPILER_POSIXLY_CORRECT],
+[AC_LANG_PUSH([C++])
+BISON_LANG_COMPILER_POSIXLY_CORRECT
+AC_LANG_POP([C++])
+])