X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=config%2Flyxinclude.m4;h=fb6525c7adb33ab0c56fae5ae0a63ebaea0467d8;hb=a42c5e38800d747be8db1b508e94043a78ac8719;hp=40cf17373c192c83c7cf18cf0526cc17d0168d55;hpb=ce526607ff4ae33834dabe64e0072530eca16183;p=lyx.git diff --git a/config/lyxinclude.m4 b/config/lyxinclude.m4 index 40cf17373c..fb6525c7ad 100644 --- a/config/lyxinclude.m4 +++ b/config/lyxinclude.m4 @@ -164,9 +164,9 @@ fi ]) -dnl Usage: LYX_CXX_CXX11_FLAGS: add to AM_CXXFLAGS the best flag that +dnl Usage: LYX_CXX_CXX11_FLAGS(VERSION): add to AM_CXXFLAGS the best flag that dnl selects C++11 mode; gives an error when C++11 mode is not found. -dnl Parameter is a list of years to try (e.g. 11 or {14,11}) +dnl VERSION is a list of years to try (e.g. 11 or {14,11}). AC_DEFUN([LYX_CXX_CXX11_FLAGS], [AC_CACHE_CHECK([for a good C++ mode], [lyx_cv_cxx11_flags], [lyx_cv_cxx11_flags=none @@ -308,10 +308,10 @@ AC_DEFUN([LYX_PROG_CXX], [AC_REQUIRE([AC_PROG_CXX]) AC_REQUIRE([AC_PROG_CXXCPP]) -### We might want to disable debug +### We might want to force the C++ standard. AC_ARG_ENABLE(cxx-mode, AS_HELP_STRING([--enable-cxx-mode],[choose C++ standard (default: 14, then 11)]),, - [enable_cxx_mode=14,11] + [enable_cxx_mode={14,11}] ) AC_LANG_PUSH(C++)