X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=77fe598f8b113bde5cb0955bb75b7e4ca644490d;hb=a88e6e1ea5861f8275adbe4c962c2629fb482613;hp=1cbb6bd978ab9d175a66f4aa29e2ed5d9c78588a;hpb=0842aa06e45d0d182c34924f03b045056795e0c2;p=lyx.git

diff --git a/configure.ac b/configure.ac
index 1cbb6bd978..77fe598f8b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -284,11 +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
-// clang defines __GNUC__ but libc++ does not have tr1
-#ifndef LYX_USE_TR1
-#  if __GNUC__ == 4 && !defined(USE_LLVM_LIBCPP)
-#    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