Fix C++ test cases after recent Gnulib changes. Discussed starting at

[bison.git] / m4 / cxx.m4

diff --git a/m4/cxx.m4 b/m4/cxx.m4
index 1d17e8361c10fbc32504f5a5be28cc6abf67b5ea..bae56520d3f1f435de477ba62345a006ffa9e2a1 100644 (file)
--- a/m4/cxx.m4
+++ b/m4/cxx.m4
@@ -1,7 +1,7 @@
 # -*- Autoconf -*-
 # Sanity-test a C++ compiler.
 #
-# Copyright (C) 2004 Free Software Foundation, Inc.
+# Copyright (C) 2004, 2006 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
@@ -15,24 +15,39 @@
 #
 # 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., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301  USA
 
-# Written by Paul Eggert <eggert@cs.ucla.edu>.
+# Written by Paul Eggert.
 
 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 <iostream>
+        [#include <cstdlib>
+         #include <iostream>
+         #include <map>
+         #include <string>
          using namespace std;],
-         [cout << "";])],
-      [bison_cv_cxx_works=yes],
-      [bison_cv_cxx_works=no],
-      [bison_cv_cxx_works=cross])
+         [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;])],
+      [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
@@ -43,4 +58,5 @@ AC_DEFUN([BISON_TEST_FOR_WORKING_CXX_COMPILER],
  esac
 
  AC_SUBST([BISON_CXX_WORKS])
+ AM_CONDITIONAL(BISON_CXX_WORKS, test $bison_cv_cxx_works = yes)
 ])