anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-25 10:58:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

config/lyxinclude.m4: add support for --enable-cxx11

Browse Source 
Using --enable-cxx11 turns on C++11 mode in gcc.
This commit is contained in:
Lars Gullik Bjønnes 2012-10-24 03:05:14 +02:00
parent 54d1cb1880
commit 393ade85ec
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
config/lyxinclude.m4
View File

@ -232,6 +232,10 @@ AC_ARG_ENABLE(pch,
enable_pch=no;) enable_pch=no;)
lyx_pch_comp=no lyx_pch_comp=no
AC_ARG_ENABLE(cxx11,
AC_HELP_STRING([--enable-cxx11],[enable C++11 mode]),,
enable_cxx11=no;)
AC_ARG_ENABLE(assertions, AC_ARG_ENABLE(assertions,
AC_HELP_STRING([--enable-assertions],[add runtime sanity checks in the program]),, AC_HELP_STRING([--enable-assertions],[add runtime sanity checks in the program]),,
[AS_CASE([$build_type], [dev*|pre*], [enable_assertions=yes], [AS_CASE([$build_type], [dev*|pre*], [enable_assertions=yes],
@ -306,6 +310,18 @@ if test x$GXX = xyes; then
;; ;;
esac esac
fi fi
if test x$enable_cxx11 = xyes ; then
case $gxx_version in
4.3*|4.4*|4.5*|4.6*)
lyx_flags="$lyx_flags c++11-mode"
CXXFLAGS="-std=gnu++0x $CXXFLAGS"
;;
4.7*|4.8*)
lyx_flags="$lyx_flags c++11-mode"
CXXFLAGS="-std=gnu++11 $CXXFLAGS"
;;
esac
fi
fi fi
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)