From 208760661142d45a862e1dd79aafe23f50d05de8 Mon Sep 17 00:00:00 2001
From: Christophe Riccio <christopheri@unity3d.com>
Date: Sat, 16 Jul 2016 00:28:32 +0200
Subject: [PATCH] - Improved C++ 11 STL detection #523

---
 glm/detail/setup.hpp | 11 ++---------
 readme.md            |  1 +
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/glm/detail/setup.hpp b/glm/detail/setup.hpp
index d176d832..1464e848 100644
--- a/glm/detail/setup.hpp
+++ b/glm/detail/setup.hpp
@@ -681,15 +681,8 @@
 // http://gcc.gnu.org/projects/cxx0x.html
 // http://msdn.microsoft.com/en-us/library/vstudio/hh567368(v=vs.120).aspx
 
-#if GLM_PLATFORM == GLM_PLATFORM_ANDROID || GLM_PLATFORM == GLM_PLATFORM_CYGWIN
-#	define GLM_HAS_CXX11_STL 0
-#elif GLM_COMPILER & (GLM_COMPILER_LLVM | GLM_COMPILER_APPLE_CLANG)
-#	if __has_include(<__config>) // libc++
-#		include <__config>
-//#	else // libstdc++
-//#		include <bits/c++config.h>
-#	endif
-#	if defined(_LIBCPP_VERSION)// || defined(__GLIBCXX__)
+#if GLM_COMPILER & (GLM_COMPILER_LLVM | GLM_COMPILER_APPLE_CLANG)
+#	if defined(_LIBCPP_VERSION) && GLM_LANG & GLM_LANG_CXX11_FLAG
 #		define GLM_HAS_CXX11_STL 1
 #	else
 #		define GLM_HAS_CXX11_STL 0
diff --git a/readme.md b/readme.md
index 0d6b0080..c318b4fb 100644
--- a/readme.md
+++ b/readme.md
@@ -55,6 +55,7 @@ glm::mat4 camera(float Translate, glm::vec2 const & Rotate)
 ##### Improvements:
 - Added pkg-config file #509
 - Updated list of compiler versions detected
+- Improved C++ 11 STL detection #523
 
 ##### Fixes:
 - Fixed STL for C++11 detection on ICC #510