dnl Usage: LYX_CHECK_WARNINGS Displays a warning message if a LYX_WARNING
-dnl has occured previously.
+dnl has occurred previously.
AC_DEFUN([LYX_CHECK_WARNINGS],[
if test x$lyx_warning = xyes; then
cat <<EOF
])
+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],
+[AC_CACHE_CHECK([whether STL is libstdc++ using the C++11 ABI],
+ [lyx_cv_lib_stdcxx_cxx11_abi],
+[AC_TRY_COMPILE([#include<vector>], [
+#if ! defined(_GLIBCXX_USE_CXX11_ABI) || ! _GLIBCXX_USE_CXX11_ABI
+ this is not libstdc++ using the C++11 ABI
+#endif
+],
+[lyx_cv_lib_stdcxx_cxx11_abi=yes], [lyx_cv_lib_stdcxx_cxx11_abi=no])])
+])
+
+
AC_DEFUN([LYX_PROG_CXX],
[AC_REQUIRE([AC_PROG_CXX])
AC_REQUIRE([AC_PROG_CXXCPP])
+
AC_LANG_PUSH(C++)
LYX_PROG_CLANG
LYX_LIB_STDCXX
+LYX_LIB_STDCXX_CXX11_ABI
AC_LANG_POP(C++)
if test $lyx_cv_lib_stdcxx = "yes" ; then
- AC_DEFINE(STD_STRING_USES_COW, 1, [std::string uses copy-on-write])
+ if test $lyx_cv_lib_stdcxx_cxx11_abi = "yes" ; then
+ AC_DEFINE(USE_GLIBCXX_CXX11_ABI, 1, [use GNU libstdc++ with C++11 ABI])
+ else
+ AC_DEFINE(STD_STRING_USES_COW, 1, [std::string uses copy-on-write])
+ fi
else
if test $lyx_cv_prog_clang = "yes" ; then
AC_DEFINE(USE_LLVM_LIBCPP, 1, [use libc++ provided by llvm instead of GNU libstdc++])
AM_CXXFLAGS="-g $AM_CXXFLAGS"
fi
if test $build_type = gprof ; then
- AM_CXXFLAGS="-pg $AM_CXXFLAGS"
- AM_LDFLAGS="-pg $AM_LDFLAGS"
+ AM_CXXFLAGS="$AM_CXXFLAGS -pg"
+ AM_LDFLAGS="$AM_LDFLAGS -pg"
fi
if test $build_type = profiling ; then
AM_CXXFLAGS="$AM_CXXFLAGS -fno-omit-frame-pointer"
dnl Warnings are for preprocessor too
if test x$enable_warnings = xyes ; then
case $gxx_version in
- 3.1*|3.2*|3.3*)
- AM_CPPFLAGS="-W -Wall $AM_CPPFLAGS"
- ;;
- 3.4*|4.0*|4.1*|4.2*|4.3*|4.4*|4.5*|4.6*|4.7*|4.8*|clang)
- AM_CPPFLAGS="-Wextra -Wall $AM_CPPFLAGS"
+ 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="-Wextra -Wall -Wfloat-conversion $AM_CPPFLAGS"
+ AM_CPPFLAGS="$AM_CPPFLAGS -Wall -Wextra -Wfloat-conversion"
;;
esac
fi
case $gxx_version in
- 3.1*) AM_CXXFLAGS="-finline-limit=500 ";;
- 3.2*|3.3*) AM_CXXFLAGS="";;
- 3.4*|4.*)
- AM_CXXFLAGS=""
- test $enable_pch = yes && lyx_pch_comp=yes
- ;;
+ 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
dnl See http://clang-developers.42468.n3.nabble.com/libc-debug-mode-td3336742.html
case $gxx_version in
- 3.1*|3.2*|3.3*) ;;
*)
lyx_flags="$lyx_flags stdlib-debug"
AC_DEFINE(_GLIBCXX_DEBUG, 1, [libstdc++ debug mode])
fi
if test x$enable_concept_checks = xyes ; then
case $gxx_version in
- 3.3*)
+ 4.*)
lyx_flags="$lyx_flags concept-checks"
dnl FIXME check whether this makes sense with clang/libc++
- AC_DEFINE(_GLIBCPP_CONCEPT_CHECKS, 1, [libstdc++ concept checking])
- ;;
- 3.4*|4.*)
- lyx_flags="$lyx_flags concept-checks"
AC_DEFINE(_GLIBCXX_CONCEPT_CHECKS, 1, [libstdc++ concept checking])
;;
esac
fi
if test x$enable_cxx11 = xyes ; then
case $gxx_version in
- 3.*|4.0*|4.1*|4.2*) AC_ERROR([There is no C++11 support in gcc 3.x]);;
+ 4.0*|4.1*|4.2*) AC_ERROR([There is no C++11 support in gcc 4.2 or older]);;
4.3*|4.4*|4.5*|4.6*)
- lyx_flags="$lyx_flags c++11-mode"
- AM_CXXFLAGS="-std=gnu++0x $AM_CXXFLAGS";;
+ LYX_CXX_USE_CXX11(gnu++0x);;
clang)
dnl presumably all clang version support c++11.
- lyx_flags="$lyx_flags c++11-mode"
dnl the deprecated-register warning is very annoying with Qt4.x right now.
- AM_CXXFLAGS="-std=c++11 -Wno-deprecated-register $AM_CXXFLAGS";;
+ LYX_CXX_USE_CXX11(c++11 -Wno-deprecated-register);;
*)
- lyx_flags="$lyx_flags c++11-mode"
- AM_CXXFLAGS="-std=gnu++11 $AM_CXXFLAGS"
- ;;
+ LYX_CXX_USE_CXX11(gnu++11);;
esac
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
- 3.*|4.0*|4.1*|4.2*|4.3*|4.4*|4.5*|4.6*|4.7*|4.8*) ;;
+ 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
;;