From: Andy Heninger <andy.heninger@gmail.com>
Date: Thu, 25 Jul 2013 20:41:57 +0000 (+0000)
Subject: ICU-10271 tweak to configure test for C++11 #include <atomic>.
X-Git-Tag: milestone-59-0-1~2732
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a04e4eb615c55333bd7d861f740b7f5bbc481d43;p=icu

ICU-10271 tweak to configure test for C++11 #include <atomic>.

X-SVN-Rev: 33992
---

diff --git a/icu4c/source/configure b/icu4c/source/configure
index 184e730dc02..4a0386ba97c 100755
--- a/icu4c/source/configure
+++ b/icu4c/source/configure
@@ -5630,6 +5630,8 @@ fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if #include <atomic> works" >&5
 $as_echo_n "checking if #include <atomic> works... " >&6; }
+OLD_CXXFLAGS="${CXXFLAGS}"
+CXXFLAGS="${CXXFLAGS} -std=c++11"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <atomic>
@@ -5655,6 +5657,7 @@ then
 else
         U_HAVE_ATOMIC=0
 fi
+CXXFLAGS="${OLD_CXXFLAGS}"
 # Make this available via CPPFLAGS
 CONFIG_CPPFLAGS="${CONFIG_CPPFLAGS} -DU_HAVE_ATOMIC=${U_HAVE_ATOMIC}"
 
diff --git a/icu4c/source/configure.in b/icu4c/source/configure.in
index 1f08be9151a..2c8d971b873 100644
--- a/icu4c/source/configure.in
+++ b/icu4c/source/configure.in
@@ -476,6 +476,8 @@ AC_SUBST(U_HAVE_STD_STRING)
 
 
 AC_MSG_CHECKING([[if #include <atomic> works]])
+OLD_CXXFLAGS="${CXXFLAGS}"
+CXXFLAGS="${CXXFLAGS} -std=c++11"
 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <atomic>]], [[]])], [ac_cv_header_atomic=yes], [ac_cv_header_atomic=no])
 AC_MSG_RESULT($ac_cv_header_atomic)
 if test $ac_cv_header_atomic = yes
@@ -484,6 +486,7 @@ then
 else
         U_HAVE_ATOMIC=0
 fi
+CXXFLAGS="${OLD_CXXFLAGS}"
 # Make this available via CPPFLAGS
 CONFIG_CPPFLAGS="${CONFIG_CPPFLAGS} -DU_HAVE_ATOMIC=${U_HAVE_ATOMIC}"
 AC_SUBST(U_HAVE_ATOMIC)