Revert "Rec: support boost's fcontext in boost 1.61+"

This reverts commit a30361f9f07cb3c4f9ad32dc83555bc593aa3311.

(cherry picked from commit f103e371bd83381feb11dba742843484bf8e95f2)

diff --git a/pdns/mtasker_fcontext.cc b/pdns/mtasker_fcontext.cc
index bc37e769f1f007d4c8621b2a7162ee99ff4ba8c5..1b2a11be266fbcea339e239c3486512b8edc02b0 100644 (file)
--- a/pdns/mtasker_fcontext.cc
+++ b/pdns/mtasker_fcontext.cc
@@ -23,11 +23,7 @@
 #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 fe5e6256121c6f0edd856ab27cbaee2d721299cb..6918ce3ab28bd0552982425af957461769d062d1 100644 (file)
--- a/pdns/recursordist/configure.ac
+++ b/pdns/recursordist/configure.ac
@@ -55,15 +55,9 @@ AC_DEFUN([PDNS_SELECT_CONTEXT_IMPL], [
       LDFLAGS="$LDFLAGS $BOOST_THREAD_LDFLAGS"
     fi
     AC_MSG_NOTICE([checking whether the Boost context library actually links...])
-    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
+    BOOST_FIND_HEADER([boost/context/fcontext.hpp], [ : ], [
+      BOOST_FIND_LIB([context], [$1], [boost/context/fcontext.hpp], [[]])
+    ])
     case $boost_cv_lib_context in
       (yes)
         pdns_context_library="Boost context"