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 562eba4d9be4fc62c3c6c205bcc7b26f18146dcf..77fe598f8b113bde5cb0955bb75b7e4ca644490d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -284,13 +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
-// <regex> and <tr1/regex> in gcc are unusable in versions less than 4.9.0
+// <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 libc++ does not have tr1
-#ifndef LYX_USE_TR1
-#  if __GNUC__ == 4 && !defined(USE_LLVM_LIBCPP)
-#    define LYX_USE_TR1
+// 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