explicitly test for boost/make_shared.hpp (credits Steffen Müthing)

[[Imported from SVN: r6352]]

dune/common/shared_ptr.hh

@@ -14,8 +14,10 @@
 #endif
 #if defined HAVE_BOOST_SHARED_PTR_HPP
 # include <boost/shared_ptr.hpp>
+#if defined HAVE_BOOST_MAKE_SHARED_HPP
 # include <boost/make_shared.hpp>
 #endif
+#endif
 
 #include <dune/common/nullptr.hh>
 #include <dune/common/typetraits.hh>
@@ -302,7 +304,8 @@ namespace Dune
 
   // C++0x and Boost have a make_shared implementation, TR1 does not.
   // Unfortunately, TR1 gets picked over Boost if present.
-#if HAVE_MEMORY || (HAVE_BOOST_SHARED_PTR_HPP && !HAVE_TR1_MEMORY)
+  // Moreover, boost::make_shared() only exists for (remotely) recent versions of Boost.
+#if HAVE_MEMORY || (HAVE_BOOST_SHARED_PTR_HPP && HAVE_BOOST_MAKE_SHARED_HPP && !HAVE_TR1_MEMORY)
   using SHARED_PTR_NAMESPACE :: make_shared;
 #else
 

m4/Makefile.am

@@ -38,6 +38,7 @@ ALLM4S = 					\
 	immdx_lib_metis.m4			\
 	inkscape.m4				\
 	libtoolcompat.m4			\
+	make_shared.m4				\
 	mpi-config.m4				\
 	opengl.m4				\
 	pardiso.m4				\

m4/dune_common.m4

@@ -22,6 +22,7 @@ AC_DEFUN([DUNE_COMMON_CHECKS],
   AC_REQUIRE([STATIC_ASSERT_CHECK])
   AC_REQUIRE([NULLPTR_CHECK])
   AC_REQUIRE([SHARED_PTR])
+  AC_REQUIRE([BOOST_MAKE_SHARED_HPP])
   AC_REQUIRE([DUNE_LINKCXX])
   AC_REQUIRE([DUNE_CHECKDEPRECATED])
   AC_REQUIRE([DUNE_SET_MINIMAL_DEBUG_LEVEL])