optimization of LyX. The compile may be much quicker with some
compilers, but LyX will run more slowly.
- o --disable-cxx11 forces the compiler in C++98 mode. The default is
- to use C++11 mode for known good compilers.
+ o --disable-std-regex forces the compiler to use boost::regex. The default is
+ to use std::regex for known good C++ libraries, but the test is not robust for clang.
+ --enable-std-regex will force the use of std::regex.
o --enable-debug will add debug information to your binary. This
requires a lot more disk space, but is a must if you want to try
dnl not plainly added to AM_CPPFLAGS because then the objc compiler (mac)
dnl would fail.
AC_DEFUN([LYX_CXX_USE_REGEX],
-[lyx_std_regex=no
- save_CPPFLAGS=$CPPFLAGS
+[AC_ARG_ENABLE(std-regex,
+ AC_HELP_STRING([--enable-std-regex],[use std::regex instead of boost::regex (default is autodetected)]),
+ [lyx_std_regex=$enableval],
+ [save_CPPFLAGS=$CPPFLAGS
# we want to pass -std=c++11 to clang/cpp if necessary
CPPFLAGS="$AM_CPPFLAGS $1 $CPPFLAGS"
save_CXXFLAGS=$CXXFLAGS
*) ;;
esac
fi
- fi
- AC_MSG_RESULT([$lyx_std_regex])
+ AC_MSG_RESULT([$lyx_std_regex])
+ fi])
if test $lyx_std_regex = yes ; then
lyx_flags="$lyx_flags std-regex"
[cxx11_flags="-std=gnu++11"],
[cxx11_flags="-std=c++11"]);;
esac
- # cxx11_flags is useful when running preprocessor alone
+ # cxx11_flags is useful when running preprocessor alone
# (see detection of regex).
AM_CXXFLAGS="$cxx11_flags $AM_CXXFLAGS"
fi