Add icon library to link target - needed on Mac OS X - thanks Kornel

[lyx.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 7ba65bb193683cf84c7cd690f3efb374d20eb8fb..77fe598f8b113bde5cb0955bb75b7e4ca644490d 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)
 
@@ -281,10 +284,12 @@ char * strerror(int n);
 #define BOOST_NO_WSTRING 1
 #define BOOST_SIGNALS_NO_DEPRECATION_WARNING 1
 
-// TR1 regex not supported in GCC <= 4.5
-#ifndef LYX_USE_TR1
-#  if __GNUC__ == 4 
-#    define LYX_USE_TR1
+// <regex> in gcc is unusable in versions less than 4.9.0
+// see https://gcc.gnu.org/bugzilla/show_bug.cgi?id=53631
+// clang defines __GNUC__ but how do the versions match?
+#ifndef LYX_USE_STD_REGEX
+#  if (__GNUC__ == 4 && __GNUC_MINOR__ >= 9) || __GNUC__ > 4 || defined(USE_LLVM_LIBCPP)
+#    define LYX_USE_STD_REGEX
 #  endif
 #endif