#endif
],
[lyx_cv_prog_clang=yes ; CLANG=yes], [lyx_cv_prog_clang=no ; CLANG=no])])
+if test $CLANG = yes ; then
+ AC_CACHE_CHECK([for clang version],
+ [lyx_cv_clang_version],
+ [clang_noversion=no
+ AC_COMPUTE_INT(clang_major,__clang_major__,,[clang_noversion_=yes])
+ AC_COMPUTE_INT(clang_minor,__clang_minor__,,[clang_noversion_=yes])
+ AC_COMPUTE_INT(clang_patchlevel,__clang_patchlevel__,,[clang_noversion_=yes])
+ if test $clang_noversion = yes ; then
+ clang_version=unknown
+ else
+ clang_version=$clang_major.$clang_minor.$clang_patchlevel
+ fi
+ lyx_cv_clang_version=$clang_version])
+fi
])
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.3*|4.4*|4.5*|4.6*|4.7*|4.8*) lyx_std_regex=no ;;
+ 4.6*|4.7*|4.8*) lyx_std_regex=no ;;
*) ;;
esac
fi
gxx_version=`${CXX} -dumpversion`
CXX_VERSION="($gxx_version)"
else
- gxx_version=clang
+ gxx_version=clang-$clang_version
+ CXX_VERSION="($clang_version)"
fi
AM_CXXFLAGS="$lyx_optim"
AM_CPPFLAGS="$AM_CPPFLAGS -Wall -Wextra"
fi
case $gxx_version in
- 2.*|3.*) AC_ERROR([gcc >= 4.3 is required]);;
- 4.0*|4.1*|4.2*) AC_ERROR([gcc >= 4.3 is required]);;
+ 2.*|3.*) AC_ERROR([gcc >= 4.6 is required]);;
+ 4.0*|4.1*|4.2*|4.3*|4.4*|4.5*) AC_ERROR([gcc >= 4.6 is required]);;
esac
if test x$enable_stdlib_debug = xyes ; then
dnl FIXME: for clang/libc++, one should define _LIBCPP_DEBUG2=0
esac
fi
case $gxx_version in
- 4.3*|4.4*|4.5*|4.6*)
+ 4.6*)
dnl Note that this will define __GXX_EXPERIMENTAL_CXX0X__.
dnl The source code relies on that.
cxx11_flags="-std=c++0x";;
- clang)
+ clang-3.0*|clang-3.1*|clang-3.2*|clang-3.3*)
dnl presumably all clang versions support c++11.
- dnl the deprecated-register warning is very annoying with Qt4.x right now.
+ dnl boost contains pragmas that are annoying on older clang versions
+ cxx11_flags="-std=c++11 -Wno-unknown-pragmas";;
+ clang*)
+ dnl the more recent versions support the deprecated-register warning,
+ dnl which is very annoying with Qt4.x right now.
cxx11_flags="-std=c++11"
AM_CXXFLAGS="$AM_CXXFLAGS -Wno-deprecated-register";;
*)
AC_MSG_RESULT([$lyx_cv_with_included_boost])
if test x$lyx_cv_with_included_boost = xyes ; then
BOOST_INCLUDES='-I$(top_srcdir)/3rdparty/boost'
- BOOST_LIBS='$(top_builddir)/3rdparty/boost/liblyxboost.a'
+ if test $lyx_std_regex = yes ; then
+ BOOST_LIBS=""
+ else
+ BOOST_LIBS='$(top_builddir)/3rdparty/boost/liblyxboost.a'
+ fi
else
BOOST_INCLUDES=
if test $lyx_std_regex = yes ; then