From f6fec655049340fc051414abd01378b98794f9c9 Mon Sep 17 00:00:00 2001
From: Pieter Lexis <pieter.lexis@powerdns.com>
Date: Mon, 12 Sep 2016 13:48:47 +0200
Subject: [PATCH] Revert "Rec: support boost's fcontext in boost 1.61+"

This reverts commit a30361f9f07cb3c4f9ad32dc83555bc593aa3311.

(cherry picked from commit f103e371bd83381feb11dba742843484bf8e95f2)
---
 pdns/mtasker_fcontext.cc       |  4 ----
 pdns/recursordist/configure.ac | 12 +++---------
 2 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/pdns/mtasker_fcontext.cc b/pdns/mtasker_fcontext.cc
index bc37e769f..1b2a11be2 100644
--- 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 fe5e62561..6918ce3ab 100644
--- 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"
-- 
2.40.0