prevnt using tbb:thread when TBB configuration has failed

colibius · Mar 11, 2013 · 055e8cf · 055e8cf
1 parent 88e0f46
commit 055e8cf
Show file tree

Hide file tree

Showing 78 changed files with 91 additions and 0 deletions.
diff --git a/Makefile.in b/Makefile.in
@@ -4147,6 +4147,7 @@ datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 enablelegacyincludepaths = @enablelegacyincludepaths@
+enablepetsc = @enablepetsc@
 exec_prefix = @exec_prefix@
 gitquery = @gitquery@
 have_gcov = @have_gcov@

diff --git a/configure b/configure
@@ -799,6 +799,7 @@ SLEPC_INCLUDE
 SLEPC_DIR
 LIBMESH_ENABLE_PETSC_FALSE
 LIBMESH_ENABLE_PETSC_TRUE
+enablepetsc
 MPI_INCLUDES_PATHS
 MPI_INCLUDES_PATH
 MPI_LIBS_PATHS
@@ -29074,6 +29075,8 @@ fi
     fi
   fi
 
+
+
 if (test $enablempi != no) ; then
   libmesh_optional_INCLUDES="$MPI_INCLUDES_PATHS $libmesh_optional_INCLUDES"
   libmesh_optional_LIBS="$MPI_LIBS_PATHS $MPI_LIBS $libmesh_optional_LIBS"
@@ -30071,6 +30074,12 @@ CXXFLAGS="$saveCXXFLAGS"
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_tbb_cxx_thread" >&5
 $as_echo "$ac_cv_tbb_cxx_thread" >&6; }
+
+# if we don't have functioning TBB avoid a false positive
+if test "x$enabletbb" = "xno"; then
+  ac_cv_tbb_cxx_thread=no
+fi
+
 if test "$ac_cv_tbb_cxx_thread" = yes; then
 
 $as_echo "#define HAVE_TBB_CXX_THREAD 1" >>confdefs.h

diff --git a/contrib/Makefile.in b/contrib/Makefile.in
@@ -598,6 +598,7 @@ datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 enablelegacyincludepaths = @enablelegacyincludepaths@
+enablepetsc = @enablepetsc@
 exec_prefix = @exec_prefix@
 gitquery = @gitquery@
 have_gcov = @have_gcov@

diff --git a/contrib/boost/include/Makefile.in b/contrib/boost/include/Makefile.in
@@ -634,6 +634,7 @@ datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 enablelegacyincludepaths = @enablelegacyincludepaths@
+enablepetsc = @enablepetsc@
 exec_prefix = @exec_prefix@
 gitquery = @gitquery@
 have_gcov = @have_gcov@

diff --git a/contrib/eigen/3.1.2/Makefile.in b/contrib/eigen/3.1.2/Makefile.in
@@ -379,6 +379,7 @@ datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 enablelegacyincludepaths = @enablelegacyincludepaths@
+enablepetsc = @enablepetsc@
 exec_prefix = @exec_prefix@
 gitquery = @gitquery@
 have_gcov = @have_gcov@

diff --git a/contrib/exodusii/5.22b/exodus/cbind/Makefile.in b/contrib/exodusii/5.22b/exodus/cbind/Makefile.in
@@ -1996,6 +1996,7 @@ datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 enablelegacyincludepaths = @enablelegacyincludepaths@
+enablepetsc = @enablepetsc@
 exec_prefix = @exec_prefix@
 gitquery = @gitquery@
 have_gcov = @have_gcov@

diff --git a/contrib/exodusii/5.22b/nemesis/Makefile.in b/contrib/exodusii/5.22b/nemesis/Makefile.in
@@ -435,6 +435,7 @@ datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 enablelegacyincludepaths = @enablelegacyincludepaths@
+enablepetsc = @enablepetsc@
 exec_prefix = @exec_prefix@
 gitquery = @gitquery@
 have_gcov = @have_gcov@

diff --git a/contrib/exodusii/Lib/Makefile.in b/contrib/exodusii/Lib/Makefile.in
@@ -1121,6 +1121,7 @@ datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 enablelegacyincludepaths = @enablelegacyincludepaths@
+enablepetsc = @enablepetsc@
 exec_prefix = @exec_prefix@
 gitquery = @gitquery@
 have_gcov = @have_gcov@

diff --git a/contrib/fparser/Makefile.in b/contrib/fparser/Makefile.in
@@ -571,6 +571,7 @@ datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 enablelegacyincludepaths = @enablelegacyincludepaths@
+enablepetsc = @enablepetsc@
 exec_prefix = @exec_prefix@
 gitquery = @gitquery@
 have_gcov = @have_gcov@

diff --git a/contrib/fparser/extrasrc/Makefile.in b/contrib/fparser/extrasrc/Makefile.in
@@ -348,6 +348,7 @@ datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 enablelegacyincludepaths = @enablelegacyincludepaths@
+enablepetsc = @enablepetsc@
 exec_prefix = @exec_prefix@
 gitquery = @gitquery@
 have_gcov = @have_gcov@

diff --git a/contrib/gmv/Makefile.in b/contrib/gmv/Makefile.in
@@ -430,6 +430,7 @@ datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 enablelegacyincludepaths = @enablelegacyincludepaths@
+enablepetsc = @enablepetsc@
 exec_prefix = @exec_prefix@
 gitquery = @gitquery@
 have_gcov = @have_gcov@

diff --git a/contrib/gzstream/Makefile.in b/contrib/gzstream/Makefile.in
@@ -452,6 +452,7 @@ datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 enablelegacyincludepaths = @enablelegacyincludepaths@
+enablepetsc = @enablepetsc@
 exec_prefix = @exec_prefix@
 gitquery = @gitquery@
 have_gcov = @have_gcov@

diff --git a/contrib/laspack/Makefile.in b/contrib/laspack/Makefile.in
@@ -490,6 +490,7 @@ datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 enablelegacyincludepaths = @enablelegacyincludepaths@
+enablepetsc = @enablepetsc@
 exec_prefix = @exec_prefix@
 gitquery = @gitquery@
 have_gcov = @have_gcov@

diff --git a/contrib/libHilbert/Makefile.in b/contrib/libHilbert/Makefile.in
@@ -493,6 +493,7 @@ datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 enablelegacyincludepaths = @enablelegacyincludepaths@
+enablepetsc = @enablepetsc@
 exec_prefix = @exec_prefix@
 gitquery = @gitquery@
 have_gcov = @have_gcov@

diff --git a/contrib/metis/Makefile.in b/contrib/metis/Makefile.in
@@ -691,6 +691,7 @@ datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 enablelegacyincludepaths = @enablelegacyincludepaths@
+enablepetsc = @enablepetsc@
 exec_prefix = @exec_prefix@
 gitquery = @gitquery@
 have_gcov = @have_gcov@

diff --git a/contrib/nanoflann/Makefile.in b/contrib/nanoflann/Makefile.in
@@ -460,6 +460,7 @@ datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 enablelegacyincludepaths = @enablelegacyincludepaths@
+enablepetsc = @enablepetsc@
 exec_prefix = @exec_prefix@
 gitquery = @gitquery@
 have_gcov = @have_gcov@

diff --git a/contrib/nemesis/Lib/Makefile.in b/contrib/nemesis/Lib/Makefile.in
@@ -590,6 +590,7 @@ datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 enablelegacyincludepaths = @enablelegacyincludepaths@
+enablepetsc = @enablepetsc@
 exec_prefix = @exec_prefix@
 gitquery = @gitquery@
 have_gcov = @have_gcov@

diff --git a/contrib/netcdf/Lib/Makefile.in b/contrib/netcdf/Lib/Makefile.in
@@ -493,6 +493,7 @@ datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 enablelegacyincludepaths = @enablelegacyincludepaths@
+enablepetsc = @enablepetsc@
 exec_prefix = @exec_prefix@
 gitquery = @gitquery@
 have_gcov = @have_gcov@

diff --git a/contrib/parmetis/Makefile.in b/contrib/parmetis/Makefile.in
@@ -581,6 +581,7 @@ datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 enablelegacyincludepaths = @enablelegacyincludepaths@
+enablepetsc = @enablepetsc@
 exec_prefix = @exec_prefix@
 gitquery = @gitquery@
 have_gcov = @have_gcov@

diff --git a/contrib/sfcurves/Makefile.in b/contrib/sfcurves/Makefile.in
@@ -440,6 +440,7 @@ datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 enablelegacyincludepaths = @enablelegacyincludepaths@
+enablepetsc = @enablepetsc@
 exec_prefix = @exec_prefix@
 gitquery = @gitquery@
 have_gcov = @have_gcov@

diff --git a/contrib/tecplot/binary/Makefile.in b/contrib/tecplot/binary/Makefile.in
@@ -425,6 +425,7 @@ datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 enablelegacyincludepaths = @enablelegacyincludepaths@
+enablepetsc = @enablepetsc@
 exec_prefix = @exec_prefix@
 gitquery = @gitquery@
 have_gcov = @have_gcov@

diff --git a/contrib/tecplot/tecio/Makefile.in b/contrib/tecplot/tecio/Makefile.in
@@ -574,6 +574,7 @@ datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 enablelegacyincludepaths = @enablelegacyincludepaths@
+enablepetsc = @enablepetsc@
 exec_prefix = @exec_prefix@
 gitquery = @gitquery@
 have_gcov = @have_gcov@

diff --git a/contrib/tetgen/Makefile.in b/contrib/tetgen/Makefile.in
@@ -460,6 +460,7 @@ datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 enablelegacyincludepaths = @enablelegacyincludepaths@
+enablepetsc = @enablepetsc@
 exec_prefix = @exec_prefix@
 gitquery = @gitquery@
 have_gcov = @have_gcov@

diff --git a/contrib/triangle/Makefile.in b/contrib/triangle/Makefile.in
@@ -460,6 +460,7 @@ datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 enablelegacyincludepaths = @enablelegacyincludepaths@
+enablepetsc = @enablepetsc@
 exec_prefix = @exec_prefix@
 gitquery = @gitquery@
 have_gcov = @have_gcov@

diff --git a/examples/Makefile.in b/examples/Makefile.in
@@ -416,6 +416,7 @@ datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 enablelegacyincludepaths = @enablelegacyincludepaths@
+enablepetsc = @enablepetsc@
 exec_prefix = @exec_prefix@
 gitquery = @gitquery@
 have_gcov = @have_gcov@

diff --git a/examples/adaptivity/adaptivity_ex1/Makefile.in b/examples/adaptivity/adaptivity_ex1/Makefile.in
@@ -495,6 +495,7 @@ datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 enablelegacyincludepaths = @enablelegacyincludepaths@
+enablepetsc = @enablepetsc@
 exec_prefix = @exec_prefix@
 gitquery = @gitquery@
 have_gcov = @have_gcov@

diff --git a/examples/adaptivity/adaptivity_ex2/Makefile.in b/examples/adaptivity/adaptivity_ex2/Makefile.in
@@ -509,6 +509,7 @@ datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 enablelegacyincludepaths = @enablelegacyincludepaths@
+enablepetsc = @enablepetsc@
 exec_prefix = @exec_prefix@
 gitquery = @gitquery@
 have_gcov = @have_gcov@

diff --git a/examples/adaptivity/adaptivity_ex3/Makefile.in b/examples/adaptivity/adaptivity_ex3/Makefile.in
@@ -501,6 +501,7 @@ datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 enablelegacyincludepaths = @enablelegacyincludepaths@
+enablepetsc = @enablepetsc@
 exec_prefix = @exec_prefix@
 gitquery = @gitquery@
 have_gcov = @have_gcov@

diff --git a/examples/adaptivity/adaptivity_ex4/Makefile.in b/examples/adaptivity/adaptivity_ex4/Makefile.in
@@ -500,6 +500,7 @@ datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 enablelegacyincludepaths = @enablelegacyincludepaths@
+enablepetsc = @enablepetsc@
 exec_prefix = @exec_prefix@
 gitquery = @gitquery@
 have_gcov = @have_gcov@

diff --git a/examples/adaptivity/adaptivity_ex5/Makefile.in b/examples/adaptivity/adaptivity_ex5/Makefile.in
@@ -505,6 +505,7 @@ datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 enablelegacyincludepaths = @enablelegacyincludepaths@
+enablepetsc = @enablepetsc@
 exec_prefix = @exec_prefix@
 gitquery = @gitquery@
 have_gcov = @have_gcov@

diff --git a/examples/adjoints/adjoints_ex1/Makefile.in b/examples/adjoints/adjoints_ex1/Makefile.in
@@ -559,6 +559,7 @@ datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 enablelegacyincludepaths = @enablelegacyincludepaths@
+enablepetsc = @enablepetsc@
 exec_prefix = @exec_prefix@
 gitquery = @gitquery@
 have_gcov = @have_gcov@

diff --git a/examples/adjoints/adjoints_ex2/Makefile.in b/examples/adjoints/adjoints_ex2/Makefile.in
@@ -547,6 +547,7 @@ datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 enablelegacyincludepaths = @enablelegacyincludepaths@
+enablepetsc = @enablepetsc@
 exec_prefix = @exec_prefix@
 gitquery = @gitquery@
 have_gcov = @have_gcov@

diff --git a/examples/adjoints/adjoints_ex3/Makefile.in b/examples/adjoints/adjoints_ex3/Makefile.in
@@ -559,6 +559,7 @@ datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 enablelegacyincludepaths = @enablelegacyincludepaths@
+enablepetsc = @enablepetsc@
 exec_prefix = @exec_prefix@
 gitquery = @gitquery@
 have_gcov = @have_gcov@

diff --git a/examples/adjoints/adjoints_ex4/Makefile.in b/examples/adjoints/adjoints_ex4/Makefile.in
@@ -559,6 +559,7 @@ datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 enablelegacyincludepaths = @enablelegacyincludepaths@
+enablepetsc = @enablepetsc@
 exec_prefix = @exec_prefix@
 gitquery = @gitquery@
 have_gcov = @have_gcov@

diff --git a/examples/adjoints/adjoints_ex5/Makefile.in b/examples/adjoints/adjoints_ex5/Makefile.in
@@ -559,6 +559,7 @@ datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 enablelegacyincludepaths = @enablelegacyincludepaths@
+enablepetsc = @enablepetsc@
 exec_prefix = @exec_prefix@
 gitquery = @gitquery@
 have_gcov = @have_gcov@

diff --git a/examples/eigenproblems/eigenproblems_ex1/Makefile.in b/examples/eigenproblems/eigenproblems_ex1/Makefile.in
@@ -495,6 +495,7 @@ datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 enablelegacyincludepaths = @enablelegacyincludepaths@
+enablepetsc = @enablepetsc@
 exec_prefix = @exec_prefix@
 gitquery = @gitquery@
 have_gcov = @have_gcov@

diff --git a/examples/eigenproblems/eigenproblems_ex2/Makefile.in b/examples/eigenproblems/eigenproblems_ex2/Makefile.in
@@ -495,6 +495,7 @@ datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 enablelegacyincludepaths = @enablelegacyincludepaths@
+enablepetsc = @enablepetsc@
 exec_prefix = @exec_prefix@
 gitquery = @gitquery@
 have_gcov = @have_gcov@

diff --git a/examples/eigenproblems/eigenproblems_ex3/Makefile.in b/examples/eigenproblems/eigenproblems_ex3/Makefile.in
@@ -501,6 +501,7 @@ datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 enablelegacyincludepaths = @enablelegacyincludepaths@
+enablepetsc = @enablepetsc@
 exec_prefix = @exec_prefix@
 gitquery = @gitquery@
 have_gcov = @have_gcov@

diff --git a/examples/fem_system/fem_system_ex1/Makefile.in b/examples/fem_system/fem_system_ex1/Makefile.in
@@ -524,6 +524,7 @@ datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 enablelegacyincludepaths = @enablelegacyincludepaths@
+enablepetsc = @enablepetsc@
 exec_prefix = @exec_prefix@
 gitquery = @gitquery@
 have_gcov = @have_gcov@

diff --git a/examples/fem_system/fem_system_ex2/Makefile.in b/examples/fem_system/fem_system_ex2/Makefile.in
@@ -534,6 +534,7 @@ datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 enablelegacyincludepaths = @enablelegacyincludepaths@
+enablepetsc = @enablepetsc@
 exec_prefix = @exec_prefix@
 gitquery = @gitquery@
 have_gcov = @have_gcov@

diff --git a/examples/introduction/introduction_ex1/Makefile.in b/examples/introduction/introduction_ex1/Makefile.in
@@ -495,6 +495,7 @@ datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 enablelegacyincludepaths = @enablelegacyincludepaths@
+enablepetsc = @enablepetsc@
 exec_prefix = @exec_prefix@
 gitquery = @gitquery@
 have_gcov = @have_gcov@

diff --git a/examples/introduction/introduction_ex2/Makefile.in b/examples/introduction/introduction_ex2/Makefile.in
@@ -495,6 +495,7 @@ datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 enablelegacyincludepaths = @enablelegacyincludepaths@
+enablepetsc = @enablepetsc@
 exec_prefix = @exec_prefix@
 gitquery = @gitquery@
 have_gcov = @have_gcov@

diff --git a/examples/introduction/introduction_ex3/Makefile.in b/examples/introduction/introduction_ex3/Makefile.in
@@ -505,6 +505,7 @@ datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 enablelegacyincludepaths = @enablelegacyincludepaths@
+enablepetsc = @enablepetsc@
 exec_prefix = @exec_prefix@
 gitquery = @gitquery@
 have_gcov = @have_gcov@

diff --git a/examples/introduction/introduction_ex4/Makefile.in b/examples/introduction/introduction_ex4/Makefile.in
@@ -505,6 +505,7 @@ datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 enablelegacyincludepaths = @enablelegacyincludepaths@
+enablepetsc = @enablepetsc@
 exec_prefix = @exec_prefix@
 gitquery = @gitquery@
 have_gcov = @have_gcov@

diff --git a/examples/introduction/introduction_ex5/Makefile.in b/examples/introduction/introduction_ex5/Makefile.in
@@ -505,6 +505,7 @@ datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 enablelegacyincludepaths = @enablelegacyincludepaths@
+enablepetsc = @enablepetsc@
 exec_prefix = @exec_prefix@
 gitquery = @gitquery@
 have_gcov = @have_gcov@

diff --git a/examples/miscellaneous/miscellaneous_ex1/Makefile.in b/examples/miscellaneous/miscellaneous_ex1/Makefile.in
@@ -495,6 +495,7 @@ datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 enablelegacyincludepaths = @enablelegacyincludepaths@
+enablepetsc = @enablepetsc@
 exec_prefix = @exec_prefix@
 gitquery = @gitquery@
 have_gcov = @have_gcov@

diff --git a/examples/miscellaneous/miscellaneous_ex2/Makefile.in b/examples/miscellaneous/miscellaneous_ex2/Makefile.in
@@ -500,6 +500,7 @@ datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 enablelegacyincludepaths = @enablelegacyincludepaths@
+enablepetsc = @enablepetsc@
 exec_prefix = @exec_prefix@
 gitquery = @gitquery@
 have_gcov = @have_gcov@