respect the --disable-tr1-headers configure flag in the shared_ptr check as

well.

[[Imported from SVN: r5915]]

m4/Makefile.am

@@ -20,6 +20,7 @@ ALLM4S = 					\
 	dune_linkcxx.m4				\
 	dune_mpi.m4				\
 	dune_streams.m4				\
+	dune_tr1_headers.m4			\
 	f5.m4					\
 	fortran_overwrite.m4			\
 	gmp.m4					\

m4/dune_common.m4

@@ -27,6 +27,7 @@ AC_DEFUN([DUNE_COMMON_CHECKS],
   AC_REQUIRE([DUNE_MPI])
   AC_REQUIRE([DUNE_EXPRTMPL])
   AC_REQUIRE([DUNE_DEV_MODE])
+  AC_REQUIRE([DUNE_TR1_HEADERS])
 
   dnl check for programs
   AC_REQUIRE([AC_PROG_CC])
@@ -46,15 +47,6 @@ AC_DEFUN([DUNE_COMMON_CHECKS],
 
   AC_CHECK_HEADERS([malloc.h string.h])
 
-  # Allow disabling tr1 headers. E.g. needed for broken xlc on Blue Gene
-  AC_ARG_ENABLE(tr1-headers, 
-	AS_HELP_STRING([--disable-tr1-headers],
-	[Prevents checking for  tr1 headers like tuple, array, etc. 
-	This might be needed for broken compilers like xlc on Blue Gene]))
-  AS_IF([test "x$enable_tr1_headers" != "xno"],[
-	  AC_CHECK_HEADERS([type_traits tr1/type_traits array tr1/array tuple tr1/tuple])
-  ])
-  
   AC_LANG_POP([C++])
 
   dnl checks for typedefs, structures, and compiler characteristics.

m4/dune_tr1_headers.m4

+## -*- autoconf -*-
+AC_DEFUN([DUNE_TR1_HEADERS], [
+  # Allow disabling tr1 headers. E.g. needed for broken xlc on Blue Gene
+  AC_LANG_PUSH([C++])
+  AC_ARG_ENABLE([tr1-headers], 
+    [AS_HELP_STRING([--disable-tr1-headers],
+      [Prevents checking for  tr1 headers like tuple, array, etc. 
+       This might be needed for broken compilers like xlc on Blue Gene])],
+    [],
+    [enable_tr_headers=yes])
+  AS_IF([test "x$enable_tr1_headers" != "xno"],
+    [AC_CHECK_HEADERS([type_traits tr1/type_traits array tr1/array tuple tr1/tuple])])
+  AC_LANG_POP([C++])
+])

m4/shared_ptr.m4

@@ -19,8 +19,11 @@ dnl
 
 AC_DEFUN([SHARED_PTR],[
 dnl  AC_REQUIRE([PANDORA_CHECK_CXX_STANDARD])
+  AC_REQUIRE([DUNE_TR1_HEADERS])
   AC_LANG_PUSH(C++)
-  AC_CHECK_HEADERS(memory tr1/memory boost/shared_ptr.hpp)
+  AS_IF([test "x$enable_tr1_headers" != "xno"],
+    [AC_CHECK_HEADERS([memory tr1/memory])])
+  AC_CHECK_HEADERS([boost/shared_ptr.hpp])
   AC_CACHE_CHECK([the location of shared_ptr header file],
     [ac_cv_shared_ptr_h],[
       for namespace in std tr1 std::tr1 boost