X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=config%2Flyxinclude.m4;h=8decd37ed93490776551f548047c5897af383530;hb=3c2d3caf278bf8b0c708845aec1ec8f00424392e;hp=03746027d7d9ae4f8ea5a33c7eb0a99388c79f73;hpb=dcfb918f15f604393295f69d36687b9c0aaaadb7;p=lyx.git diff --git a/config/lyxinclude.m4 b/config/lyxinclude.m4 index 03746027d7..8decd37ed9 100644 --- a/config/lyxinclude.m4 +++ b/config/lyxinclude.m4 @@ -133,7 +133,7 @@ done ])dnl -dnl Usage: LYX_PROG_CLANG: set lyx_cv_prog_clang to yes if the compiler is clang. +dnl Usage: LYX_PROG_CLANG: set CLANG to yes if the compiler is clang. AC_DEFUN([LYX_PROG_CLANG], [AC_CACHE_CHECK([whether the compiler is clang], [lyx_cv_prog_clang], @@ -146,6 +146,70 @@ AC_DEFUN([LYX_PROG_CLANG], ]) +dnl Usage: LYX_CXX_CXX11: set lyx_use_cxx11 to yes if the compiler implements +dnl the C++11 standard. +AC_DEFUN([LYX_CXX_CXX11], +[AC_CACHE_CHECK([whether the compiler implements C++11], + [lyx_cv_cxx_cxx11], + [save_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$AM_CPPFLAGS $CPPFLAGS" + save_CXXFLAGS=$CXXFLAGS + CXXFLAGS="$AM_CXXFLAGS $CXXFLAGS" + AC_LANG_PUSH(C++) + AC_TRY_COMPILE([], [ +#if __cplusplus >= 201103L || defined(__GXX_EXPERIMENTAL_CXX0X__) + this is a c++11 compiler +#endif + ], + [lyx_cv_cxx_cxx11=no], [lyx_cv_cxx_cxx11=yes ; lyx_flags="$lyx_flags c++11"]) + AC_LANG_POP(C++) + CXXFLAGS=$save_CXXFLAGS + CPPFLAGS=$save_CPPFLAGS]) + lyx_use_cxx11=$lyx_cv_cxx_cxx11 +]) + + +dnl Usage: LYX_CXX_USE_REGEX(cxx11_flags) +dnl decide whether we want to use std::regex and set the +dnl LYX_USE_STD_REGEX accordingly. +dnl the extra cxx11 flags have to be passed to the preprocessor. They are +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 + if test $lyx_use_cxx11 = yes; then + save_CPPFLAGS=$CPPFLAGS + # we want to pass -std=c++11 to clang/cpp if necessary + CPPFLAGS="$AM_CPPFLAGS $1 $CPPFLAGS" + save_CXXFLAGS=$CXXFLAGS + CXXFLAGS="$AM_CXXFLAGS $CXXFLAGS" + AC_LANG_PUSH(C++) + AC_CHECK_HEADER([regex], [lyx_std_regex=yes], [lyx_std_regex=no]) + AC_LANG_POP(C++) + CXXFLAGS=$save_CXXFLAGS + CPPFLAGS=$save_CPPFLAGS + if test x$GXX = xyes && test $lyx_std_regex = yes ; then + AC_MSG_CHECKING([for correct regex implementation]) + 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 + case $gxx_version in + 4.0*|4.1*|4.2*|4.3*|4.4*|4.5*|4.6*|4.7*|4.8*) lyx_std_regex=no ;; + *) ;; + esac + fi + fi + AC_MSG_RESULT([$lyx_std_regex]) + fi + + if test $lyx_std_regex = yes ; then + lyx_flags="$lyx_flags std-regex" + 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) +]) + + dnl Usage: LYX_LIB_STDCXX: set lyx_cv_lib_stdcxx to yes if the STL library is libstdc++. AC_DEFUN([LYX_LIB_STDCXX], [AC_CACHE_CHECK([whether STL is libstdc++], @@ -159,15 +223,6 @@ AC_DEFUN([LYX_LIB_STDCXX], ]) -dnl Usage: LYX_CXX_USE_CXX11(STD): pass option -std=STD to the C++ compiler -dnl and define LYX_USE_CXX11. -AC_DEFUN([LYX_CXX_USE_CXX11], -[lyx_flags="$lyx_flags c++11-mode" - AM_CXXFLAGS="$AM_CXXFLAGS -std=$1" - AC_DEFINE([LYX_USE_CXX11], 1, [Define if LyX should use C++11 features]) -]) - - dnl Usage: LYX_LIB_STDCXX_CXX11_ABI: set lyx_cv_lib_stdcxx_cxx11_abi to yes dnl if the STL library is GNU libstdc++ and the C++11 ABI is used. AC_DEFUN([LYX_LIB_STDCXX_CXX11_ABI], @@ -228,15 +283,6 @@ AC_ARG_ENABLE(stdlib-debug, [enable_stdlib_debug=no])] ) -AC_ARG_ENABLE(concept-checks, - AC_HELP_STRING([--enable-concept-checks],[enable concept checks]),, - [AS_CASE([$build_type], [dev*|pre*], [enable_concept_checks=yes], - [enable_concept_checks=no])] - if test x$USE_QT5 = xyes ; then - enable_concept_checks=no - fi -) - ### set up optimization AC_ARG_ENABLE(optimization, AC_HELP_STRING([--enable-optimization[=value]],[enable compiler optimisation]),, @@ -252,14 +298,9 @@ case $enable_optimization in *) lyx_optim=${enable_optimization};; esac -AC_ARG_ENABLE(pch, - AC_HELP_STRING([--enable-pch],[enable precompiled headers]),, - enable_pch=no;) -lyx_pch_comp=no - AC_ARG_ENABLE(cxx11, - AC_HELP_STRING([--enable-cxx11],[enable C++11 mode]),, - enable_cxx11=no;) + AC_HELP_STRING([--disable-cxx11],[disable C++11 mode (default: enabled for known good compilers)]),, + enable_cxx11=auto;) AC_ARG_ENABLE(assertions, AC_HELP_STRING([--enable-assertions],[add runtime sanity checks in the program]),, @@ -273,7 +314,6 @@ 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 @@ -301,18 +341,10 @@ if test x$GXX = xyes; then fi dnl Warnings are for preprocessor too if test x$enable_warnings = xyes ; then - case $gxx_version in - 4.0*|4.1*|4.2*|4.3*|4.4*|4.5*|4.6*|4.7*|4.8*|clang) - AM_CPPFLAGS="$AM_CPPFLAGS -Wall -Wextra" - ;; - *) - AM_CPPFLAGS="$AM_CPPFLAGS -Wall -Wextra -Wfloat-conversion" - ;; - esac + AM_CPPFLAGS="$AM_CPPFLAGS -Wall -Wextra" fi case $gxx_version in 2.*|3.*) AC_ERROR([gcc 4.x is required]);; - *) test $enable_pch = yes && lyx_pch_comp=yes ;; esac if test x$enable_stdlib_debug = xyes ; then dnl FIXME: for clang/libc++, one should define _LIBCPP_DEBUG2=0 @@ -325,50 +357,43 @@ if test x$GXX = xyes; then ;; esac fi - if test x$enable_concept_checks = xyes ; then - case $gxx_version in - 4.*) - lyx_flags="$lyx_flags concept-checks" - dnl FIXME check whether this makes sense with clang/libc++ - AC_DEFINE(_GLIBCXX_CONCEPT_CHECKS, 1, [libstdc++ concept checking]) - ;; - esac - fi - if test x$enable_cxx11 = xyes ; then + dnl enable_cxx11 can be yes/no/auto. + dnl By default, it is auto and we enable C++11 when possible + if test x$enable_cxx11 != xno ; then case $gxx_version in - 4.0*|4.1*|4.2*) AC_ERROR([There is no C++11 support in gcc 4.2 or older]);; + 4.0*|4.1*|4.2*) + if test x$enable_cxx11 = xyes; then + AC_ERROR([There is no C++11 support in gcc 4.2 or older]) + fi;; 4.3*|4.4*|4.5*|4.6*) - LYX_CXX_USE_CXX11(gnu++0x);; + dnl Note that this will define __GXX_EXPERIMENTAL_CXX0X__. + dnl The source code relies on that. + cxx11_flags="-std=c++0x";; clang) - dnl presumably all clang version support c++11. + dnl presumably all clang versions support c++11. dnl the deprecated-register warning is very annoying with Qt4.x right now. - LYX_CXX_USE_CXX11(c++11 -Wno-deprecated-register);; + cxx11_flags="-std=c++11" + AM_CXXFLAGS="$AM_CXXFLAGS -Wno-deprecated-register";; *) - LYX_CXX_USE_CXX11(gnu++11);; + AS_CASE([$host], [*cygwin*], + [cxx11_flags="-std=gnu++11"], + [cxx11_flags="-std=c++11"]);; esac - 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 - case $gxx_version in - 4.0*|4.1*|4.2*|4.3*|4.4*|4.5*|4.6*|4.7*|4.8*) ;; - *) lyx_flags="$lyx_flags stdregex" - lyx_std_regex=yes - ;; - esac - else - lyx_flags="$lyx_flags stdregex" - lyx_std_regex=yes - fi + # cxx11_flags is useful when running preprocessor alone + # (see detection of regex). + AM_CXXFLAGS="$cxx11_flags $AM_CXXFLAGS" + fi +fi - 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 +LYX_CXX_CXX11 +if test $lyx_use_cxx11 = yes; then + if test x$GXX = xyes; then + dnl We still use auto_ptr, which is obsoleted. Shut off the warnings. + AM_CXXFLAGS="$AM_CXXFLAGS -Wno-deprecated-declarations" 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 +LYX_CXX_USE_REGEX([$cxx11_flags]) +]) dnl Usage: LYX_USE_INCLUDED_BOOST : select if the included boost should dnl be used. @@ -381,14 +406,14 @@ AC_DEFUN([LYX_USE_INCLUDED_BOOST],[ AM_CONDITIONAL(USE_INCLUDED_BOOST, test x$lyx_cv_with_included_boost = xyes) AC_MSG_RESULT([$lyx_cv_with_included_boost]) if test x$lyx_cv_with_included_boost = xyes ; then - BOOST_INCLUDES='-I$(top_srcdir)/boost' - BOOST_LIBS='$(top_builddir)/boost/liblyxboost.a' + BOOST_INCLUDES='-I$(top_srcdir)/3rdparty/boost' + BOOST_LIBS='$(top_builddir)/3rdparty/boost/liblyxboost.a' else AC_LANG_PUSH(C++) save_LIBS=$LIBS AC_MSG_CHECKING([for multithreaded boost libraries]) - LIBS="$save_LIBS -lboost_signals-mt -lm $LIBTHREAD" + LIBS="$save_LIBS -lboost_signals-mt $LIBTHREAD" AC_LINK_IFELSE( [AC_LANG_PROGRAM([#include ], [boost::signal s;])], @@ -396,7 +421,7 @@ AC_DEFUN([LYX_USE_INCLUDED_BOOST],[ BOOST_MT="-mt"], [AC_MSG_RESULT([no]) AC_MSG_CHECKING([for plain boost libraries]) - LIBS="$save_LIBS -lboost_signals -lm" + LIBS="$save_LIBS -lboost_signals" AC_LINK_IFELSE( [AC_LANG_PROGRAM([#include ], [boost::signal s;])], @@ -414,6 +439,15 @@ AC_DEFUN([LYX_USE_INCLUDED_BOOST],[ else BOOST_LIBS="-lboost_regex${BOOST_MT} -lboost_signals${BOOST_MT}" fi + + dnl In general, system boost libraries are incompatible with + dnl the use of stdlib-debug in libstdc++. See ticket #9736 for + dnl details. + if test $enable_stdlib_debug = "yes" ; then + LYX_WARNING([Compiling LyX with stdlib-debug and system boost libraries may lead to + crashes. Consider using --disable-stdlib-debug or removing + --without-included-boost.]) + fi fi AC_SUBST(BOOST_INCLUDES) AC_SUBST(BOOST_LIBS) @@ -459,9 +493,9 @@ AC_DEFUN([LYX_USE_INCLUDED_MYTHES],[ if test x$ac_cv_header_mythes_h != xyes; then AC_CHECK_HEADER(mythes/mythes.hxx,[ac_cv_header_mythes_h=yes lyx_cv_mythes_h_location=""]) fi - AC_CHECK_LIB(mythes, main, [MYTHES_LIBS="-lmythes" lyx_mythes=yes], [lyx_mythes=no], [-lm]) + AC_CHECK_LIB(mythes, main, [MYTHES_LIBS="-lmythes" lyx_mythes=yes], [lyx_mythes=no]) if test x$lyx_mythes != xyes; then - AC_CHECK_LIB(mythes-1.2, main, [MYTHES_LIBS="-lmythes-1.2" lyx_mythes=yes], [lyx_mythes=no], [-lm]) + AC_CHECK_LIB(mythes-1.2, main, [MYTHES_LIBS="-lmythes-1.2" lyx_mythes=yes], [lyx_mythes=no]) fi AC_LANG_POP(C++) if test x$lyx_mythes != xyes -o x$ac_cv_header_mythes_h != xyes; then