cmake: more option cleanup, use LYX_OPTION macro for consistent messages and variable...

[lyx.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index a75a9dfaba9758ae7b8c4e78a4708a17c2aab21e..30694a6bbbe3dd0d71029ad32a07f966a7c3f21f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 dnl Process with autoconf to generate configure script   -*- sh -*-
 
-AC_INIT(LyX,2.0.0alpha4,[lyx-devel@lists.lyx.org],[lyx])
+AC_INIT(LyX,2.0.0svn,[lyx-devel@lists.lyx.org],[lyx])
 # Use ISO format only. The frontend needs to parse this
 AC_SUBST(LYX_DATE, ["2010-06-15"])
 AC_PREREQ(2.52)
@@ -289,6 +289,13 @@ char * strerror(int n);
 #define BOOST_NO_WREGEX 1
 #define BOOST_NO_WSTRING 1
 
+// TR1 regex not supported in GCC <= 4.5
+#ifndef LYX_USE_TR1
+#  if __GNUC__ == 4 
+#    define LYX_USE_TR1
+#  endif
+#endif
+
 #ifdef __CYGWIN__
 #  define NOMINMAX
 #  define BOOST_POSIX 1