AC_DEFUN([LYX_CXX_CXX11],
[AC_CACHE_CHECK([whether the compiler implements C++11],
[lyx_cv_cxx_cxx11],
- [save_CXXFLAGS=$CXXFLAGS
+ [save_CPPFLAGS=$CPPFLAGS
+ CPPFLAGS="$AM_CPPFLAGS $CPPFLAGS"
+ save_CXXFLAGS=$CXXFLAGS
CXXFLAGS="$AM_CXXFLAGS $CXXFLAGS"
AC_LANG_PUSH(C++)
AC_TRY_COMPILE([], [
],
[lyx_cv_cxx_cxx11=no], [lyx_cv_cxx_cxx11=yes ; lyx_flags="$lyx_flags c++11"])
AC_LANG_POP(C++)
- CXXFLAGS=$save_CXXFLAGS])
-lyx_use_cxx11=$lyx_cv_cxx_cxx11
+ CXXFLAGS=$save_CXXFLAGS
+ CPPFLAGS=$save_CPPFLAGS])
+ lyx_use_cxx11=$lyx_cv_cxx_cxx11
+])
+
+dnl decide whether we want to use std::regex and set the
+dnl LYX_USE_STD_REGEX accordingly.
+AC_DEFUN([LYX_CXX_USE_REGEX],
+[lyx_std_regex=no
+ if test $lyx_use_cxx11 = yes; then
+ save_CPPFLAGS=$CPPFLAGS
+ CPPFLAGS="$AM_CPPFLAGS $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 <regex> 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)
])
[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]),,
*) 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 (default: enabled for known good compilers)]),,
+ AC_HELP_STRING([--disable-cxx11],[disable C++11 mode (default: enabled for known good compilers)]),,
enable_cxx11=auto;)
AC_ARG_ENABLE(assertions,
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
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
;;
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
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*)
- if x$enable_cxx11 = xyes; then
+ 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*)
dnl Note that this will define __GXX_EXPERIMENTAL_CXX0X__.
dnl The source code relies on that.
- AM_CXXFLAGS="$AM_CXXFLAGS -std=c++0x";;
+ AM_CPPFLAGS="$AM_CPPFLAGS -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.
- AM_CXXFLAGS="$AM_CXXFLAGS -std=c++11 -Wno-deprecated-register";;
+ AM_CPPFLAGS="$AM_CPPFLAGS -std=c++11"
+ AM_CXXFLAGS="$AM_CXXFLAGS -Wno-deprecated-register";;
*)
AS_CASE([$host], [*cygwin*],
- [AM_CXXFLAGS="$AM_CXXFLAGS -std=gnu++11"],
- [AM_CXXFLAGS="$AM_CXXFLAGS -std=c++11"]);;
+ [AM_CPPFLAGS="$AM_CPPFLAGS -std=gnu++11"],
+ [AM_CPPFLAGS="$AM_CPPFLAGS -std=c++11"]);;
esac
fi
+fi
- LYX_CXX_CXX11
- if test $lyx_use_cxx11 = 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 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=yes ;;
- esac
- else
- lyx_std_regex=yes
- fi
-
- if test $lyx_std_regex = yes ; then
- lyx_flags="$lyx_flags stdregex"
- 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
+])
dnl Usage: LYX_USE_INCLUDED_BOOST : select if the included boost should
dnl be used.
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
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)
projects / lyx.git / blobdiff