X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=config%2Flyxinclude.m4;h=4fb2a8d44ea0d4107d99dedfe692c45d1313acc5;hb=69eb262721b4454fe7af683adca502451098f7fb;hp=0e9ff19b5bb8d5854aa8ef7cba2306ed2c57782f;hpb=bda45704005d6b328e18457a07d05e56883c2874;p=features.git

diff --git a/config/lyxinclude.m4 b/config/lyxinclude.m4
index 0e9ff19b5b..4fb2a8d44e 100644
--- a/config/lyxinclude.m4
+++ b/config/lyxinclude.m4
@@ -386,7 +386,7 @@ if test x$GXX = xyes; then
       AC_LANG_POP(C++)
     fi
   case $gxx_version in
-      2.*|3.*|4.@<:@0-8@:>@) AC_MSG_ERROR([gcc >= 4.9 is required]);;
+      2.*|3.*|4.@<:@0-8@:>@*) AC_MSG_ERROR([gcc >= 4.9 is required]);;
   esac
   if test x$enable_stdlib_debug = xyes ; then
     dnl FIXME: for clang/libc++, one should define _LIBCPP_DEBUG2=0
@@ -454,6 +454,18 @@ AC_DEFUN([LYX_USE_INCLUDED_BOOST],[
 	    [lyx_cv_with_included_boost=no])
 	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 = xno ; then
+	    AC_LANG_PUSH(C++)
+	    AC_MSG_CHECKING([for boost library])
+	    AC_LINK_IFELSE(
+		[AC_LANG_PROGRAM([#include <boost/crc.hpp>],
+		    [boost::crc_32_type crc;])],
+		[AC_MSG_RESULT([yes])],
+		[AC_MSG_RESULT([no])
+		lyx_cv_with_included_boost=yes
+	    ])
+	    AC_LANG_POP(C++)
+	fi
 	if test x$lyx_cv_with_included_boost = xyes ; then
 	    lyx_included_libs="$lyx_included_libs boost"
 	    BOOST_INCLUDES='-I$(top_srcdir)/3rdparty/boost'