From 90cba9e6d4045fac2cd44945c34bf919af20ee1f Mon Sep 17 00:00:00 2001
From: Florian Krohm <florian@eich-krohm.de>
Date: Tue, 8 Oct 2013 13:04:00 +0000
Subject: [PATCH] Add a specific configury check to test compilability of the
 <thread> C++ header file by the selected compiler. Suggested by Bart Van
 Assche.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@13628
---
 configure.ac          | 24 ++++++++++++++++++++++++
 drd/tests/Makefile.am |  2 +-
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 42f2ac5ce6..1970ace7bd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1381,6 +1381,30 @@ AC_MSG_RESULT([no])
 ])
 
 
+# Check whether compiler can process #include <thread> without errors
+# clang 3.3 cannot process <thread> from e.g.
+# gcc (Ubuntu/Linaro 4.6.3-1ubuntu5) 4.6.3
+
+AC_MSG_CHECKING([that C++ compiler can include <thread> header file])
+AC_LANG(C++)
+safe_CXXFLAGS=$CXXFLAGS
+CXXFLAGS=-std=c++0x
+
+AC_COMPILE_IFELSE([AC_LANG_SOURCE([
+#include <thread> 
+])],
+[
+ac_cxx_can_include_thread_header=yes
+AC_MSG_RESULT([yes])
+], [
+ac_cxx_can_include_thread_header=no
+AC_MSG_RESULT([no])
+])
+CXXFLAGS=$safe_CXXFLAGS
+AC_LANG(C)
+
+AM_CONDITIONAL(CXX_CAN_INCLUDE_THREAD_HEADER, test x$ac_cxx_can_include_thread_header = xyes)
+
 #----------------------------------------------------------------------------
 # Checking for supported compiler flags.
 #----------------------------------------------------------------------------
diff --git a/drd/tests/Makefile.am b/drd/tests/Makefile.am
index dabbe52ec0..fd38e3493c 100644
--- a/drd/tests/Makefile.am
+++ b/drd/tests/Makefile.am
@@ -367,7 +367,7 @@ endif
 
 # clang 3.3 will generate errors about libstdc++ headers from 
 # gcc (Ubuntu/Linaro 4.6.3-1ubuntu5) 4.6.3
-if ! COMPILER_IS_CLANG
+if CXX_CAN_INCLUDE_THREAD_HEADER
 if HAVE_SHARED_POINTER_ANNOTATION
 check_PROGRAMS += \
   std_thread
-- 
2.47.2