anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 01:59:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix autotools config for gcc < 4.9

Browse Source 
Since LYX_USE_STD_REGEX is used in Makefile.am, it must always be defined, not
only if C++11 support is enabled.
This commit is contained in:
Georg Baum 2015-01-06 19:48:27 +01:00
parent 59b705dcd9
commit be22665ceb
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/lyxinclude.m4
View File

@ -272,6 +272,7 @@ if test "x$enable_assertions" = xyes ; then
fi fi
# set the compiler options correctly. # set the compiler options correctly.
lyx_std_regex=no
if test x$GXX = xyes; then if test x$GXX = xyes; then
dnl clang++ pretends to be g++ 4.2.1; this is not useful dnl clang++ pretends to be g++ 4.2.1; this is not useful
if test x$CLANG = xno; then if test x$CLANG = xno; then
@ -359,7 +360,6 @@ if test x$GXX = xyes; then
CXXFLAGS="-std=gnu++11 $CXXFLAGS" CXXFLAGS="-std=gnu++11 $CXXFLAGS"
;; ;;
esac esac
lyx_std_regex=no
if test x$CLANG = xno || test $lyx_cv_lib_stdcxx = yes; then if test x$CLANG = xno || test $lyx_cv_lib_stdcxx = yes; then
dnl <regex> in gcc is unusable in versions less than 4.9.0 dnl <regex> in gcc is unusable in versions less than 4.9.0
dnl see https://gcc.gnu.org/bugzilla/show_bug.cgi?id=53631 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 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]) AC_DEFINE([LYX_USE_STD_REGEX], 1, [define to 1 if std::regex should be preferred to boost::regex])
fi fi
AM_CONDITIONAL([LYX_USE_STD_REGEX], test $lyx_std_regex = yes)
fi fi
fi fi
AM_CONDITIONAL([LYX_USE_STD_REGEX], test $lyx_std_regex = yes)
test "$lyx_pch_comp" = yes && lyx_flags="$lyx_flags pch" test "$lyx_pch_comp" = yes && lyx_flags="$lyx_flags pch"
AM_CONDITIONAL(LYX_BUILD_PCH, test "$lyx_pch_comp" = yes) AM_CONDITIONAL(LYX_BUILD_PCH, test "$lyx_pch_comp" = yes)
])dnl ])dnl