commit 8d0d3ea0905172b4a1fba7fbfadba83ff61671c6
Author: Jean-Marc Lasgouttes <lasgout...@lyx.org>
Date: Sun Dec 20 19:26:01 2020 +0100
Autoconf: use included boost when system boost is not available
---
config/lyxinclude.m4 | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/config/lyxinclude.m4 b/config/lyxinclude.m4
index 0e9ff19..6053a57 100644
--- a/config/lyxinclude.m4
+++ b/config/lyxinclude.m4
@@ -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'
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
