From 233bcfe1d82a7a9a67b57b8d79aab6e517ce9651 Mon Sep 17 00:00:00 2001
From: jzmaddock <john@johnmaddock.co.uk>
Date: Thu, 1 Aug 2019 19:21:32 +0100
Subject: [PATCH] pFq: simplify Jamfile.  Fix instantiate.hpp.

---
 test/Jamfile.v2                   | 4 +---
 test/compile_test/instantiate.hpp | 2 ++
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/Jamfile.v2 b/test/Jamfile.v2
index c9640a289..413a628d8 100644
--- a/test/Jamfile.v2
+++ b/test/Jamfile.v2
@@ -90,8 +90,6 @@ explicit ntl ;
 cpp-pch pch : pch.hpp : <use>../../test/build//boost_unit_test_framework ;
 cpp-pch pch_light : pch_light.hpp : <use>../../test/build//boost_unit_test_framework ;
 lib compile_test_main : compile_test/main.cpp ;
-lib gmp : : <search>$(gmp_path) ;
-lib mpfr : : <search>$(gmp_path) <search>$(mpfr_path) <search>$(mpfr_path)/build.vc10/lib/Win32/Debug ;
 
 test-suite special_fun :
    [ run test_1F0.cpp ../../test/build//boost_unit_test_framework : : : [ requires cxx11_auto_declarations cxx11_lambdas cxx11_unified_initialization_syntax cxx11_smart_ptr ] ] # hypergeometric_pFq_checked_series.hpp uses auto, the rest are from quadrature tests.
@@ -1313,7 +1311,7 @@ test-suite long-running-tests :
    [ run test_1F1_log.cpp ../../test/build//boost_unit_test_framework : : : release [ requires cxx11_auto_declarations cxx11_lambdas cxx11_unified_initialization_syntax cxx11_smart_ptr ] <define>TEST=7 release <toolset>clang:<cxxflags>-Wno-literal_range : test_1F1_log_dec_40 ]
    [ run test_pFq.cpp ../../test/build//boost_unit_test_framework : : : [ requires cxx11_hdr_initializer_list cxx11_auto_declarations cxx11_lambdas cxx11_unified_initialization_syntax cxx11_smart_ptr ] <define>TEST=6 release [ check-target-builds ../config//has_float128 "GCC libquadmath and __float128 support" : <define>BOOST_MATH_TEST_FLOAT128 <linkflags>"-Bstatic -lquadmath -Bdynamic" ] <toolset>clang:<cxxflags>-Wno-literal_range : test_pFq_quad ]
    [ run test_pFq.cpp ../../test/build//boost_unit_test_framework : : : [ requires cxx11_hdr_initializer_list cxx11_auto_declarations cxx11_lambdas cxx11_unified_initialization_syntax cxx11_smart_ptr ] <define>TEST=7 release <toolset>clang:<cxxflags>-Wno-literal_range : test_pFq_dec_40 ]
-   [ run test_pFq_precision.cpp ../../test/build//boost_unit_test_framework gmp mpfr : : : [ check-target-builds ../config//has_mpfr : : <build>no ] [ requires cxx11_hdr_initializer_list cxx11_auto_declarations cxx11_lambdas cxx11_unified_initialization_syntax cxx11_smart_ptr ] release <toolset>clang:<cxxflags>-Wno-literal_range ]
+   [ run test_pFq_precision.cpp ../../test/build//boost_unit_test_framework gmp mpfr : : : <linkflags>-lgmp <linkflags>-lmpfr [ check-target-builds ../config//has_mpfr : : <build>no ] [ requires cxx11_hdr_initializer_list cxx11_auto_declarations cxx11_lambdas cxx11_unified_initialization_syntax cxx11_smart_ptr ] release <toolset>clang:<cxxflags>-Wno-literal_range ]
    [ run test_constant_generate.cpp : : : release <define>USE_CPP_FLOAT=1 <exception-handling>off:<build>no  ]
 ;
 
diff --git a/test/compile_test/instantiate.hpp b/test/compile_test/instantiate.hpp
index 6ed906248..9492bda5c 100644
--- a/test/compile_test/instantiate.hpp
+++ b/test/compile_test/instantiate.hpp
@@ -333,7 +333,9 @@ void instantiate(RealType)
    boost::math::hypergeometric_2F0(v1, v2, v3);
 #if !defined(BOOST_NO_CXX11_DECLTYPE) && !defined(BOOST_NO_CXX11_AUTO_DECLARATIONS) && !defined(BOOST_NO_CXX11_HDR_ARRAY) && !defined(BOOST_NO_CXX11_HDR_TUPLE)
    boost::math::hypergeometric_1F1(v1, v2, v3);
+#ifndef BOOST_NO_CXX11_HDR_INITIALIZER_LIST
    boost::math::hypergeometric_pFq({ v1 }, { v2 }, v3);
+#endif
 #endif
 
    boost::math::expint(v1);