X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/8c86f0ef98ffa6b7a54e55aa54e44afed464a94e..5d27808262de3a1759f1ee784be6b0cd2733bac5:/m4/cxx.m4

diff --git a/m4/cxx.m4 b/m4/cxx.m4
index a8eff8ee..bae56520 100644
--- a/m4/cxx.m4
+++ b/m4/cxx.m4
@@ -25,17 +25,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 <cstdlib>
 	  #include <iostream>
+	  #include <map>
 	  #include <string>
 	  using namespace std;],
          [std::cerr << "";
-          cout << "";])],
-      [bison_cv_cxx_works=yes],
-      [bison_cv_cxx_works=no],
-      [bison_cv_cxx_works=cross])
+          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