From be22665ceb480c79a314cf613e020d430e7b0913 Mon Sep 17 00:00:00 2001 From: Georg Baum Date: Tue, 6 Jan 2015 19:48:27 +0100 Subject: [PATCH] Fix autotools config for gcc < 4.9 Since LYX_USE_STD_REGEX is used in Makefile.am, it must always be defined, not only if C++11 support is enabled. --- config/lyxinclude.m4 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/lyxinclude.m4 b/config/lyxinclude.m4 index c40d1c6ad7..0bcf731dc2 100644 --- a/config/lyxinclude.m4 +++ b/config/lyxinclude.m4 @@ -272,6 +272,7 @@ if test "x$enable_assertions" = xyes ; then fi # set the compiler options correctly. +lyx_std_regex=no if test x$GXX = xyes; then dnl clang++ pretends to be g++ 4.2.1; this is not useful if test x$CLANG = xno; then @@ -359,7 +360,6 @@ if test x$GXX = xyes; then CXXFLAGS="-std=gnu++11 $CXXFLAGS" ;; esac - lyx_std_regex=no if test x$CLANG = xno || test $lyx_cv_lib_stdcxx = yes; then dnl in gcc is unusable in versions less than 4.9.0 dnl see https://gcc.gnu.org/bugzilla/show_bug.cgi?id=53631 @@ -377,9 +377,9 @@ if test x$GXX = xyes; then if test $lyx_std_regex = yes ; then AC_DEFINE([LYX_USE_STD_REGEX], 1, [define to 1 if std::regex should be preferred to boost::regex]) fi - AM_CONDITIONAL([LYX_USE_STD_REGEX], test $lyx_std_regex = yes) fi fi +AM_CONDITIONAL([LYX_USE_STD_REGEX], test $lyx_std_regex = yes) test "$lyx_pch_comp" = yes && lyx_flags="$lyx_flags pch" AM_CONDITIONAL(LYX_BUILD_PCH, test "$lyx_pch_comp" = yes) ])dnl