Change-Id: Ib158bc873fc41bb5668a1da3d7c928f2757d80ab
This commit is contained in:
Stephan Bergmann
2013-06-14 15:51:55 +02:00
parent be4b5d56d7
commit 38a8b6da3b

View File

@@ -5690,19 +5690,18 @@ return !(i != 0 && j != 0);
CXXFLAGS=$save_CXXFLAGS
fi
if test "$HAVE_CXX11" != "TRUE"; then
if test -n "$CXXFLAGS_CXX11"; then
AC_MSG_NOTICE([Disabling C++11 support])
CXXFLAGS_CXX11=
elif test "$CPP_LIBRARY" = LIBCPP -a $_os = Darwin; then
AC_MSG_ERROR([Selected libc++ but C++11 support broken])
fi
if test "$HAVE_CXX11" = "TRUE"; then
AC_DEFINE(HAVE_CXX11)
elif test -n "$CXXFLAGS_CXX11"; then
AC_MSG_NOTICE([Disabling C++11 support])
CXXFLAGS_CXX11=
elif test "$CPP_LIBRARY" = LIBCPP -a $_os = Darwin; then
AC_MSG_ERROR([Selected libc++ but C++11 support broken])
fi
fi
AC_SUBST(CXXFLAGS_CXX11)
AC_SUBST(HAVE_CXX11)
AC_DEFINE(HAVE_CXX11)
dnl ==================================
dnl Check for C++11 "= delete" support