Do not use tr1 with libc++

[features.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 7ba65bb193683cf84c7cd690f3efb374d20eb8fb..1cbb6bd978ab9d175a66f4aa29e2ed5d9c78588a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -102,6 +102,9 @@ LYX_USE_INCLUDED_MYTHES
 ### we need to know the byte order for unicode conversions
 AC_C_BIGENDIAN
 
+# Nice to have when an assertion triggers
+LYX_CHECK_CALLSTACK_PRINTING
+
 # Needed for our char_type
 AC_CHECK_SIZEOF(wchar_t)
 
@@ -282,8 +285,9 @@ char * strerror(int n);
 #define BOOST_SIGNALS_NO_DEPRECATION_WARNING 1
 
 // TR1 regex not supported in GCC <= 4.5
+// clang defines __GNUC__ but libc++ does not have tr1
 #ifndef LYX_USE_TR1
-#  if __GNUC__ == 4 
+#  if __GNUC__ == 4 && !defined(USE_LLVM_LIBCPP)
 #    define LYX_USE_TR1
 #  endif
 #endif