Rec: support boost's fcontext in boost 1.61+

diff --git a/pdns/mtasker_fcontext.cc b/pdns/mtasker_fcontext.cc
index 1b2a11be266fbcea339e239c3486512b8edc02b0..bc37e769f1f007d4c8621b2a7162ee99ff4ba8c5 100644 (file)
--- a/pdns/mtasker_fcontext.cc
+++ b/pdns/mtasker_fcontext.cc
@@ -23,7 +23,11 @@
 #include <exception>
 #include <cassert>
 #include <type_traits>
+#if BOOST_VERSION > 106100
+#include <boost/context/detail/fcontext.hpp>
+#else
 #include <boost/context/fcontext.hpp>
+#endif
 #include <boost/version.hpp>
 
 using boost::context::make_fcontext;

diff --git a/pdns/recursordist/configure.ac b/pdns/recursordist/configure.ac
index 19ad1133c812b8b8c8ace8aa1855f04c2802042b..1d1500f0f301dc7082c4499db6646e9f0fd750aa 100644 (file)
--- a/pdns/recursordist/configure.ac
+++ b/pdns/recursordist/configure.ac
@@ -54,9 +54,15 @@ AC_DEFUN([PDNS_SELECT_CONTEXT_IMPL], [
       LDFLAGS="$LDFLAGS $BOOST_THREAD_LDFLAGS"
     fi
     AC_MSG_NOTICE([checking whether the Boost context library actually links...])
-    BOOST_FIND_HEADER([boost/context/fcontext.hpp], [ : ], [
-      BOOST_FIND_LIB([context], [$1], [boost/context/fcontext.hpp], [[]])
-    ])
+    if test $boost_major_version -ge 161; then
+      BOOST_FIND_HEADER([boost/context/detail/fcontext.hpp], [ : ], [
+        BOOST_FIND_LIB([context], [$1], [boost/context/detail/fcontext.hpp], [[]])
+      ])
+    else
+      BOOST_FIND_HEADER([boost/context/fcontext.hpp], [ : ], [
+        BOOST_FIND_LIB([context], [$1], [boost/context/fcontext.hpp], [[]])
+      ])
+    fi
     case $boost_cv_lib_context in
       (yes)
         AC_MSG_NOTICE([MTasker will use the Boost context library for context switching])