From 70e179044d6551dee00409734d129f4f9a62d5d4 Mon Sep 17 00:00:00 2001 From: bangerth Date: Thu, 23 Apr 2009 23:06:37 +0000 Subject: [PATCH] Use std_cxx1x instead of std_cxx0x -- since it appears impossible that the international C++ standard will actually still come out this year. git-svn-id: https://svn.dealii.org/trunk@18724 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/aclocal.m4 | 44 +- deal.II/base/include/base/config.h.in | 14 +- deal.II/base/include/base/data_out_base.h | 28 +- deal.II/base/include/base/logstream.h | 4 +- .../base/include/base/memory_consumption.h | 6 +- .../base/{std_cxx0x => std_cxx1x}/array.h | 8 +- .../base/{std_cxx0x => std_cxx1x}/bind.h | 8 +- .../condition_variable.h | 8 +- .../base/{std_cxx0x => std_cxx1x}/function.h | 8 +- .../base/{std_cxx0x => std_cxx1x}/mutex.h | 8 +- .../{std_cxx0x => std_cxx1x}/shared_ptr.h | 8 +- .../base/{std_cxx0x => std_cxx1x}/thread.h | 8 +- .../base/{std_cxx0x => std_cxx1x}/tuple.h | 8 +- deal.II/base/include/base/thread_management.h | 542 +- deal.II/base/source/data_out_base.cc | 100 +- deal.II/base/source/log.cc | 4 +- deal.II/configure | 6890 ++++++++--------- deal.II/configure.in | 10 +- deal.II/deal.II/include/hp/fe_collection.h | 4 +- deal.II/deal.II/include/hp/fe_values.h | 4 +- .../deal.II/include/hp/mapping_collection.h | 4 +- deal.II/deal.II/include/hp/q_collection.h | 8 +- .../include/multigrid/mg_level_object.h | 12 +- .../deal.II/include/multigrid/mg_transfer.h | 6 +- .../include/multigrid/mg_transfer.templates.h | 4 +- .../include/multigrid/mg_transfer_block.h | 6 +- .../include/multigrid/mg_transfer_component.h | 6 +- deal.II/deal.II/include/numerics/data_out.h | 8 +- deal.II/deal.II/include/numerics/matrices.h | 4 +- deal.II/deal.II/source/dofs/dof_tools.cc | 24 +- deal.II/deal.II/source/fe/fe_tools.cc | 14 +- deal.II/deal.II/source/grid/tria.cc | 8 +- deal.II/deal.II/source/hp/dof_handler.cc | 14 +- deal.II/deal.II/source/hp/fe_collection.cc | 2 +- deal.II/deal.II/source/hp/fe_values.cc | 2 +- .../deal.II/source/hp/mapping_collection.cc | 4 +- .../source/multigrid/mg_transfer_block.cc | 4 +- .../source/multigrid/mg_transfer_component.cc | 4 +- .../source/multigrid/mg_transfer_prebuilt.cc | 4 +- deal.II/deal.II/source/numerics/data_out.cc | 16 +- deal.II/deal.II/source/numerics/matrices.cc | 22 +- .../headers/{std_cxx0x.h => std_cxx1x.h} | 4 +- deal.II/doc/news/6.1.0-vs-6.2.0.h | 2 +- deal.II/examples/step-22/step-22.cc | 4 +- deal.II/examples/step-31/step-31.cc | 10 +- deal.II/examples/step-32/step-32.cc | 12 +- deal.II/examples/step-34/step-34.cc | 4 +- deal.II/lac/include/lac/filtered_matrix.h | 4 +- deal.II/lac/include/lac/petsc_matrix_base.h | 6 +- deal.II/lac/include/lac/petsc_solver.h | 4 +- .../lac/include/lac/trilinos_precondition.h | 4 +- .../lac/include/lac/trilinos_sparse_matrix.h | 6 +- .../include/lac/trilinos_sparsity_pattern.h | 4 +- deal.II/lac/source/trilinos_precondition.cc | 2 +- 54 files changed, 3757 insertions(+), 4199 deletions(-) rename deal.II/base/include/base/{std_cxx0x => std_cxx1x}/array.h (84%) rename deal.II/base/include/base/{std_cxx0x => std_cxx1x}/bind.h (89%) rename deal.II/base/include/base/{std_cxx0x => std_cxx1x}/condition_variable.h (83%) rename deal.II/base/include/base/{std_cxx0x => std_cxx1x}/function.h (84%) rename deal.II/base/include/base/{std_cxx0x => std_cxx1x}/mutex.h (84%) rename deal.II/base/include/base/{std_cxx0x => std_cxx1x}/shared_ptr.h (84%) rename deal.II/base/include/base/{std_cxx0x => std_cxx1x}/thread.h (84%) rename deal.II/base/include/base/{std_cxx0x => std_cxx1x}/tuple.h (90%) rename deal.II/doc/doxygen/headers/{std_cxx0x.h => std_cxx1x.h} (91%) diff --git a/deal.II/aclocal.m4 b/deal.II/aclocal.m4 index f0097eb056..412c53d408 100644 --- a/deal.II/aclocal.m4 +++ b/deal.II/aclocal.m4 @@ -502,24 +502,24 @@ AC_DEFUN(DEAL_II_SET_CXX_FLAGS, dnl dnl BOOST uses long long, so don't warn about this CXXFLAGSG="$CXXFLAGSG -Wno-long-long" - dnl See whether the gcc we use already has a flag for C++0x features. + dnl See whether the gcc we use already has a flag for C++1x features. OLD_CXXFLAGS="$CXXFLAGS" CXXFLAGS=-std=c++0x - AC_MSG_CHECKING(whether compiler has a flag to support C++0x) + AC_MSG_CHECKING(whether compiler has a flag to support C++1x) AC_TRY_COMPILE([], [;], [ AC_MSG_RESULT(yes) - test_cxx0x=yes + test_cxx1x=yes ], [ AC_MSG_RESULT(no) - test_cxx0x=no + test_cxx1x=no ]) CXXFLAGS="${OLD_CXXFLAGS}" - if test "x$test_cxx0x" = "xyes" ; then - DEAL_II_CHECK_CXX0X_COMPONENTS("-std=c++0x") + if test "x$test_cxx1x" = "xyes" ; then + DEAL_II_CHECK_CXX1X_COMPONENTS("-std=c++0x") fi dnl On some gcc 4.3 snapshots, a 'const' qualifier on a return type triggers a @@ -1113,26 +1113,26 @@ AC_DEFUN(DEAL_II_SET_CXX_DEBUG_FLAG, dnl dnl ------------------------------------------------------------- dnl Given the command line flag specified as argument to this macro, -dnl test whether all components that we need from the C++0X +dnl test whether all components that we need from the C++1X dnl standard are actually available. If so, add the flag to dnl CXXFLAGS.g and CXXFLAGS.o, and set a flag in config.h dnl -dnl Usage: DEAL_II_CHECK_CXX0X_COMPONENTS(cxxflag) +dnl Usage: DEAL_II_CHECK_CXX1X_COMPONENTS(cxxflag) dnl dnl ------------------------------------------------------------- -AC_DEFUN(DEAL_II_CHECK_CXX0X_COMPONENTS, dnl +AC_DEFUN(DEAL_II_CHECK_CXX1X_COMPONENTS, dnl [ OLD_CXXFLAGS="$CXXFLAGS" CXXFLAGS="$1" - all_cxx0x_available=yes + all_cxx1x_available=yes AC_MSG_CHECKING(for std::array) AC_TRY_COMPILE( [#include ], [ std::array p; p[0];], [ AC_MSG_RESULT(yes) ], - [ AC_MSG_RESULT(no); all_cxx0x_available=no ] + [ AC_MSG_RESULT(no); all_cxx1x_available=no ] ) AC_MSG_CHECKING(for std::condition_variable) @@ -1140,7 +1140,7 @@ AC_DEFUN(DEAL_II_CHECK_CXX0X_COMPONENTS, dnl [#include ], [ std::condition_variable c; c.notify_all()], [ AC_MSG_RESULT(yes) ], - [ AC_MSG_RESULT(no); all_cxx0x_available=no ] + [ AC_MSG_RESULT(no); all_cxx1x_available=no ] ) AC_MSG_CHECKING(for std::function and std::bind) @@ -1150,7 +1150,7 @@ AC_DEFUN(DEAL_II_CHECK_CXX0X_COMPONENTS, dnl [ std::function g = std::bind (f, std::placeholders::_1, 1.1) ;], [ AC_MSG_RESULT(yes) ], - [ AC_MSG_RESULT(no); all_cxx0x_available=no ] + [ AC_MSG_RESULT(no); all_cxx1x_available=no ] ) dnl Make sure we don't run into GCC bug 35569 @@ -1162,7 +1162,7 @@ AC_DEFUN(DEAL_II_CHECK_CXX0X_COMPONENTS, dnl using namespace std::placeholders; bind(multiplies(),4,_1)(5); ;], [ AC_MSG_RESULT(yes) ], - [ AC_MSG_RESULT(no); all_cxx0x_available=no ] + [ AC_MSG_RESULT(no); all_cxx1x_available=no ] ) AC_MSG_CHECKING(for std::shared_ptr) @@ -1170,7 +1170,7 @@ AC_DEFUN(DEAL_II_CHECK_CXX0X_COMPONENTS, dnl [#include ], [ std::shared_ptr p(new int(3))], [ AC_MSG_RESULT(yes) ], - [ AC_MSG_RESULT(no); all_cxx0x_available=no ] + [ AC_MSG_RESULT(no); all_cxx1x_available=no ] ) AC_MSG_CHECKING(for std::thread) @@ -1179,7 +1179,7 @@ AC_DEFUN(DEAL_II_CHECK_CXX0X_COMPONENTS, dnl void f(int); ], [ std::thread t(f,1); t.join();], [ AC_MSG_RESULT(yes) ], - [ AC_MSG_RESULT(no); all_cxx0x_available=no ] + [ AC_MSG_RESULT(no); all_cxx1x_available=no ] ) AC_MSG_CHECKING(for std::mutex) @@ -1187,7 +1187,7 @@ AC_DEFUN(DEAL_II_CHECK_CXX0X_COMPONENTS, dnl [#include ], [ std::mutex m; m.lock();], [ AC_MSG_RESULT(yes) ], - [ AC_MSG_RESULT(no); all_cxx0x_available=no ] + [ AC_MSG_RESULT(no); all_cxx1x_available=no ] ) AC_MSG_CHECKING(for std::tuple) @@ -1195,20 +1195,20 @@ AC_DEFUN(DEAL_II_CHECK_CXX0X_COMPONENTS, dnl [#include ], [ std::tuple p(1,1.1,'a')], [ AC_MSG_RESULT(yes) ], - [ AC_MSG_RESULT(no); all_cxx0x_available=no ] + [ AC_MSG_RESULT(no); all_cxx1x_available=no ] ) CXXFLAGS="${OLD_CXXFLAGS}" - AC_MSG_CHECKING(whether C++0x support is complete enough) - if test "x$all_cxx0x_available" = "xyes" ; then + AC_MSG_CHECKING(whether C++1x support is complete enough) + if test "x$all_cxx1x_available" = "xyes" ; then AC_MSG_RESULT(yes) CXXFLAGSG="$CXXFLAGSG $1" CXXFLAGSO="$CXXFLAGSO $1" - AC_DEFINE(DEAL_II_CAN_USE_CXX0X, 1, - [Defined if the compiler we use supports the upcoming C++0x standard.]) + AC_DEFINE(DEAL_II_CAN_USE_CXX1X, 1, + [Defined if the compiler we use supports the upcoming C++1x standard.]) else AC_MSG_RESULT(no) fi diff --git a/deal.II/base/include/base/config.h.in b/deal.II/base/include/base/config.h.in index 7481f08193..77b3cfc3f9 100644 --- a/deal.II/base/include/base/config.h.in +++ b/deal.II/base/include/base/config.h.in @@ -65,8 +65,8 @@ floating point computations on cygwin systems. */ #undef DEAL_II_BROKEN_SOCKETS -/* Defined if the compiler we use supports the upcoming C++0x standard. */ -#undef DEAL_II_CAN_USE_CXX0X +/* Defined if the compiler we use supports the upcoming C++1x standard. */ +#undef DEAL_II_CAN_USE_CXX1X /* Backward compatibility support for functions and classes that do not take an explicit mapping variable, but rather use a default Q1 mapping instead @@ -541,12 +541,12 @@ #include /** - * If the compiler supports the upcoming C++0x standard, allow us to refer - * to things in namespace std through namespace std_cxx0x (the namespace - * into which we import BOOST components if we don't have C++0x support). + * If the compiler supports the upcoming C++1x standard, allow us to refer + * to things in namespace std through namespace std_cxx1x (the namespace + * into which we import BOOST components if we don't have C++1x support). */ -#ifdef DEAL_II_CAN_USE_CXX0X -namespace std_cxx0x = std; +#ifdef DEAL_II_CAN_USE_CXX1X +namespace std_cxx1x = std; #endif #endif diff --git a/deal.II/base/include/base/data_out_base.h b/deal.II/base/include/base/data_out_base.h index facb0d59c0..d864614305 100644 --- a/deal.II/base/include/base/data_out_base.h +++ b/deal.II/base/include/base/data_out_base.h @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include #include @@ -1404,7 +1404,7 @@ class DataOutBase template static void write_dx (const std::vector > &patches, const std::vector &data_names, - const std::vector > &vector_data_ranges, + const std::vector > &vector_data_ranges, const DXFlags &flags, std::ostream &out); @@ -1456,7 +1456,7 @@ class DataOutBase template static void write_eps (const std::vector > &patches, const std::vector &data_names, - const std::vector > &vector_data_ranges, + const std::vector > &vector_data_ranges, const EpsFlags &flags, std::ostream &out); @@ -1473,7 +1473,7 @@ class DataOutBase template static void write_gmv (const std::vector > &patches, const std::vector &data_names, - const std::vector > &vector_data_ranges, + const std::vector > &vector_data_ranges, const GmvFlags &flags, std::ostream &out); @@ -1540,7 +1540,7 @@ class DataOutBase template static void write_gnuplot (const std::vector > &patches, const std::vector &data_names, - const std::vector > &vector_data_ranges, + const std::vector > &vector_data_ranges, const GnuplotFlags &flags, std::ostream &out); @@ -1594,7 +1594,7 @@ class DataOutBase template static void write_povray (const std::vector > &patches, const std::vector &data_names, - const std::vector > &vector_data_ranges, + const std::vector > &vector_data_ranges, const PovrayFlags &flags, std::ostream &out); @@ -1608,7 +1608,7 @@ class DataOutBase template static void write_tecplot (const std::vector > &patches, const std::vector &data_names, - const std::vector > &vector_data_ranges, + const std::vector > &vector_data_ranges, const TecplotFlags &flags, std::ostream &out); @@ -1637,7 +1637,7 @@ class DataOutBase static void write_tecplot_binary ( const std::vector > &patches, const std::vector &data_names, - const std::vector > &vector_data_ranges, + const std::vector > &vector_data_ranges, const TecplotFlags &flags, std::ostream &out); @@ -1659,7 +1659,7 @@ class DataOutBase template static void write_ucd (const std::vector > &patches, const std::vector &data_names, - const std::vector > &vector_data_ranges, + const std::vector > &vector_data_ranges, const UcdFlags &flags, std::ostream &out); @@ -1680,7 +1680,7 @@ class DataOutBase template static void write_vtk (const std::vector > &patches, const std::vector &data_names, - const std::vector > &vector_data_ranges, + const std::vector > &vector_data_ranges, const VtkFlags &flags, std::ostream &out); @@ -1728,7 +1728,7 @@ class DataOutBase static void write_deal_II_intermediate ( const std::vector > &patches, const std::vector &data_names, - const std::vector > &vector_data_ranges, + const std::vector > &vector_data_ranges, const Deal_II_IntermediateFlags &flags, std::ostream &out); @@ -2425,7 +2425,7 @@ class DataOutInterface : private DataOutBase * collection of scalar fields. */ virtual - std::vector > + std::vector > get_vector_data_ranges () const; /** @@ -2728,7 +2728,7 @@ class DataOutReader : public DataOutInterface * collection of scalar fields. */ virtual - std::vector > + std::vector > get_vector_data_ranges () const; private: @@ -2748,7 +2748,7 @@ class DataOutReader : public DataOutInterface * output field are to be * considered vectors. */ - std::vector > + std::vector > vector_data_ranges; }; diff --git a/deal.II/base/include/base/logstream.h b/deal.II/base/include/base/logstream.h index 99677ceca6..131b02f019 100644 --- a/deal.II/base/include/base/logstream.h +++ b/deal.II/base/include/base/logstream.h @@ -16,7 +16,7 @@ #include #include -#include +#include #include #include @@ -414,7 +414,7 @@ class LogStream /** * Type of the stream map */ - typedef std::map > stream_map_type; + typedef std::map > stream_map_type; /** * We generate a stringstream for diff --git a/deal.II/base/include/base/memory_consumption.h b/deal.II/base/include/base/memory_consumption.h index 0e1224d03d..4fe8eb4810 100644 --- a/deal.II/base/include/base/memory_consumption.h +++ b/deal.II/base/include/base/memory_consumption.h @@ -15,7 +15,7 @@ #include -#include +#include #include #include #include @@ -379,7 +379,7 @@ namespace MemoryConsumption */ template inline - unsigned int memory_consumption (const std_cxx0x::shared_ptr &); + unsigned int memory_consumption (const std_cxx1x::shared_ptr &); /** * For all other types which are @@ -604,7 +604,7 @@ namespace MemoryConsumption template inline unsigned int - memory_consumption (const std_cxx0x::shared_ptr &ptr) + memory_consumption (const std_cxx1x::shared_ptr &ptr) { return sizeof(ptr); } diff --git a/deal.II/base/include/base/std_cxx0x/array.h b/deal.II/base/include/base/std_cxx1x/array.h similarity index 84% rename from deal.II/base/include/base/std_cxx0x/array.h rename to deal.II/base/include/base/std_cxx1x/array.h index df493c4b08..d22f901b72 100644 --- a/deal.II/base/include/base/std_cxx0x/array.h +++ b/deal.II/base/include/base/std_cxx1x/array.h @@ -10,13 +10,13 @@ // further information on this license. // //--------------------------------------------------------------------------- -#ifndef __deal2__std_cxx0x_array_h -#define __deal2__std_cxx0x_array_h +#ifndef __deal2__std_cxx1x_array_h +#define __deal2__std_cxx1x_array_h #include -#ifdef DEAL_II_CAN_USE_CXX0X +#ifdef DEAL_II_CAN_USE_CXX1X # include @@ -25,7 +25,7 @@ #include DEAL_II_NAMESPACE_OPEN -namespace std_cxx0x +namespace std_cxx1x { using boost::array; } diff --git a/deal.II/base/include/base/std_cxx0x/bind.h b/deal.II/base/include/base/std_cxx1x/bind.h similarity index 89% rename from deal.II/base/include/base/std_cxx0x/bind.h rename to deal.II/base/include/base/std_cxx1x/bind.h index 588afaa24b..e4199d534c 100644 --- a/deal.II/base/include/base/std_cxx0x/bind.h +++ b/deal.II/base/include/base/std_cxx1x/bind.h @@ -10,13 +10,13 @@ // further information on this license. // //--------------------------------------------------------------------------- -#ifndef __deal2__std_cxx0x_bin_h -#define __deal2__std_cxx0x_bind_h +#ifndef __deal2__std_cxx1x_bin_h +#define __deal2__std_cxx1x_bind_h #include -#ifdef DEAL_II_CAN_USE_CXX0X +#ifdef DEAL_II_CAN_USE_CXX1X # include @@ -32,7 +32,7 @@ DEAL_II_NAMESPACE_CLOSE #include DEAL_II_NAMESPACE_OPEN -namespace std_cxx0x +namespace std_cxx1x { using boost::bind; using boost::ref; diff --git a/deal.II/base/include/base/std_cxx0x/condition_variable.h b/deal.II/base/include/base/std_cxx1x/condition_variable.h similarity index 83% rename from deal.II/base/include/base/std_cxx0x/condition_variable.h rename to deal.II/base/include/base/std_cxx1x/condition_variable.h index eba68dcc71..b4dc63bfc3 100644 --- a/deal.II/base/include/base/std_cxx0x/condition_variable.h +++ b/deal.II/base/include/base/std_cxx1x/condition_variable.h @@ -10,13 +10,13 @@ // further information on this license. // //--------------------------------------------------------------------------- -#ifndef __deal2__std_cxx0x_condition_variable_h -#define __deal2__std_cxx0x_condition_variable_h +#ifndef __deal2__std_cxx1x_condition_variable_h +#define __deal2__std_cxx1x_condition_variable_h #include -#ifdef DEAL_II_CAN_USE_CXX0X +#ifdef DEAL_II_CAN_USE_CXX1X # include @@ -25,7 +25,7 @@ # include DEAL_II_NAMESPACE_OPEN -namespace std_cxx0x +namespace std_cxx1x { using boost::condition_variable; using boost::unique_lock; diff --git a/deal.II/base/include/base/std_cxx0x/function.h b/deal.II/base/include/base/std_cxx1x/function.h similarity index 84% rename from deal.II/base/include/base/std_cxx0x/function.h rename to deal.II/base/include/base/std_cxx1x/function.h index 59298ecd32..d78792e22c 100644 --- a/deal.II/base/include/base/std_cxx0x/function.h +++ b/deal.II/base/include/base/std_cxx1x/function.h @@ -10,13 +10,13 @@ // further information on this license. // //--------------------------------------------------------------------------- -#ifndef __deal2__std_cxx0x_function_h -#define __deal2__std_cxx0x_function_h +#ifndef __deal2__std_cxx1x_function_h +#define __deal2__std_cxx1x_function_h #include -#ifdef DEAL_II_CAN_USE_CXX0X +#ifdef DEAL_II_CAN_USE_CXX1X # include @@ -25,7 +25,7 @@ #include DEAL_II_NAMESPACE_OPEN -namespace std_cxx0x +namespace std_cxx1x { using boost::function; } diff --git a/deal.II/base/include/base/std_cxx0x/mutex.h b/deal.II/base/include/base/std_cxx1x/mutex.h similarity index 84% rename from deal.II/base/include/base/std_cxx0x/mutex.h rename to deal.II/base/include/base/std_cxx1x/mutex.h index 6063500155..969eba7043 100644 --- a/deal.II/base/include/base/std_cxx0x/mutex.h +++ b/deal.II/base/include/base/std_cxx1x/mutex.h @@ -10,13 +10,13 @@ // further information on this license. // //--------------------------------------------------------------------------- -#ifndef __deal2__std_cxx0x_mutex_h -#define __deal2__std_cxx0x_mutex_h +#ifndef __deal2__std_cxx1x_mutex_h +#define __deal2__std_cxx1x_mutex_h #include -#ifdef DEAL_II_CAN_USE_CXX0X +#ifdef DEAL_II_CAN_USE_CXX1X # include @@ -25,7 +25,7 @@ # include DEAL_II_NAMESPACE_OPEN -namespace std_cxx0x +namespace std_cxx1x { using boost::mutex; } diff --git a/deal.II/base/include/base/std_cxx0x/shared_ptr.h b/deal.II/base/include/base/std_cxx1x/shared_ptr.h similarity index 84% rename from deal.II/base/include/base/std_cxx0x/shared_ptr.h rename to deal.II/base/include/base/std_cxx1x/shared_ptr.h index d569732ffd..d2ba164292 100644 --- a/deal.II/base/include/base/std_cxx0x/shared_ptr.h +++ b/deal.II/base/include/base/std_cxx1x/shared_ptr.h @@ -10,13 +10,13 @@ // further information on this license. // //--------------------------------------------------------------------------- -#ifndef __deal2__std_cxx0x_shared_ptr_h -#define __deal2__std_cxx0x_shared_ptr_h +#ifndef __deal2__std_cxx1x_shared_ptr_h +#define __deal2__std_cxx1x_shared_ptr_h #include -#ifdef DEAL_II_CAN_USE_CXX0X +#ifdef DEAL_II_CAN_USE_CXX1X # include @@ -25,7 +25,7 @@ #include DEAL_II_NAMESPACE_OPEN -namespace std_cxx0x +namespace std_cxx1x { using boost::shared_ptr; using boost::enable_shared_from_this; diff --git a/deal.II/base/include/base/std_cxx0x/thread.h b/deal.II/base/include/base/std_cxx1x/thread.h similarity index 84% rename from deal.II/base/include/base/std_cxx0x/thread.h rename to deal.II/base/include/base/std_cxx1x/thread.h index f079e9485c..807498e8d7 100644 --- a/deal.II/base/include/base/std_cxx0x/thread.h +++ b/deal.II/base/include/base/std_cxx1x/thread.h @@ -10,13 +10,13 @@ // further information on this license. // //--------------------------------------------------------------------------- -#ifndef __deal2__std_cxx0x_thread_h -#define __deal2__std_cxx0x_thread_h +#ifndef __deal2__std_cxx1x_thread_h +#define __deal2__std_cxx1x_thread_h #include -#ifdef DEAL_II_CAN_USE_CXX0X +#ifdef DEAL_II_CAN_USE_CXX1X # include @@ -25,7 +25,7 @@ # include DEAL_II_NAMESPACE_OPEN -namespace std_cxx0x +namespace std_cxx1x { using boost::thread; } diff --git a/deal.II/base/include/base/std_cxx0x/tuple.h b/deal.II/base/include/base/std_cxx1x/tuple.h similarity index 90% rename from deal.II/base/include/base/std_cxx0x/tuple.h rename to deal.II/base/include/base/std_cxx1x/tuple.h index 4870b7868c..73e0d8cfe6 100644 --- a/deal.II/base/include/base/std_cxx0x/tuple.h +++ b/deal.II/base/include/base/std_cxx1x/tuple.h @@ -10,13 +10,13 @@ // further information on this license. // //--------------------------------------------------------------------------- -#ifndef __deal2__std_cxx0x_tuple_h -#define __deal2__std_cxx0x_tuple_h +#ifndef __deal2__std_cxx1x_tuple_h +#define __deal2__std_cxx1x_tuple_h #include -#ifdef DEAL_II_CAN_USE_CXX0X +#ifdef DEAL_II_CAN_USE_CXX1X # include @@ -25,7 +25,7 @@ #include DEAL_II_NAMESPACE_OPEN -namespace std_cxx0x +namespace std_cxx1x { using boost::tuple; using boost::get; diff --git a/deal.II/base/include/base/thread_management.h b/deal.II/base/include/base/thread_management.h index 4fdba09cbc..99ae5fab68 100644 --- a/deal.II/base/include/base/thread_management.h +++ b/deal.II/base/include/base/thread_management.h @@ -16,15 +16,15 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #if (DEAL_II_USE_MT == 1) -# include -# include -# include +# include +# include +# include #endif #include @@ -386,7 +386,7 @@ namespace Threads * Data object storing the * mutex data */ - std_cxx0x::mutex mutex; + std_cxx1x::mutex mutex; /** * Make the class implementing @@ -442,8 +442,8 @@ namespace Threads */ inline void wait (Mutex &mutex) { - std_cxx0x::unique_lock lock(mutex.mutex, - std_cxx0x::adopt_lock); + std_cxx1x::unique_lock lock(mutex.mutex, + std_cxx1x::adopt_lock); condition_variable.wait (lock); } @@ -452,7 +452,7 @@ namespace Threads * Data object storing the * necessary data. */ - std_cxx0x::condition_variable condition_variable; + std_cxx1x::condition_variable condition_variable; }; @@ -938,14 +938,14 @@ namespace Threads namespace internal { template - inline void call (const std_cxx0x::function &function, + inline void call (const std_cxx1x::function &function, internal::return_value &ret_val) { ret_val.set (function()); } - inline void call (const std_cxx0x::function &function, + inline void call (const std_cxx1x::function &function, internal::return_value &) { function(); @@ -970,7 +970,7 @@ namespace Threads * for each number of arguments. */ template ::value> + int length = std_cxx1x::tuple_size::value> struct fun_ptr_helper; @@ -998,7 +998,7 @@ namespace Threads template struct fun_ptr_helper { - typedef RT (type) (typename std_cxx0x::tuple_element<0,ArgList>::type); + typedef RT (type) (typename std_cxx1x::tuple_element<0,ArgList>::type); }; @@ -1012,8 +1012,8 @@ namespace Threads template struct fun_ptr_helper { - typedef RT (type) (typename std_cxx0x::tuple_element<0,ArgList>::type, - typename std_cxx0x::tuple_element<1,ArgList>::type); + typedef RT (type) (typename std_cxx1x::tuple_element<0,ArgList>::type, + typename std_cxx1x::tuple_element<1,ArgList>::type); }; @@ -1027,9 +1027,9 @@ namespace Threads template struct fun_ptr_helper { - typedef RT (type) (typename std_cxx0x::tuple_element<0,ArgList>::type, - typename std_cxx0x::tuple_element<1,ArgList>::type, - typename std_cxx0x::tuple_element<2,ArgList>::type); + typedef RT (type) (typename std_cxx1x::tuple_element<0,ArgList>::type, + typename std_cxx1x::tuple_element<1,ArgList>::type, + typename std_cxx1x::tuple_element<2,ArgList>::type); }; @@ -1043,10 +1043,10 @@ namespace Threads template struct fun_ptr_helper { - typedef RT (type) (typename std_cxx0x::tuple_element<0,ArgList>::type, - typename std_cxx0x::tuple_element<1,ArgList>::type, - typename std_cxx0x::tuple_element<2,ArgList>::type, - typename std_cxx0x::tuple_element<3,ArgList>::type); + typedef RT (type) (typename std_cxx1x::tuple_element<0,ArgList>::type, + typename std_cxx1x::tuple_element<1,ArgList>::type, + typename std_cxx1x::tuple_element<2,ArgList>::type, + typename std_cxx1x::tuple_element<3,ArgList>::type); }; @@ -1060,11 +1060,11 @@ namespace Threads template struct fun_ptr_helper { - typedef RT (type) (typename std_cxx0x::tuple_element<0,ArgList>::type, - typename std_cxx0x::tuple_element<1,ArgList>::type, - typename std_cxx0x::tuple_element<2,ArgList>::type, - typename std_cxx0x::tuple_element<3,ArgList>::type, - typename std_cxx0x::tuple_element<4,ArgList>::type); + typedef RT (type) (typename std_cxx1x::tuple_element<0,ArgList>::type, + typename std_cxx1x::tuple_element<1,ArgList>::type, + typename std_cxx1x::tuple_element<2,ArgList>::type, + typename std_cxx1x::tuple_element<3,ArgList>::type, + typename std_cxx1x::tuple_element<4,ArgList>::type); }; @@ -1078,12 +1078,12 @@ namespace Threads template struct fun_ptr_helper { - typedef RT (type) (typename std_cxx0x::tuple_element<0,ArgList>::type, - typename std_cxx0x::tuple_element<1,ArgList>::type, - typename std_cxx0x::tuple_element<2,ArgList>::type, - typename std_cxx0x::tuple_element<3,ArgList>::type, - typename std_cxx0x::tuple_element<4,ArgList>::type, - typename std_cxx0x::tuple_element<5,ArgList>::type); + typedef RT (type) (typename std_cxx1x::tuple_element<0,ArgList>::type, + typename std_cxx1x::tuple_element<1,ArgList>::type, + typename std_cxx1x::tuple_element<2,ArgList>::type, + typename std_cxx1x::tuple_element<3,ArgList>::type, + typename std_cxx1x::tuple_element<4,ArgList>::type, + typename std_cxx1x::tuple_element<5,ArgList>::type); }; @@ -1097,13 +1097,13 @@ namespace Threads template struct fun_ptr_helper { - typedef RT (type) (typename std_cxx0x::tuple_element<0,ArgList>::type, - typename std_cxx0x::tuple_element<1,ArgList>::type, - typename std_cxx0x::tuple_element<2,ArgList>::type, - typename std_cxx0x::tuple_element<3,ArgList>::type, - typename std_cxx0x::tuple_element<4,ArgList>::type, - typename std_cxx0x::tuple_element<5,ArgList>::type, - typename std_cxx0x::tuple_element<6,ArgList>::type); + typedef RT (type) (typename std_cxx1x::tuple_element<0,ArgList>::type, + typename std_cxx1x::tuple_element<1,ArgList>::type, + typename std_cxx1x::tuple_element<2,ArgList>::type, + typename std_cxx1x::tuple_element<3,ArgList>::type, + typename std_cxx1x::tuple_element<4,ArgList>::type, + typename std_cxx1x::tuple_element<5,ArgList>::type, + typename std_cxx1x::tuple_element<6,ArgList>::type); }; @@ -1117,14 +1117,14 @@ namespace Threads template struct fun_ptr_helper { - typedef RT (type) (typename std_cxx0x::tuple_element<0,ArgList>::type, - typename std_cxx0x::tuple_element<1,ArgList>::type, - typename std_cxx0x::tuple_element<2,ArgList>::type, - typename std_cxx0x::tuple_element<3,ArgList>::type, - typename std_cxx0x::tuple_element<4,ArgList>::type, - typename std_cxx0x::tuple_element<5,ArgList>::type, - typename std_cxx0x::tuple_element<6,ArgList>::type, - typename std_cxx0x::tuple_element<7,ArgList>::type); + typedef RT (type) (typename std_cxx1x::tuple_element<0,ArgList>::type, + typename std_cxx1x::tuple_element<1,ArgList>::type, + typename std_cxx1x::tuple_element<2,ArgList>::type, + typename std_cxx1x::tuple_element<3,ArgList>::type, + typename std_cxx1x::tuple_element<4,ArgList>::type, + typename std_cxx1x::tuple_element<5,ArgList>::type, + typename std_cxx1x::tuple_element<6,ArgList>::type, + typename std_cxx1x::tuple_element<7,ArgList>::type); }; @@ -1138,15 +1138,15 @@ namespace Threads template struct fun_ptr_helper { - typedef RT (type) (typename std_cxx0x::tuple_element<0,ArgList>::type, - typename std_cxx0x::tuple_element<1,ArgList>::type, - typename std_cxx0x::tuple_element<2,ArgList>::type, - typename std_cxx0x::tuple_element<3,ArgList>::type, - typename std_cxx0x::tuple_element<4,ArgList>::type, - typename std_cxx0x::tuple_element<5,ArgList>::type, - typename std_cxx0x::tuple_element<6,ArgList>::type, - typename std_cxx0x::tuple_element<7,ArgList>::type, - typename std_cxx0x::tuple_element<8,ArgList>::type); + typedef RT (type) (typename std_cxx1x::tuple_element<0,ArgList>::type, + typename std_cxx1x::tuple_element<1,ArgList>::type, + typename std_cxx1x::tuple_element<2,ArgList>::type, + typename std_cxx1x::tuple_element<3,ArgList>::type, + typename std_cxx1x::tuple_element<4,ArgList>::type, + typename std_cxx1x::tuple_element<5,ArgList>::type, + typename std_cxx1x::tuple_element<6,ArgList>::type, + typename std_cxx1x::tuple_element<7,ArgList>::type, + typename std_cxx1x::tuple_element<8,ArgList>::type); }; @@ -1161,16 +1161,16 @@ namespace Threads template struct fun_ptr_helper { - typedef RT (type) (typename std_cxx0x::tuple_element<0,ArgList>::type, - typename std_cxx0x::tuple_element<1,ArgList>::type, - typename std_cxx0x::tuple_element<2,ArgList>::type, - typename std_cxx0x::tuple_element<3,ArgList>::type, - typename std_cxx0x::tuple_element<4,ArgList>::type, - typename std_cxx0x::tuple_element<5,ArgList>::type, - typename std_cxx0x::tuple_element<6,ArgList>::type, - typename std_cxx0x::tuple_element<7,ArgList>::type, - typename std_cxx0x::tuple_element<8,ArgList>::type, - typename std_cxx0x::tuple_element<9,ArgList>::type); + typedef RT (type) (typename std_cxx1x::tuple_element<0,ArgList>::type, + typename std_cxx1x::tuple_element<1,ArgList>::type, + typename std_cxx1x::tuple_element<2,ArgList>::type, + typename std_cxx1x::tuple_element<3,ArgList>::type, + typename std_cxx1x::tuple_element<4,ArgList>::type, + typename std_cxx1x::tuple_element<5,ArgList>::type, + typename std_cxx1x::tuple_element<6,ArgList>::type, + typename std_cxx1x::tuple_element<7,ArgList>::type, + typename std_cxx1x::tuple_element<8,ArgList>::type, + typename std_cxx1x::tuple_element<9,ArgList>::type); }; @@ -1244,7 +1244,7 @@ namespace Threads * std::enable_shared_from_this. */ template - struct ThreadDescriptor : public std_cxx0x::enable_shared_from_this > + struct ThreadDescriptor : public std_cxx1x::enable_shared_from_this > { /** * A pointer to the current @@ -1257,13 +1257,13 @@ namespace Threads * something into the return * value location. */ - std_cxx0x::shared_ptr > self; + std_cxx1x::shared_ptr > self; /** * An object that represents the * thread started. */ - std_cxx0x::thread thread; + std_cxx1x::thread thread; /** * An object that will hold the value @@ -1298,13 +1298,13 @@ namespace Threads * to a shared_ptr, and then * call shared_from_this. */ - void start (const std_cxx0x::function &function) + void start (const std_cxx1x::function &function) { // set the self pointer // and then start the // thread self = this->shared_from_this (); - thread = std_cxx0x::thread (thread_entry_point, function, this); + thread = std_cxx1x::thread (thread_entry_point, function, this); } @@ -1323,7 +1323,7 @@ namespace Threads * thread. */ static - void thread_entry_point (const std_cxx0x::function function, + void thread_entry_point (const std_cxx1x::function function, ThreadDescriptor *descriptor) { // now call the function @@ -1401,7 +1401,7 @@ namespace Threads * let it put its return value into * the ret_val object. */ - void start (const std_cxx0x::function &function) + void start (const std_cxx1x::function &function) { call (function, ret_val); } @@ -1461,7 +1461,7 @@ namespace Threads * Construct a thread object * with a function object. */ - Thread (const std_cxx0x::function &function) + Thread (const std_cxx1x::function &function) : thread_descriptor (new internal::ThreadDescriptor()) { @@ -1577,7 +1577,7 @@ namespace Threads * pointer above zero as long * as work is going on. */ - std_cxx0x::shared_ptr > thread_descriptor; + std_cxx1x::shared_ptr > thread_descriptor; }; @@ -1585,7 +1585,7 @@ namespace Threads { /** * A general template that returns - * std_cxx0x::ref(t) if t is of reference + * std_cxx1x::ref(t) if t is of reference * type, and t otherwise. * * The case that t is of reference type @@ -1605,7 +1605,7 @@ namespace Threads /** * A general template that returns - * std_cxx0x::ref(t) if t is of reference + * std_cxx1x::ref(t) if t is of reference * type, and t otherwise. * * The case that t is of reference type @@ -1615,9 +1615,9 @@ namespace Threads template struct maybe_make_ref { - static std_cxx0x::reference_wrapper act (T &t) + static std_cxx1x::reference_wrapper act (T &t) { - return std_cxx0x::ref(t); + return std_cxx1x::ref(t); } }; } @@ -1669,7 +1669,7 @@ namespace Threads : function (*function) {} - fun_encapsulator (const std_cxx0x::function::type> &function) + fun_encapsulator (const std_cxx1x::function::type> &function) : function (function) {} @@ -1681,7 +1681,7 @@ namespace Threads } private: - std_cxx0x::function::type> function; + std_cxx1x::function::type> function; }; /** @@ -1697,22 +1697,22 @@ namespace Threads : function (*function) {} - fun_encapsulator (const std_cxx0x::function::type> &function) + fun_encapsulator (const std_cxx1x::function::type> &function) : function (function) {} inline Thread - operator() (typename std_cxx0x::tuple_element<0,ArgList>::type arg1) + operator() (typename std_cxx1x::tuple_element<0,ArgList>::type arg1) { return Thread - (std_cxx0x::bind (function, - internal::maybe_make_ref::type>::act(arg1))); + (std_cxx1x::bind (function, + internal::maybe_make_ref::type>::act(arg1))); } private: - std_cxx0x::function::type> function; + std_cxx1x::function::type> function; }; /** @@ -1728,24 +1728,24 @@ namespace Threads : function (*function) {} - fun_encapsulator (const std_cxx0x::function::type> &function) + fun_encapsulator (const std_cxx1x::function::type> &function) : function (function) {} inline Thread - operator() (typename std_cxx0x::tuple_element<0,ArgList>::type arg1, - typename std_cxx0x::tuple_element<1,ArgList>::type arg2) + operator() (typename std_cxx1x::tuple_element<0,ArgList>::type arg1, + typename std_cxx1x::tuple_element<1,ArgList>::type arg2) { return Thread - (std_cxx0x::bind (function, - internal::maybe_make_ref::type>::act(arg1), - internal::maybe_make_ref::type>::act(arg2))); + (std_cxx1x::bind (function, + internal::maybe_make_ref::type>::act(arg1), + internal::maybe_make_ref::type>::act(arg2))); } private: - std_cxx0x::function::type> function; + std_cxx1x::function::type> function; }; /** @@ -1761,26 +1761,26 @@ namespace Threads : function (*function) {} - fun_encapsulator (const std_cxx0x::function::type> &function) + fun_encapsulator (const std_cxx1x::function::type> &function) : function (function) {} inline Thread - operator() (typename std_cxx0x::tuple_element<0,ArgList>::type arg1, - typename std_cxx0x::tuple_element<1,ArgList>::type arg2, - typename std_cxx0x::tuple_element<2,ArgList>::type arg3) + operator() (typename std_cxx1x::tuple_element<0,ArgList>::type arg1, + typename std_cxx1x::tuple_element<1,ArgList>::type arg2, + typename std_cxx1x::tuple_element<2,ArgList>::type arg3) { return Thread - (std_cxx0x::bind (function, - internal::maybe_make_ref::type>::act(arg1), - internal::maybe_make_ref::type>::act(arg2), - internal::maybe_make_ref::type>::act(arg3))); + (std_cxx1x::bind (function, + internal::maybe_make_ref::type>::act(arg1), + internal::maybe_make_ref::type>::act(arg2), + internal::maybe_make_ref::type>::act(arg3))); } private: - std_cxx0x::function::type> function; + std_cxx1x::function::type> function; }; /** @@ -1796,28 +1796,28 @@ namespace Threads : function (*function) {} - fun_encapsulator (const std_cxx0x::function::type> &function) + fun_encapsulator (const std_cxx1x::function::type> &function) : function (function) {} inline Thread - operator() (typename std_cxx0x::tuple_element<0,ArgList>::type arg1, - typename std_cxx0x::tuple_element<1,ArgList>::type arg2, - typename std_cxx0x::tuple_element<2,ArgList>::type arg3, - typename std_cxx0x::tuple_element<3,ArgList>::type arg4) + operator() (typename std_cxx1x::tuple_element<0,ArgList>::type arg1, + typename std_cxx1x::tuple_element<1,ArgList>::type arg2, + typename std_cxx1x::tuple_element<2,ArgList>::type arg3, + typename std_cxx1x::tuple_element<3,ArgList>::type arg4) { return Thread - (std_cxx0x::bind (function, - internal::maybe_make_ref::type>::act(arg1), - internal::maybe_make_ref::type>::act(arg2), - internal::maybe_make_ref::type>::act(arg3), - internal::maybe_make_ref::type>::act(arg4))); + (std_cxx1x::bind (function, + internal::maybe_make_ref::type>::act(arg1), + internal::maybe_make_ref::type>::act(arg2), + internal::maybe_make_ref::type>::act(arg3), + internal::maybe_make_ref::type>::act(arg4))); } private: - std_cxx0x::function::type> function; + std_cxx1x::function::type> function; }; /** @@ -1833,30 +1833,30 @@ namespace Threads : function (*function) {} - fun_encapsulator (const std_cxx0x::function::type> &function) + fun_encapsulator (const std_cxx1x::function::type> &function) : function (function) {} inline Thread - operator() (typename std_cxx0x::tuple_element<0,ArgList>::type arg1, - typename std_cxx0x::tuple_element<1,ArgList>::type arg2, - typename std_cxx0x::tuple_element<2,ArgList>::type arg3, - typename std_cxx0x::tuple_element<3,ArgList>::type arg4, - typename std_cxx0x::tuple_element<4,ArgList>::type arg5) + operator() (typename std_cxx1x::tuple_element<0,ArgList>::type arg1, + typename std_cxx1x::tuple_element<1,ArgList>::type arg2, + typename std_cxx1x::tuple_element<2,ArgList>::type arg3, + typename std_cxx1x::tuple_element<3,ArgList>::type arg4, + typename std_cxx1x::tuple_element<4,ArgList>::type arg5) { return Thread - (std_cxx0x::bind (function, - internal::maybe_make_ref::type>::act(arg1), - internal::maybe_make_ref::type>::act(arg2), - internal::maybe_make_ref::type>::act(arg3), - internal::maybe_make_ref::type>::act(arg4), - internal::maybe_make_ref::type>::act(arg5))); + (std_cxx1x::bind (function, + internal::maybe_make_ref::type>::act(arg1), + internal::maybe_make_ref::type>::act(arg2), + internal::maybe_make_ref::type>::act(arg3), + internal::maybe_make_ref::type>::act(arg4), + internal::maybe_make_ref::type>::act(arg5))); } private: - std_cxx0x::function::type> function; + std_cxx1x::function::type> function; }; /** @@ -1872,32 +1872,32 @@ namespace Threads : function (*function) {} - fun_encapsulator (const std_cxx0x::function::type> &function) + fun_encapsulator (const std_cxx1x::function::type> &function) : function (function) {} inline Thread - operator() (typename std_cxx0x::tuple_element<0,ArgList>::type arg1, - typename std_cxx0x::tuple_element<1,ArgList>::type arg2, - typename std_cxx0x::tuple_element<2,ArgList>::type arg3, - typename std_cxx0x::tuple_element<3,ArgList>::type arg4, - typename std_cxx0x::tuple_element<4,ArgList>::type arg5, - typename std_cxx0x::tuple_element<5,ArgList>::type arg6) + operator() (typename std_cxx1x::tuple_element<0,ArgList>::type arg1, + typename std_cxx1x::tuple_element<1,ArgList>::type arg2, + typename std_cxx1x::tuple_element<2,ArgList>::type arg3, + typename std_cxx1x::tuple_element<3,ArgList>::type arg4, + typename std_cxx1x::tuple_element<4,ArgList>::type arg5, + typename std_cxx1x::tuple_element<5,ArgList>::type arg6) { return Thread - (std_cxx0x::bind (function, - internal::maybe_make_ref::type>::act(arg1), - internal::maybe_make_ref::type>::act(arg2), - internal::maybe_make_ref::type>::act(arg3), - internal::maybe_make_ref::type>::act(arg4), - internal::maybe_make_ref::type>::act(arg5), - internal::maybe_make_ref::type>::act(arg6))); + (std_cxx1x::bind (function, + internal::maybe_make_ref::type>::act(arg1), + internal::maybe_make_ref::type>::act(arg2), + internal::maybe_make_ref::type>::act(arg3), + internal::maybe_make_ref::type>::act(arg4), + internal::maybe_make_ref::type>::act(arg5), + internal::maybe_make_ref::type>::act(arg6))); } private: - std_cxx0x::function::type> function; + std_cxx1x::function::type> function; }; /** @@ -1913,34 +1913,34 @@ namespace Threads : function (*function) {} - fun_encapsulator (const std_cxx0x::function::type> &function) + fun_encapsulator (const std_cxx1x::function::type> &function) : function (function) {} inline Thread - operator() (typename std_cxx0x::tuple_element<0,ArgList>::type arg1, - typename std_cxx0x::tuple_element<1,ArgList>::type arg2, - typename std_cxx0x::tuple_element<2,ArgList>::type arg3, - typename std_cxx0x::tuple_element<3,ArgList>::type arg4, - typename std_cxx0x::tuple_element<4,ArgList>::type arg5, - typename std_cxx0x::tuple_element<5,ArgList>::type arg6, - typename std_cxx0x::tuple_element<6,ArgList>::type arg7) + operator() (typename std_cxx1x::tuple_element<0,ArgList>::type arg1, + typename std_cxx1x::tuple_element<1,ArgList>::type arg2, + typename std_cxx1x::tuple_element<2,ArgList>::type arg3, + typename std_cxx1x::tuple_element<3,ArgList>::type arg4, + typename std_cxx1x::tuple_element<4,ArgList>::type arg5, + typename std_cxx1x::tuple_element<5,ArgList>::type arg6, + typename std_cxx1x::tuple_element<6,ArgList>::type arg7) { return Thread - (std_cxx0x::bind (function, - internal::maybe_make_ref::type>::act(arg1), - internal::maybe_make_ref::type>::act(arg2), - internal::maybe_make_ref::type>::act(arg3), - internal::maybe_make_ref::type>::act(arg4), - internal::maybe_make_ref::type>::act(arg5), - internal::maybe_make_ref::type>::act(arg6), - internal::maybe_make_ref::type>::act(arg7))); + (std_cxx1x::bind (function, + internal::maybe_make_ref::type>::act(arg1), + internal::maybe_make_ref::type>::act(arg2), + internal::maybe_make_ref::type>::act(arg3), + internal::maybe_make_ref::type>::act(arg4), + internal::maybe_make_ref::type>::act(arg5), + internal::maybe_make_ref::type>::act(arg6), + internal::maybe_make_ref::type>::act(arg7))); } private: - std_cxx0x::function::type> function; + std_cxx1x::function::type> function; }; /** @@ -1956,36 +1956,36 @@ namespace Threads : function (*function) {} - fun_encapsulator (const std_cxx0x::function::type> &function) + fun_encapsulator (const std_cxx1x::function::type> &function) : function (function) {} inline Thread - operator() (typename std_cxx0x::tuple_element<0,ArgList>::type arg1, - typename std_cxx0x::tuple_element<1,ArgList>::type arg2, - typename std_cxx0x::tuple_element<2,ArgList>::type arg3, - typename std_cxx0x::tuple_element<3,ArgList>::type arg4, - typename std_cxx0x::tuple_element<4,ArgList>::type arg5, - typename std_cxx0x::tuple_element<5,ArgList>::type arg6, - typename std_cxx0x::tuple_element<6,ArgList>::type arg7, - typename std_cxx0x::tuple_element<7,ArgList>::type arg8) + operator() (typename std_cxx1x::tuple_element<0,ArgList>::type arg1, + typename std_cxx1x::tuple_element<1,ArgList>::type arg2, + typename std_cxx1x::tuple_element<2,ArgList>::type arg3, + typename std_cxx1x::tuple_element<3,ArgList>::type arg4, + typename std_cxx1x::tuple_element<4,ArgList>::type arg5, + typename std_cxx1x::tuple_element<5,ArgList>::type arg6, + typename std_cxx1x::tuple_element<6,ArgList>::type arg7, + typename std_cxx1x::tuple_element<7,ArgList>::type arg8) { return Thread - (std_cxx0x::bind (function, - internal::maybe_make_ref::type>::act(arg1), - internal::maybe_make_ref::type>::act(arg2), - internal::maybe_make_ref::type>::act(arg3), - internal::maybe_make_ref::type>::act(arg4), - internal::maybe_make_ref::type>::act(arg5), - internal::maybe_make_ref::type>::act(arg6), - internal::maybe_make_ref::type>::act(arg7), - internal::maybe_make_ref::type>::act(arg8))); + (std_cxx1x::bind (function, + internal::maybe_make_ref::type>::act(arg1), + internal::maybe_make_ref::type>::act(arg2), + internal::maybe_make_ref::type>::act(arg3), + internal::maybe_make_ref::type>::act(arg4), + internal::maybe_make_ref::type>::act(arg5), + internal::maybe_make_ref::type>::act(arg6), + internal::maybe_make_ref::type>::act(arg7), + internal::maybe_make_ref::type>::act(arg8))); } private: - std_cxx0x::function::type> function; + std_cxx1x::function::type> function; }; /** @@ -2001,38 +2001,38 @@ namespace Threads : function (*function) {} - fun_encapsulator (const std_cxx0x::function::type> &function) + fun_encapsulator (const std_cxx1x::function::type> &function) : function (function) {} inline Thread - operator() (typename std_cxx0x::tuple_element<0,ArgList>::type arg1, - typename std_cxx0x::tuple_element<1,ArgList>::type arg2, - typename std_cxx0x::tuple_element<2,ArgList>::type arg3, - typename std_cxx0x::tuple_element<3,ArgList>::type arg4, - typename std_cxx0x::tuple_element<4,ArgList>::type arg5, - typename std_cxx0x::tuple_element<5,ArgList>::type arg6, - typename std_cxx0x::tuple_element<6,ArgList>::type arg7, - typename std_cxx0x::tuple_element<7,ArgList>::type arg8, - typename std_cxx0x::tuple_element<8,ArgList>::type arg9) + operator() (typename std_cxx1x::tuple_element<0,ArgList>::type arg1, + typename std_cxx1x::tuple_element<1,ArgList>::type arg2, + typename std_cxx1x::tuple_element<2,ArgList>::type arg3, + typename std_cxx1x::tuple_element<3,ArgList>::type arg4, + typename std_cxx1x::tuple_element<4,ArgList>::type arg5, + typename std_cxx1x::tuple_element<5,ArgList>::type arg6, + typename std_cxx1x::tuple_element<6,ArgList>::type arg7, + typename std_cxx1x::tuple_element<7,ArgList>::type arg8, + typename std_cxx1x::tuple_element<8,ArgList>::type arg9) { return Thread - (std_cxx0x::bind (function, - internal::maybe_make_ref::type>::act(arg1), - internal::maybe_make_ref::type>::act(arg2), - internal::maybe_make_ref::type>::act(arg3), - internal::maybe_make_ref::type>::act(arg4), - internal::maybe_make_ref::type>::act(arg5), - internal::maybe_make_ref::type>::act(arg6), - internal::maybe_make_ref::type>::act(arg7), - internal::maybe_make_ref::type>::act(arg8), - internal::maybe_make_ref::type>::act(arg9))); + (std_cxx1x::bind (function, + internal::maybe_make_ref::type>::act(arg1), + internal::maybe_make_ref::type>::act(arg2), + internal::maybe_make_ref::type>::act(arg3), + internal::maybe_make_ref::type>::act(arg4), + internal::maybe_make_ref::type>::act(arg5), + internal::maybe_make_ref::type>::act(arg6), + internal::maybe_make_ref::type>::act(arg7), + internal::maybe_make_ref::type>::act(arg8), + internal::maybe_make_ref::type>::act(arg9))); } private: - std_cxx0x::function::type> function; + std_cxx1x::function::type> function; }; } @@ -2048,7 +2048,7 @@ namespace Threads */ template inline - internal::fun_encapsulator,0> + internal::fun_encapsulator,0> spawn (RT (*fun_ptr)()) { return fun_ptr; @@ -2062,12 +2062,12 @@ namespace Threads */ template inline - internal::fun_encapsulator,0> + internal::fun_encapsulator,0> spawn (C &c, RT (C::*fun_ptr)()) { return - std_cxx0x::function >::type> - (std_cxx0x::bind(fun_ptr, std_cxx0x::ref(c))); + std_cxx1x::function >::type> + (std_cxx1x::bind(fun_ptr, std_cxx1x::ref(c))); } /** @@ -2077,12 +2077,12 @@ namespace Threads */ template inline - internal::fun_encapsulator,0> + internal::fun_encapsulator,0> spawn (const C &c, RT (C::*fun_ptr)() const) { return - std_cxx0x::function >::type> - (std_cxx0x::bind(fun_ptr, std_cxx0x::cref(c))); + std_cxx1x::function >::type> + (std_cxx1x::bind(fun_ptr, std_cxx1x::cref(c))); } @@ -2097,7 +2097,7 @@ namespace Threads */ template inline - internal::fun_encapsulator,1> + internal::fun_encapsulator,1> spawn (RT (*fun_ptr)(Arg1)) { return fun_ptr; @@ -2112,12 +2112,12 @@ namespace Threads */ template inline - internal::fun_encapsulator,1> + internal::fun_encapsulator,1> spawn (C &c, RT (C::*fun_ptr)(Arg1)) { return - std_cxx0x::function >::type> - (std_cxx0x::bind(fun_ptr, std_cxx0x::ref(c), _1)); + std_cxx1x::function >::type> + (std_cxx1x::bind(fun_ptr, std_cxx1x::ref(c), _1)); } /** @@ -2127,12 +2127,12 @@ namespace Threads */ template inline - internal::fun_encapsulator,1> + internal::fun_encapsulator,1> spawn (const C &c, RT (C::*fun_ptr)(Arg1) const) { return - std_cxx0x::function >::type> - (std_cxx0x::bind(fun_ptr, std_cxx0x::cref(c), _1)); + std_cxx1x::function >::type> + (std_cxx1x::bind(fun_ptr, std_cxx1x::cref(c), _1)); } @@ -2145,7 +2145,7 @@ namespace Threads */ template inline - internal::fun_encapsulator,2> + internal::fun_encapsulator,2> spawn (RT (*fun_ptr)(Arg1,Arg2)) { return fun_ptr; @@ -2160,12 +2160,12 @@ namespace Threads */ template inline - internal::fun_encapsulator,2> + internal::fun_encapsulator,2> spawn (C &c, RT (C::*fun_ptr)(Arg1,Arg2)) { return - std_cxx0x::function >::type> - (std_cxx0x::bind(fun_ptr, std_cxx0x::ref(c), _1, _2)); + std_cxx1x::function >::type> + (std_cxx1x::bind(fun_ptr, std_cxx1x::ref(c), _1, _2)); } /** @@ -2175,12 +2175,12 @@ namespace Threads */ template inline - internal::fun_encapsulator,2> + internal::fun_encapsulator,2> spawn (const C &c, RT (C::*fun_ptr)(Arg1,Arg2) const) { return - std_cxx0x::function >::type> - (std_cxx0x::bind(fun_ptr, std_cxx0x::cref(c), _1, _2)); + std_cxx1x::function >::type> + (std_cxx1x::bind(fun_ptr, std_cxx1x::cref(c), _1, _2)); } @@ -2194,7 +2194,7 @@ namespace Threads template inline - internal::fun_encapsulator,3> + internal::fun_encapsulator,3> spawn (RT (*fun_ptr)(Arg1,Arg2,Arg3)) { return fun_ptr; @@ -2210,12 +2210,12 @@ namespace Threads template inline - internal::fun_encapsulator,3> + internal::fun_encapsulator,3> spawn (C &c, RT (C::*fun_ptr)(Arg1,Arg2,Arg3)) { return - std_cxx0x::function >::type> - (std_cxx0x::bind(fun_ptr, std_cxx0x::ref(c), _1, _2, _3)); + std_cxx1x::function >::type> + (std_cxx1x::bind(fun_ptr, std_cxx1x::ref(c), _1, _2, _3)); } /** @@ -2226,12 +2226,12 @@ namespace Threads template inline - internal::fun_encapsulator,3> + internal::fun_encapsulator,3> spawn (const C &c, RT (C::*fun_ptr)(Arg1,Arg2,Arg3) const) { return - std_cxx0x::function >::type> - (std_cxx0x::bind(fun_ptr, std_cxx0x::cref(c), _1, _2, _3)); + std_cxx1x::function >::type> + (std_cxx1x::bind(fun_ptr, std_cxx1x::cref(c), _1, _2, _3)); } @@ -2246,7 +2246,7 @@ namespace Threads template inline - internal::fun_encapsulator,4> + internal::fun_encapsulator,4> spawn (RT (*fun_ptr)(Arg1,Arg2,Arg3,Arg4)) { return fun_ptr; @@ -2262,12 +2262,12 @@ namespace Threads template inline - internal::fun_encapsulator,4> + internal::fun_encapsulator,4> spawn (C &c, RT (C::*fun_ptr)(Arg1,Arg2,Arg3,Arg4)) { return - std_cxx0x::function >::type> - (std_cxx0x::bind(fun_ptr, std_cxx0x::ref(c), _1, _2, _3, _4)); + std_cxx1x::function >::type> + (std_cxx1x::bind(fun_ptr, std_cxx1x::ref(c), _1, _2, _3, _4)); } /** @@ -2278,12 +2278,12 @@ namespace Threads template inline - internal::fun_encapsulator,4> + internal::fun_encapsulator,4> spawn (const C &c, RT (C::*fun_ptr)(Arg1,Arg2,Arg3,Arg4) const) { return - std_cxx0x::function >::type> - (std_cxx0x::bind(fun_ptr, std_cxx0x::cref(c), _1, _2, _3, _4)); + std_cxx1x::function >::type> + (std_cxx1x::bind(fun_ptr, std_cxx1x::cref(c), _1, _2, _3, _4)); } @@ -2298,7 +2298,7 @@ namespace Threads typename Arg1, typename Arg2, typename Arg3, typename Arg4, typename Arg5> inline - internal::fun_encapsulator,5> + internal::fun_encapsulator,5> spawn (RT (*fun_ptr)(Arg1,Arg2,Arg3,Arg4,Arg5)) { return fun_ptr; @@ -2315,12 +2315,12 @@ namespace Threads typename Arg1, typename Arg2, typename Arg3, typename Arg4, typename Arg5> inline - internal::fun_encapsulator,5> + internal::fun_encapsulator,5> spawn (C &c, RT (C::*fun_ptr)(Arg1,Arg2,Arg3,Arg4,Arg5)) { return - std_cxx0x::function >::type> - (std_cxx0x::bind(fun_ptr, std_cxx0x::ref(c), _1, _2, _3, _4, _5)); + std_cxx1x::function >::type> + (std_cxx1x::bind(fun_ptr, std_cxx1x::ref(c), _1, _2, _3, _4, _5)); } /** @@ -2332,12 +2332,12 @@ namespace Threads typename Arg1, typename Arg2, typename Arg3, typename Arg4, typename Arg5> inline - internal::fun_encapsulator,5> + internal::fun_encapsulator,5> spawn (const C &c, RT (C::*fun_ptr)(Arg1,Arg2,Arg3,Arg4,Arg5) const) { return - std_cxx0x::function >::type> - (std_cxx0x::bind(fun_ptr, std_cxx0x::cref(c), _1, _2, _3, _4, _5)); + std_cxx1x::function >::type> + (std_cxx1x::bind(fun_ptr, std_cxx1x::cref(c), _1, _2, _3, _4, _5)); } @@ -2352,7 +2352,7 @@ namespace Threads typename Arg1, typename Arg2, typename Arg3, typename Arg4, typename Arg5, typename Arg6> inline - internal::fun_encapsulator,6> + internal::fun_encapsulator,6> spawn (RT (*fun_ptr)(Arg1,Arg2,Arg3,Arg4,Arg5,Arg6)) { return fun_ptr; @@ -2369,12 +2369,12 @@ namespace Threads typename Arg1, typename Arg2, typename Arg3, typename Arg4, typename Arg5, typename Arg6> inline - internal::fun_encapsulator,6> + internal::fun_encapsulator,6> spawn (C &c, RT (C::*fun_ptr)(Arg1,Arg2,Arg3,Arg4,Arg5,Arg6)) { return - std_cxx0x::function >::type> - (std_cxx0x::bind(fun_ptr, std_cxx0x::ref(c), _1, _2, _3, _4, _5, _6)); + std_cxx1x::function >::type> + (std_cxx1x::bind(fun_ptr, std_cxx1x::ref(c), _1, _2, _3, _4, _5, _6)); } /** @@ -2387,12 +2387,12 @@ namespace Threads typename Arg4, typename Arg5, typename Arg6> inline internal::fun_encapsulator,6> + std_cxx1x::tuple,6> spawn (const C &c, RT (C::*fun_ptr)(Arg1,Arg2,Arg3,Arg4,Arg5,Arg6) const) { return - std_cxx0x::function >::type> - (std_cxx0x::bind(fun_ptr, std_cxx0x::cref(c), _1, _2, _3, _4, _5, _6)); + std_cxx1x::function >::type> + (std_cxx1x::bind(fun_ptr, std_cxx1x::cref(c), _1, _2, _3, _4, _5, _6)); } @@ -2408,7 +2408,7 @@ namespace Threads typename Arg4, typename Arg5, typename Arg6, typename Arg7> inline - internal::fun_encapsulator,7> spawn (RT (*fun_ptr)(Arg1,Arg2,Arg3,Arg4,Arg5,Arg6,Arg7)) { @@ -2427,13 +2427,13 @@ namespace Threads typename Arg4, typename Arg5, typename Arg6, typename Arg7> inline - internal::fun_encapsulator,7> spawn (C &c, RT (C::*fun_ptr)(Arg1,Arg2,Arg3,Arg4,Arg5,Arg6,Arg7)) { return - std_cxx0x::function >::type> - (std_cxx0x::bind(fun_ptr, std_cxx0x::ref(c), _1, _2, _3, _4, _5, _6, _7)); + std_cxx1x::function >::type> + (std_cxx1x::bind(fun_ptr, std_cxx1x::ref(c), _1, _2, _3, _4, _5, _6, _7)); } /** @@ -2447,13 +2447,13 @@ namespace Threads typename Arg7> inline internal::fun_encapsulator,7> spawn (const C &c, RT (C::*fun_ptr)(Arg1,Arg2,Arg3,Arg4,Arg5,Arg6,Arg7) const) { return - std_cxx0x::function >::type> - (std_cxx0x::bind(fun_ptr, std_cxx0x::cref(c), _1, _2, _3, _4, _5, _6, _7)); + std_cxx1x::function >::type> + (std_cxx1x::bind(fun_ptr, std_cxx1x::cref(c), _1, _2, _3, _4, _5, _6, _7)); } @@ -2469,7 +2469,7 @@ namespace Threads typename Arg4, typename Arg5, typename Arg6, typename Arg7, typename Arg8> inline - internal::fun_encapsulator,8> spawn (RT (*fun_ptr)(Arg1,Arg2,Arg3,Arg4,Arg5, @@ -2490,15 +2490,15 @@ namespace Threads typename Arg4, typename Arg5, typename Arg6, typename Arg7, typename Arg8> inline - internal::fun_encapsulator,8> spawn (C &c, RT (C::*fun_ptr)(Arg1,Arg2,Arg3,Arg4,Arg5, Arg6,Arg7,Arg8)) { return - std_cxx0x::function >::type> - (std_cxx0x::bind(fun_ptr, std_cxx0x::ref(c), _1, _2, _3, _4, _5, _6, _7, _8)); + std_cxx1x::function >::type> + (std_cxx1x::bind(fun_ptr, std_cxx1x::ref(c), _1, _2, _3, _4, _5, _6, _7, _8)); } /** @@ -2512,15 +2512,15 @@ namespace Threads typename Arg7, typename Arg8> inline internal::fun_encapsulator,8> spawn (const C &c, RT (C::*fun_ptr)(Arg1,Arg2,Arg3,Arg4,Arg5, Arg6,Arg7,Arg8) const) { return - std_cxx0x::function >::type> - (std_cxx0x::bind(fun_ptr, std_cxx0x::cref(c), _1, _2, _3, _4, _5, _6, _7, _8)); + std_cxx1x::function >::type> + (std_cxx1x::bind(fun_ptr, std_cxx1x::cref(c), _1, _2, _3, _4, _5, _6, _7, _8)); } @@ -2536,7 +2536,7 @@ namespace Threads typename Arg4, typename Arg5, typename Arg6, typename Arg7, typename Arg8, typename Arg9> inline - internal::fun_encapsulator,9> spawn (RT (*fun_ptr)(Arg1,Arg2,Arg3,Arg4,Arg5, @@ -2557,15 +2557,15 @@ namespace Threads typename Arg4, typename Arg5, typename Arg6, typename Arg7, typename Arg8, typename Arg9> inline - internal::fun_encapsulator,9> spawn (C &c, RT (C::*fun_ptr)(Arg1,Arg2,Arg3,Arg4,Arg5, Arg6,Arg7,Arg8,Arg9)) { return - std_cxx0x::function >::type> - (std_cxx0x::bind(fun_ptr, std_cxx0x::ref(c), _1, _2, _3, _4, _5, _6, _7, _8, _9)); + std_cxx1x::function >::type> + (std_cxx1x::bind(fun_ptr, std_cxx1x::ref(c), _1, _2, _3, _4, _5, _6, _7, _8, _9)); } /** @@ -2579,15 +2579,15 @@ namespace Threads typename Arg7, typename Arg8, typename Arg9> inline internal::fun_encapsulator,9> spawn (const C &c, RT (C::*fun_ptr)(Arg1,Arg2,Arg3,Arg4,Arg5, Arg6,Arg7,Arg8,Arg9) const) { return - std_cxx0x::function >::type> - (std_cxx0x::bind(fun_ptr, std_cxx0x::cref(c), _1, _2, _3, _4, _5, _6, _7, _8, _9)); + std_cxx1x::function >::type> + (std_cxx1x::bind(fun_ptr, std_cxx1x::cref(c), _1, _2, _3, _4, _5, _6, _7, _8, _9)); } diff --git a/deal.II/base/source/data_out_base.cc b/deal.II/base/source/data_out_base.cc index 92616e2a85..ae9161c52f 100644 --- a/deal.II/base/source/data_out_base.cc +++ b/deal.II/base/source/data_out_base.cc @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include #include @@ -1779,7 +1779,7 @@ DataOutBase::write_data ( template void DataOutBase::write_ucd (const std::vector > &patches, const std::vector &data_names, - const std::vector > &, + const std::vector > &, const UcdFlags &flags, std::ostream &out) { @@ -1860,7 +1860,7 @@ void DataOutBase::write_ucd (const std::vector > &patches, template void DataOutBase::write_dx (const std::vector > &patches, const std::vector &data_names, - const std::vector > &, + const std::vector > &, const DXFlags &flags, std::ostream &out) { @@ -2126,7 +2126,7 @@ void DataOutBase::write_dx (const std::vector > &patches, template void DataOutBase::write_gnuplot (const std::vector > &patches, const std::vector &data_names, - const std::vector > &, + const std::vector > &, const GnuplotFlags &/*flags*/, std::ostream &out) { @@ -2343,7 +2343,7 @@ void DataOutBase::write_gnuplot (const std::vector > &patche template void DataOutBase::write_povray (const std::vector > &patches, const std::vector &data_names, - const std::vector > &, + const std::vector > &, const PovrayFlags &flags, std::ostream &out) { @@ -2689,7 +2689,7 @@ void DataOutBase::write_povray (const std::vector > &patches template void DataOutBase::write_eps (const std::vector > &patches, const std::vector &/*data_names*/, - const std::vector > &, + const std::vector > &, const EpsFlags &flags, std::ostream &out) { @@ -3051,7 +3051,7 @@ void DataOutBase::write_eps (const std::vector > &patches, template void DataOutBase::write_gmv (const std::vector > &patches, const std::vector &data_names, - const std::vector > &, + const std::vector > &, const GmvFlags &flags, std::ostream &out) { @@ -3187,7 +3187,7 @@ void DataOutBase::write_gmv (const std::vector > &patches, template void DataOutBase::write_tecplot (const std::vector > &patches, const std::vector &data_names, - const std::vector > &, + const std::vector > &, const TecplotFlags &flags, std::ostream &out) { @@ -3421,7 +3421,7 @@ namespace template void DataOutBase::write_tecplot_binary (const std::vector > &patches, const std::vector &data_names, - const std::vector > &vector_data_ranges, + const std::vector > &vector_data_ranges, const TecplotFlags &flags, std::ostream &out) { @@ -3753,7 +3753,7 @@ template void DataOutBase::write_vtk (const std::vector > &patches, const std::vector &data_names, - const std::vector > &vector_data_ranges, + const std::vector > &vector_data_ranges, const VtkFlags &flags, std::ostream &out) { @@ -3881,21 +3881,21 @@ DataOutBase::write_vtk (const std::vector > &patches, std::vector data_set_written (n_data_sets, false); for (unsigned int n_th_vector=0; n_th_vector(vector_data_ranges[n_th_vector]) >= - std_cxx0x::get<0>(vector_data_ranges[n_th_vector]), - ExcLowerRange (std_cxx0x::get<1>(vector_data_ranges[n_th_vector]), - std_cxx0x::get<0>(vector_data_ranges[n_th_vector]))); - AssertThrow (std_cxx0x::get<1>(vector_data_ranges[n_th_vector]) < n_data_sets, - ExcIndexRange (std_cxx0x::get<1>(vector_data_ranges[n_th_vector]), + AssertThrow (std_cxx1x::get<1>(vector_data_ranges[n_th_vector]) >= + std_cxx1x::get<0>(vector_data_ranges[n_th_vector]), + ExcLowerRange (std_cxx1x::get<1>(vector_data_ranges[n_th_vector]), + std_cxx1x::get<0>(vector_data_ranges[n_th_vector]))); + AssertThrow (std_cxx1x::get<1>(vector_data_ranges[n_th_vector]) < n_data_sets, + ExcIndexRange (std_cxx1x::get<1>(vector_data_ranges[n_th_vector]), 0, n_data_sets)); - AssertThrow (std_cxx0x::get<1>(vector_data_ranges[n_th_vector]) + 1 - - std_cxx0x::get<0>(vector_data_ranges[n_th_vector]) <= 3, + AssertThrow (std_cxx1x::get<1>(vector_data_ranges[n_th_vector]) + 1 + - std_cxx1x::get<0>(vector_data_ranges[n_th_vector]) <= 3, ExcMessage ("Can't declare a vector with more than 3 components " "in VTK")); // mark these components as already written: - for (unsigned int i=std_cxx0x::get<0>(vector_data_ranges[n_th_vector]); - i<=std_cxx0x::get<1>(vector_data_ranges[n_th_vector]); + for (unsigned int i=std_cxx1x::get<0>(vector_data_ranges[n_th_vector]); + i<=std_cxx1x::get<1>(vector_data_ranges[n_th_vector]); ++i) data_set_written[i] = true; @@ -3906,15 +3906,15 @@ DataOutBase::write_vtk (const std::vector > &patches, // name has been specified out << "VECTORS "; - if (std_cxx0x::get<2>(vector_data_ranges[n_th_vector]) != "") - out << std_cxx0x::get<2>(vector_data_ranges[n_th_vector]); + if (std_cxx1x::get<2>(vector_data_ranges[n_th_vector]) != "") + out << std_cxx1x::get<2>(vector_data_ranges[n_th_vector]); else { - for (unsigned int i=std_cxx0x::get<0>(vector_data_ranges[n_th_vector]); - i(vector_data_ranges[n_th_vector]); + for (unsigned int i=std_cxx1x::get<0>(vector_data_ranges[n_th_vector]); + i(vector_data_ranges[n_th_vector]); ++i) out << data_names[i] << "__"; - out << data_names[std_cxx0x::get<1>(vector_data_ranges[n_th_vector])]; + out << data_names[std_cxx1x::get<1>(vector_data_ranges[n_th_vector])]; } out << " double" @@ -3925,23 +3925,23 @@ DataOutBase::write_vtk (const std::vector > &patches, // components for (unsigned int n=0; n(vector_data_ranges[n_th_vector]) - - std_cxx0x::get<0>(vector_data_ranges[n_th_vector])) + switch (std_cxx1x::get<1>(vector_data_ranges[n_th_vector]) - + std_cxx1x::get<0>(vector_data_ranges[n_th_vector])) { case 0: - out << data_vectors(std_cxx0x::get<0>(vector_data_ranges[n_th_vector]), n) << " 0 0" + out << data_vectors(std_cxx1x::get<0>(vector_data_ranges[n_th_vector]), n) << " 0 0" << '\n'; break; case 1: - out << data_vectors(std_cxx0x::get<0>(vector_data_ranges[n_th_vector]), n) << ' ' - << data_vectors(std_cxx0x::get<0>(vector_data_ranges[n_th_vector])+1, n) << " 0" + out << data_vectors(std_cxx1x::get<0>(vector_data_ranges[n_th_vector]), n) << ' ' + << data_vectors(std_cxx1x::get<0>(vector_data_ranges[n_th_vector])+1, n) << " 0" << '\n'; break; case 2: - out << data_vectors(std_cxx0x::get<0>(vector_data_ranges[n_th_vector]), n) << ' ' - << data_vectors(std_cxx0x::get<0>(vector_data_ranges[n_th_vector])+1, n) << ' ' - << data_vectors(std_cxx0x::get<0>(vector_data_ranges[n_th_vector])+2, n) + out << data_vectors(std_cxx1x::get<0>(vector_data_ranges[n_th_vector]), n) << ' ' + << data_vectors(std_cxx1x::get<0>(vector_data_ranges[n_th_vector])+1, n) << ' ' + << data_vectors(std_cxx1x::get<0>(vector_data_ranges[n_th_vector])+2, n) << '\n'; break; @@ -3988,7 +3988,7 @@ void DataOutBase:: write_deal_II_intermediate (const std::vector > &patches, const std::vector &data_names, - const std::vector > &vector_data_ranges, + const std::vector > &vector_data_ranges, const Deal_II_IntermediateFlags &/*flags*/, std::ostream &out) { @@ -4016,9 +4016,9 @@ write_deal_II_intermediate (const std::vector > &patches, out << vector_data_ranges.size() << '\n'; for (unsigned int i=0; i(vector_data_ranges[i]) << ' ' - << std_cxx0x::get<1>(vector_data_ranges[i]) << '\n' - << std_cxx0x::get<2>(vector_data_ranges[i]) << '\n'; + out << std_cxx1x::get<0>(vector_data_ranges[i]) << ' ' + << std_cxx1x::get<1>(vector_data_ranges[i]) << '\n' + << std_cxx1x::get<2>(vector_data_ranges[i]) << '\n'; out << '\n'; // make sure everything now gets to @@ -4492,10 +4492,10 @@ DataOutInterface::memory_consumption () const template -std::vector > +std::vector > DataOutInterface::get_vector_data_ranges () const { - return std::vector >(); + return std::vector >(); } @@ -4520,7 +4520,7 @@ DataOutReader::read (std::istream &in) tmp.swap (dataset_names); } { - std::vector > tmp; + std::vector > tmp; tmp.swap (vector_data_ranges); } @@ -4595,8 +4595,8 @@ DataOutReader::read (std::istream &in) vector_data_ranges.resize (n_vector_data_ranges); for (unsigned int i=0; i> std_cxx0x::get<0>(vector_data_ranges[i]) - >> std_cxx0x::get<1>(vector_data_ranges[i]); + in >> std_cxx1x::get<0>(vector_data_ranges[i]) + >> std_cxx1x::get<1>(vector_data_ranges[i]); // read in the name of that vector // range. because it is on a separate @@ -4609,7 +4609,7 @@ DataOutReader::read (std::istream &in) std::string name; getline(in, name); getline(in, name); - std_cxx0x::get<2>(vector_data_ranges[i]) = name; + std_cxx1x::get<2>(vector_data_ranges[i]) = name; } Assert (in, ExcIO()); @@ -4640,16 +4640,16 @@ merge (const DataOutReader &source) "as vectors.")); for (unsigned int i=0; i(get_vector_data_ranges()[i]) == - std_cxx0x::get<0>(source.get_vector_data_ranges()[i]), + Assert (std_cxx1x::get<0>(get_vector_data_ranges()[i]) == + std_cxx1x::get<0>(source.get_vector_data_ranges()[i]), ExcMessage ("Both sources need to declare the same components " "as vectors.")); - Assert (std_cxx0x::get<1>(get_vector_data_ranges()[i]) == - std_cxx0x::get<1>(source.get_vector_data_ranges()[i]), + Assert (std_cxx1x::get<1>(get_vector_data_ranges()[i]) == + std_cxx1x::get<1>(source.get_vector_data_ranges()[i]), ExcMessage ("Both sources need to declare the same components " "as vectors.")); - Assert (std_cxx0x::get<2>(get_vector_data_ranges()[i]) == - std_cxx0x::get<2>(source.get_vector_data_ranges()[i]), + Assert (std_cxx1x::get<2>(get_vector_data_ranges()[i]) == + std_cxx1x::get<2>(source.get_vector_data_ranges()[i]), ExcMessage ("Both sources need to declare the same components " "as vectors.")); } @@ -4703,7 +4703,7 @@ DataOutReader::get_dataset_names () const template -std::vector > +std::vector > DataOutReader::get_vector_data_ranges () const { return vector_data_ranges; diff --git a/deal.II/base/source/log.cc b/deal.II/base/source/log.cc index b971f3a216..19f74df5df 100644 --- a/deal.II/base/source/log.cc +++ b/deal.II/base/source/log.cc @@ -122,10 +122,10 @@ LogStream::get_stream() Threads::ThreadMutex::ScopedLock lock(log_lock); unsigned int id = Threads::this_thread_id(); - std_cxx0x::shared_ptr& sptr = outstreams[id]; + std_cxx1x::shared_ptr& sptr = outstreams[id]; if (sptr == 0) { - sptr = std_cxx0x::shared_ptr (new std::ostringstream()); + sptr = std_cxx1x::shared_ptr (new std::ostringstream()); sptr->setf(std::ios::showpoint | std::ios::left); } return *sptr; diff --git a/deal.II/configure b/deal.II/configure index 19281bc2f1..127d4c2dca 100755 --- a/deal.II/configure +++ b/deal.II/configure @@ -1,12 +1,12 @@ #! /bin/sh -# From configure.in Revision: 18546 . +# From configure.in Revision: 18645 . # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for deal.II 6.2.pre. +# Generated by GNU Autoconf 2.61 for deal.II 6.2.pre. # # Report bugs to . # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. ## --------------------- ## @@ -18,7 +18,7 @@ DUALCASE=1; export DUALCASE # for MKS sh if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: - # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which + # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST @@ -40,45 +40,17 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS as_cr_digits='0123456789' as_cr_alnum=$as_cr_Letters$as_cr_digits -as_nl=' -' -export as_nl -# Printing a long string crashes Solaris 7 /usr/bin/printf. -as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' -as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo -as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo -if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then - as_echo='printf %s\n' - as_echo_n='printf %s' -else - if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then - as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' - as_echo_n='/usr/ucb/echo -n' - else - as_echo_body='eval expr "X$1" : "X\\(.*\\)"' - as_echo_n_body='eval - arg=$1; - case $arg in - *"$as_nl"*) - expr "X$arg" : "X\\(.*\\)$as_nl"; - arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; - esac; - expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" - ' - export as_echo_n_body - as_echo_n='sh -c $as_echo_n_body as_echo' - fi - export as_echo_body - as_echo='sh -c $as_echo_body as_echo' -fi - # The user is always right. if test "${PATH_SEPARATOR+set}" != set; then - PATH_SEPARATOR=: - (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { - (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || - PATH_SEPARATOR=';' - } + echo "#! /bin/sh" >conf$$.sh + echo "exit 0" >>conf$$.sh + chmod +x conf$$.sh + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then + PATH_SEPARATOR=';' + else + PATH_SEPARATOR=: + fi + rm -f conf$$.sh fi # Support unset when possible. @@ -94,6 +66,8 @@ fi # there to prevent editors from complaining about space-tab. # (If _AS_PATH_WALK were called with IFS unset, it would disable word # splitting by setting IFS to empty value.) +as_nl=' +' IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. @@ -116,7 +90,7 @@ if test "x$as_myself" = x; then as_myself=$0 fi if test ! -f "$as_myself"; then - $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 { (exit 1); exit 1; } fi @@ -129,10 +103,17 @@ PS2='> ' PS4='+ ' # NLS nuisances. -LC_ALL=C -export LC_ALL -LANGUAGE=C -export LANGUAGE +for as_var in \ + LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ + LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ + LC_TELEPHONE LC_TIME +do + if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then + eval $as_var=C; export $as_var + else + ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var + fi +done # Required to use basename. if expr a : '\(a\)' >/dev/null 2>&1 && @@ -154,7 +135,7 @@ as_me=`$as_basename -- "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ X"$0" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X/"$0" | +echo X/"$0" | sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/ q @@ -180,7 +161,7 @@ else as_have_required=no fi - if test $as_have_required = yes && (eval ": + if test $as_have_required = yes && (eval ": (as_func_return () { (exit \$1) } @@ -262,7 +243,7 @@ IFS=$as_save_IFS if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: - # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which + # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST @@ -283,7 +264,7 @@ _ASEOF if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: - # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which + # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST @@ -363,10 +344,10 @@ fi if test "x$CONFIG_SHELL" != x; then for as_var in BASH_ENV ENV - do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var - done - export CONFIG_SHELL - exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} + do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var + done + export CONFIG_SHELL + exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} fi @@ -435,10 +416,9 @@ fi test \$exitcode = 0") || { echo No shell found that supports shell functions. - echo Please tell bug-autoconf@gnu.org about your system, - echo including any error possibly output before this message. - echo This can help us improve future autoconf versions. - echo Configuration will now proceed without shell functions. + echo Please tell autoconf@gnu.org about your system, + echo including any error possibly output before this + echo message } @@ -474,7 +454,7 @@ test \$exitcode = 0") || { s/-\n.*// ' >$as_me.lineno && chmod +x "$as_me.lineno" || - { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 + { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 { (exit 1); exit 1; }; } # Don't try to exec as it changes $[0], causing all sort of problems @@ -502,6 +482,7 @@ case `echo -n x` in *) ECHO_N='-n';; esac + if expr a : '\(a\)' >/dev/null 2>&1 && test "X`expr 00001 : '.*\(...\)'`" = X001; then as_expr=expr @@ -514,22 +495,19 @@ if test -d conf$$.dir; then rm -f conf$$.dir/conf$$.file else rm -f conf$$.dir - mkdir conf$$.dir 2>/dev/null -fi -if (echo >conf$$.file) 2>/dev/null; then - if ln -s conf$$.file conf$$ 2>/dev/null; then - as_ln_s='ln -s' - # ... but there are two gotchas: - # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. - # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. - ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' - elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln - else + mkdir conf$$.dir +fi +echo >conf$$.file +if ln -s conf$$.file conf$$ 2>/dev/null; then + as_ln_s='ln -s' + # ... but there are two gotchas: + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. + # In both cases, we have to default to `cp -p'. + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || as_ln_s='cp -p' - fi +elif ln conf$$.file conf$$ 2>/dev/null; then + as_ln_s=ln else as_ln_s='cp -p' fi @@ -554,10 +532,10 @@ else as_test_x=' eval sh -c '\'' if test -d "$1"; then - test -d "$1/."; + test -d "$1/."; else case $1 in - -*)set "./$1";; + -*)set "./$1";; esac; case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in ???[sx]*):;;*)false;;esac;fi @@ -640,179 +618,148 @@ ac_includes_default="\ # include #endif" -enable_option_checking=no -ac_subst_vars='LTLIBOBJS -LIBOBJS -LDFLAGSPIC -subdirs -PERL -DEAL_II_HAVE_DOT -DOXYGEN_OPTIONS -DOT -DOXYGEN -USE_CONTRIB_UMFPACK -UMFPACK_INCLUDE_DIR -UMFPACK_LIB -DEAL_II_METIS_LIBDIR -DEAL_II_METIS_INCDIR -USE_CONTRIB_METIS -TECPLOT_INCLUDE_DIR -USE_CONTRIB_HSL -HSL_INCLUDE_DIR -NEEDS_F77LIBS -DEAL_II_TRILINOS_STATIC -DEAL_II_TRILINOS_SHARED -DEAL_II_TRILINOS_LIBDIR -DEAL_II_TRILINOS_INCDIR -USE_CONTRIB_TRILINOS -DEAL_II_EXPAND_TRILINOS_BLOCK_SPARSITY_PATTERN -DEAL_II_EXPAND_TRILINOS_SPARSITY_PATTERN -DEAL_II_EXPAND_TRILINOS_MPI_BLOCKVECTOR -DEAL_II_EXPAND_TRILINOS_BLOCKVECTOR -DEAL_II_EXPAND_TRILINOS_MPI_VECTOR -DEAL_II_EXPAND_TRILINOS_VECTOR -DEAL_II_DEFINE_DEAL_II_USE_SLEPC -DEAL_II_SLEPC_VERSION_SUBMINOR -DEAL_II_SLEPC_VERSION_MINOR -DEAL_II_SLEPC_VERSION_MAJOR -DEAL_II_SLEPC_ARCH -DEAL_II_SLEPC_DIR -USE_CONTRIB_SLEPC -DEAL_II_DEFINE_DEAL_II_USE_PETSC -DEAL_II_PETSC_MPIUNI_LIB -DEAL_II_PETSC_VERSION_SUBMINOR -DEAL_II_PETSC_VERSION_MINOR -DEAL_II_PETSC_VERSION_MAJOR -DEAL_II_PETSC_ARCH -DEAL_II_PETSC_DIR -USE_CONTRIB_PETSC -DEAL_II_EXPAND_PETSC_BLOCKVECTOR -DEAL_II_EXPAND_PETSC_VECTOR -DEAL_II_DISABLE_PARSER -enableparser -RANLIB -AR -shared_lib_suffix -static_lib_suffix -enableshared -DEAL_II_LD_UNDERSTANDS_DYLIB_INSTALL_NAME -DEAL_II_LD_UNDERSTANDS_SONAME -F77LIBS -F77FLAGSPIC -F77FLAGSG -F77FLAGSO -F77_VERSION -F77 -BOOST_INCLUDE_DIR -EGREP -GREP -CXXCPP -withmultithreading -enablemultithreading -CFLAGSPIC -CC_VERSION -SHLIBFLAGS -SHLIBLD -CXXFLAGSPIC -CXXFLAGSO -CXXFLAGSG -DEAL_II_COMPILER_SUPPORTS_MPI -GXX_VERSION_DETAILED -GXX_VERSION -ac_ct_CXX -CXXFLAGS -CXX -OBJEXT -EXEEXT -ac_ct_CC -CPPFLAGS -LDFLAGS -CFLAGS -CC -target_os -target_vendor -target_cpu -target -host_os -host_vendor -host_cpu -host -build_os -build_vendor -build_cpu -build -DEAL2_DIR -DEAL_II_PATH -DEAL_II_MINOR -DEAL_II_MAJOR -target_alias -host_alias -build_alias -LIBS -ECHO_T -ECHO_N -ECHO_C -DEFS -mandir -localedir -libdir -psdir -pdfdir -dvidir -htmldir -infodir -docdir -oldincludedir -includedir -localstatedir -sharedstatedir -sysconfdir -datadir -datarootdir -libexecdir -sbindir -bindir -program_transform_name -prefix -exec_prefix -PACKAGE_BUGREPORT -PACKAGE_STRING -PACKAGE_VERSION -PACKAGE_TARNAME -PACKAGE_NAME +ac_subst_vars='SHELL PATH_SEPARATOR -SHELL' +PACKAGE_NAME +PACKAGE_TARNAME +PACKAGE_VERSION +PACKAGE_STRING +PACKAGE_BUGREPORT +exec_prefix +prefix +program_transform_name +bindir +sbindir +libexecdir +datarootdir +datadir +sysconfdir +sharedstatedir +localstatedir +includedir +oldincludedir +docdir +infodir +htmldir +dvidir +pdfdir +psdir +libdir +localedir +mandir +DEFS +ECHO_C +ECHO_N +ECHO_T +LIBS +build_alias +host_alias +target_alias +DEAL_II_MAJOR +DEAL_II_MINOR +DEAL_II_PATH +DEAL2_DIR +build +build_cpu +build_vendor +build_os +host +host_cpu +host_vendor +host_os +target +target_cpu +target_vendor +target_os +CC +CFLAGS +LDFLAGS +CPPFLAGS +ac_ct_CC +EXEEXT +OBJEXT +CXX +CXXFLAGS +ac_ct_CXX +GXX_VERSION +GXX_VERSION_DETAILED +DEAL_II_COMPILER_SUPPORTS_MPI +CXXFLAGSG +CXXFLAGSO +CXXFLAGSPIC +SHLIBLD +SHLIBFLAGS +CC_VERSION +CFLAGSPIC +enablemultithreading +withmultithreading +CXXCPP +GREP +EGREP +BOOST_INCLUDE_DIR +F77 +F77_VERSION +F77FLAGSO +F77FLAGSG +F77FLAGSPIC +F77LIBS +DEAL_II_LD_UNDERSTANDS_SONAME +DEAL_II_LD_UNDERSTANDS_DYLIB_INSTALL_NAME +enableshared +static_lib_suffix +shared_lib_suffix +AR +RANLIB +enableparser +DEAL_II_DISABLE_PARSER +DEAL_II_EXPAND_PETSC_VECTOR +DEAL_II_EXPAND_PETSC_BLOCKVECTOR +USE_CONTRIB_PETSC +DEAL_II_PETSC_DIR +DEAL_II_PETSC_ARCH +DEAL_II_PETSC_VERSION_MAJOR +DEAL_II_PETSC_VERSION_MINOR +DEAL_II_PETSC_VERSION_SUBMINOR +DEAL_II_PETSC_MPIUNI_LIB +DEAL_II_DEFINE_DEAL_II_USE_PETSC +USE_CONTRIB_SLEPC +DEAL_II_SLEPC_DIR +DEAL_II_SLEPC_ARCH +DEAL_II_SLEPC_VERSION_MAJOR +DEAL_II_SLEPC_VERSION_MINOR +DEAL_II_SLEPC_VERSION_SUBMINOR +DEAL_II_DEFINE_DEAL_II_USE_SLEPC +DEAL_II_EXPAND_TRILINOS_VECTOR +DEAL_II_EXPAND_TRILINOS_MPI_VECTOR +DEAL_II_EXPAND_TRILINOS_BLOCKVECTOR +DEAL_II_EXPAND_TRILINOS_MPI_BLOCKVECTOR +DEAL_II_EXPAND_TRILINOS_SPARSITY_PATTERN +DEAL_II_EXPAND_TRILINOS_BLOCK_SPARSITY_PATTERN +USE_CONTRIB_TRILINOS +DEAL_II_TRILINOS_INCDIR +DEAL_II_TRILINOS_LIBDIR +DEAL_II_TRILINOS_SHARED +DEAL_II_TRILINOS_STATIC +NEEDS_F77LIBS +HSL_INCLUDE_DIR +USE_CONTRIB_HSL +TECPLOT_INCLUDE_DIR +USE_CONTRIB_METIS +DEAL_II_METIS_INCDIR +DEAL_II_METIS_LIBDIR +UMFPACK_LIB +UMFPACK_INCLUDE_DIR +USE_CONTRIB_UMFPACK +DOXYGEN +DOT +DOXYGEN_OPTIONS +DEAL_II_HAVE_DOT +PERL +subdirs +LDFLAGSPIC +LIBOBJS +LTLIBOBJS' ac_subst_files='' -ac_user_opts=' -enable_option_checking -enable_multithreading -with_multithreading -with_boost -enable_shared -enable_parser -enable_compat_blocker -with_petsc -with_petsc_arch -with_slepc -with_slepc_arch -with_trilinos -with_trilinos_include -with_trilinos_libs -with_blas -with_zlib -with_netcdf -with_netcdf_include -with_netcdf_libs -with_metis -with_metis_include -with_metis_libs -with_umfpack -with_umfpack_include -with_umfpack_libs -with_lapack -with_cpu -with_doxygen -' ac_precious_vars='build_alias host_alias target_alias @@ -830,8 +777,6 @@ ac_subdirs_all='contrib tests' # Initialize some variables set by options. ac_init_help= ac_init_version=false -ac_unrecognized_opts= -ac_unrecognized_sep= # The variables have the same names as the options, with # dashes changed to underlines. cache_file=/dev/null @@ -930,21 +875,13 @@ do datarootdir=$ac_optarg ;; -disable-* | --disable-*) - ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` + ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2 + expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && + { echo "$as_me: error: invalid feature name: $ac_feature" >&2 { (exit 1); exit 1; }; } - ac_useropt_orig=$ac_useropt - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` - case $ac_user_opts in - *" -"enable_$ac_useropt" -"*) ;; - *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig" - ac_unrecognized_sep=', ';; - esac - eval enable_$ac_useropt=no ;; + ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` + eval enable_$ac_feature=no ;; -docdir | --docdir | --docdi | --doc | --do) ac_prev=docdir ;; @@ -957,21 +894,13 @@ do dvidir=$ac_optarg ;; -enable-* | --enable-*) - ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` + ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2 + expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && + { echo "$as_me: error: invalid feature name: $ac_feature" >&2 { (exit 1); exit 1; }; } - ac_useropt_orig=$ac_useropt - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` - case $ac_user_opts in - *" -"enable_$ac_useropt" -"*) ;; - *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig" - ac_unrecognized_sep=', ';; - esac - eval enable_$ac_useropt=\$ac_optarg ;; + ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` + eval enable_$ac_feature=\$ac_optarg ;; -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ @@ -1162,38 +1091,22 @@ do ac_init_version=: ;; -with-* | --with-*) - ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` + ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2 + expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && + { echo "$as_me: error: invalid package name: $ac_package" >&2 { (exit 1); exit 1; }; } - ac_useropt_orig=$ac_useropt - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` - case $ac_user_opts in - *" -"with_$ac_useropt" -"*) ;; - *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig" - ac_unrecognized_sep=', ';; - esac - eval with_$ac_useropt=\$ac_optarg ;; + ac_package=`echo $ac_package | sed 's/[-.]/_/g'` + eval with_$ac_package=\$ac_optarg ;; -without-* | --without-*) - ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` + ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2 + expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && + { echo "$as_me: error: invalid package name: $ac_package" >&2 { (exit 1); exit 1; }; } - ac_useropt_orig=$ac_useropt - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` - case $ac_user_opts in - *" -"with_$ac_useropt" -"*) ;; - *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig" - ac_unrecognized_sep=', ';; - esac - eval with_$ac_useropt=no ;; + ac_package=`echo $ac_package | sed 's/[-.]/_/g'` + eval with_$ac_package=no ;; --x) # Obsolete; use --with-x. @@ -1213,7 +1126,7 @@ do | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) x_libraries=$ac_optarg ;; - -*) { $as_echo "$as_me: error: unrecognized option: $ac_option + -*) { echo "$as_me: error: unrecognized option: $ac_option Try \`$0 --help' for more information." >&2 { (exit 1); exit 1; }; } ;; @@ -1222,16 +1135,16 @@ Try \`$0 --help' for more information." >&2 ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` # Reject names that are not valid shell variable names. expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && - { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2 + { echo "$as_me: error: invalid variable name: $ac_envvar" >&2 { (exit 1); exit 1; }; } eval $ac_envvar=\$ac_optarg export $ac_envvar ;; *) # FIXME: should be removed in autoconf 3.0. - $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 + echo "$as_me: WARNING: you should use --build, --host, --target" >&2 expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && - $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 + echo "$as_me: WARNING: invalid host type: $ac_option" >&2 : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} ;; @@ -1240,38 +1153,22 @@ done if test -n "$ac_prev"; then ac_option=--`echo $ac_prev | sed 's/_/-/g'` - { $as_echo "$as_me: error: missing argument to $ac_option" >&2 + { echo "$as_me: error: missing argument to $ac_option" >&2 { (exit 1); exit 1; }; } fi -if test -n "$ac_unrecognized_opts"; then - case $enable_option_checking in - no) ;; - fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2 - { (exit 1); exit 1; }; } ;; - *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; - esac -fi - -# Check all directory arguments for consistency. +# Be sure to have absolute directory names. for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ libdir localedir mandir do eval ac_val=\$$ac_var - # Remove trailing slashes. - case $ac_val in - */ ) - ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'` - eval $ac_var=\$ac_val;; - esac - # Be sure to have absolute directory names. case $ac_val in [\\/$]* | ?:[\\/]* ) continue;; NONE | '' ) case $ac_var in *prefix ) continue;; esac;; esac - { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 + { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 { (exit 1); exit 1; }; } done @@ -1286,7 +1183,7 @@ target=$target_alias if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe - $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. + echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. If a cross compiler is detected then cross compile mode will be used." >&2 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes @@ -1302,10 +1199,10 @@ test "$silent" = yes && exec 6>/dev/null ac_pwd=`pwd` && test -n "$ac_pwd" && ac_ls_di=`ls -di .` && ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || - { $as_echo "$as_me: error: working directory cannot be determined" >&2 + { echo "$as_me: error: Working directory cannot be determined" >&2 { (exit 1); exit 1; }; } test "X$ac_ls_di" = "X$ac_pwd_ls_di" || - { $as_echo "$as_me: error: pwd does not report name of working directory" >&2 + { echo "$as_me: error: pwd does not report name of working directory" >&2 { (exit 1); exit 1; }; } @@ -1313,12 +1210,12 @@ test "X$ac_ls_di" = "X$ac_pwd_ls_di" || if test -z "$srcdir"; then ac_srcdir_defaulted=yes # Try the directory containing this script, then the parent directory. - ac_confdir=`$as_dirname -- "$as_myself" || -$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_myself" : 'X\(//\)[^/]' \| \ - X"$as_myself" : 'X\(//\)$' \| \ - X"$as_myself" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$as_myself" | + ac_confdir=`$as_dirname -- "$0" || +$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$0" : 'X\(//\)[^/]' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)' \| . 2>/dev/null || +echo X"$0" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -1345,12 +1242,12 @@ else fi if test ! -r "$srcdir/$ac_unique_file"; then test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." - { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 + { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 { (exit 1); exit 1; }; } fi ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" ac_abs_confdir=`( - cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2 + cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2 { (exit 1); exit 1; }; } pwd)` # When building in place, set srcdir=. @@ -1399,9 +1296,9 @@ Configuration: Installation directories: --prefix=PREFIX install architecture-independent files in PREFIX - [$ac_default_prefix] + [$ac_default_prefix] --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX - [PREFIX] + [PREFIX] By default, \`make install' will install all the files in \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify @@ -1411,25 +1308,25 @@ for instance \`--prefix=\$HOME'. For better control, use the options below. Fine tuning of the installation directories: - --bindir=DIR user executables [EPREFIX/bin] - --sbindir=DIR system admin executables [EPREFIX/sbin] - --libexecdir=DIR program executables [EPREFIX/libexec] - --sysconfdir=DIR read-only single-machine data [PREFIX/etc] - --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] - --localstatedir=DIR modifiable single-machine data [PREFIX/var] - --libdir=DIR object code libraries [EPREFIX/lib] - --includedir=DIR C header files [PREFIX/include] - --oldincludedir=DIR C header files for non-gcc [/usr/include] - --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] - --datadir=DIR read-only architecture-independent data [DATAROOTDIR] - --infodir=DIR info documentation [DATAROOTDIR/info] - --localedir=DIR locale-dependent data [DATAROOTDIR/locale] - --mandir=DIR man documentation [DATAROOTDIR/man] - --docdir=DIR documentation root [DATAROOTDIR/doc/deal.II] - --htmldir=DIR html documentation [DOCDIR] - --dvidir=DIR dvi documentation [DOCDIR] - --pdfdir=DIR pdf documentation [DOCDIR] - --psdir=DIR ps documentation [DOCDIR] + --bindir=DIR user executables [EPREFIX/bin] + --sbindir=DIR system admin executables [EPREFIX/sbin] + --libexecdir=DIR program executables [EPREFIX/libexec] + --sysconfdir=DIR read-only single-machine data [PREFIX/etc] + --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] + --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --libdir=DIR object code libraries [EPREFIX/lib] + --includedir=DIR C header files [PREFIX/include] + --oldincludedir=DIR C header files for non-gcc [/usr/include] + --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] + --datadir=DIR read-only architecture-independent data [DATAROOTDIR] + --infodir=DIR info documentation [DATAROOTDIR/info] + --localedir=DIR locale-dependent data [DATAROOTDIR/locale] + --mandir=DIR man documentation [DATAROOTDIR/man] + --docdir=DIR documentation root [DATAROOTDIR/doc/deal.II] + --htmldir=DIR html documentation [DOCDIR] + --dvidir=DIR dvi documentation [DOCDIR] + --pdfdir=DIR pdf documentation [DOCDIR] + --psdir=DIR ps documentation [DOCDIR] _ACEOF cat <<\_ACEOF @@ -1448,7 +1345,6 @@ if test -n "$ac_init_help"; then cat <<\_ACEOF Optional Features: - --disable-option-checking ignore unrecognized --enable/--with options --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] --enable-multithreading Set compiler flags to allow for multithreaded @@ -1584,17 +1480,15 @@ fi if test "$ac_init_help" = "recursive"; then # If there are subdirs, report their specific --help. for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue - test -d "$ac_dir" || - { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } || - continue + test -d "$ac_dir" || continue ac_builddir=. case "$ac_dir" in .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; *) - ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` + ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` # A ".." for each directory in $ac_dir_suffix. - ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` + ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` case $ac_top_builddir_sub in "") ac_top_builddir_sub=. ac_top_build_prefix= ;; *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; @@ -1630,7 +1524,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix echo && $SHELL "$ac_srcdir/configure" --help=recursive else - $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 + echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 fi || ac_status=$? cd "$ac_pwd" || { ac_status=$?; break; } done @@ -1640,10 +1534,10 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF deal.II configure 6.2.pre -generated by GNU Autoconf 2.63 +generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -1654,7 +1548,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. It was created by deal.II $as_me 6.2.pre, which was -generated by GNU Autoconf 2.63. Invocation command line was +generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -1690,7 +1584,7 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - $as_echo "PATH: $as_dir" + echo "PATH: $as_dir" done IFS=$as_save_IFS @@ -1725,7 +1619,7 @@ do | -silent | --silent | --silen | --sile | --sil) continue ;; *\'*) - ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; esac case $ac_pass in 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; @@ -1777,12 +1671,11 @@ _ASBOX case $ac_val in #( *${as_nl}*) case $ac_var in #( - *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5 -$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; + *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 +echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; esac case $ac_var in #( _ | IFS | as_nl) ;; #( - BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( *) $as_unset $ac_var ;; esac ;; esac @@ -1812,9 +1705,9 @@ _ASBOX do eval ac_val=\$$ac_var case $ac_val in - *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; esac - $as_echo "$ac_var='\''$ac_val'\''" + echo "$ac_var='\''$ac_val'\''" done | sort echo @@ -1829,9 +1722,9 @@ _ASBOX do eval ac_val=\$$ac_var case $ac_val in - *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; esac - $as_echo "$ac_var='\''$ac_val'\''" + echo "$ac_var='\''$ac_val'\''" done | sort echo fi @@ -1847,8 +1740,8 @@ _ASBOX echo fi test "$ac_signal" != 0 && - $as_echo "$as_me: caught signal $ac_signal" - $as_echo "$as_me: exit $exit_status" + echo "$as_me: caught signal $ac_signal" + echo "$as_me: exit $exit_status" } >&5 rm -f core *.core core.conftest.* && rm -f -r conftest* confdefs* conf$$* $ac_clean_files && @@ -1890,24 +1783,21 @@ _ACEOF # Let the site file select an alternate cache file if it wants to. -# Prefer an explicitly selected file to automatically selected ones. -ac_site_file1=NONE -ac_site_file2=NONE +# Prefer explicitly selected file to automatically selected ones. if test -n "$CONFIG_SITE"; then - ac_site_file1=$CONFIG_SITE + set x "$CONFIG_SITE" elif test "x$prefix" != xNONE; then - ac_site_file1=$prefix/share/config.site - ac_site_file2=$prefix/etc/config.site + set x "$prefix/share/config.site" "$prefix/etc/config.site" else - ac_site_file1=$ac_default_prefix/share/config.site - ac_site_file2=$ac_default_prefix/etc/config.site + set x "$ac_default_prefix/share/config.site" \ + "$ac_default_prefix/etc/config.site" fi -for ac_site_file in "$ac_site_file1" "$ac_site_file2" +shift +for ac_site_file do - test "x$ac_site_file" = xNONE && continue if test -r "$ac_site_file"; then - { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 -$as_echo "$as_me: loading site script $ac_site_file" >&6;} + { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 +echo "$as_me: loading site script $ac_site_file" >&6;} sed 's/^/| /' "$ac_site_file" >&5 . "$ac_site_file" fi @@ -1927,38 +1817,29 @@ for ac_var in $ac_precious_vars; do eval ac_new_val=\$ac_env_${ac_var}_value case $ac_old_set,$ac_new_set in set,) - { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 -$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} + { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 +echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} ac_cache_corrupted=: ;; ,set) - { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 -$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} + { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 +echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ac_cache_corrupted=: ;; ,);; *) if test "x$ac_old_val" != "x$ac_new_val"; then - # differences in whitespace do not lead to failure. - ac_old_val_w=`echo x $ac_old_val` - ac_new_val_w=`echo x $ac_new_val` - if test "$ac_old_val_w" != "$ac_new_val_w"; then - { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 -$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} - ac_cache_corrupted=: - else - { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 -$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} - eval $ac_var=\$ac_old_val - fi - { $as_echo "$as_me:$LINENO: former value: \`$ac_old_val'" >&5 -$as_echo "$as_me: former value: \`$ac_old_val'" >&2;} - { $as_echo "$as_me:$LINENO: current value: \`$ac_new_val'" >&5 -$as_echo "$as_me: current value: \`$ac_new_val'" >&2;} + { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 +echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} + { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 +echo "$as_me: former value: $ac_old_val" >&2;} + { echo "$as_me:$LINENO: current value: $ac_new_val" >&5 +echo "$as_me: current value: $ac_new_val" >&2;} + ac_cache_corrupted=: fi;; esac # Pass precious variables to config.status. if test "$ac_new_set" = set; then case $ac_new_val in - *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; + *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; *) ac_arg=$ac_var=$ac_new_val ;; esac case " $ac_configure_args " in @@ -1968,12 +1849,10 @@ $as_echo "$as_me: current value: \`$ac_new_val'" >&2;} fi done if $ac_cache_corrupted; then - { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} - { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 -$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} - { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 -$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} + { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 +echo "$as_me: error: changes in the environment can compromise the build" >&2;} + { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 +echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} { (exit 1); exit 1; }; } fi @@ -2033,8 +1912,8 @@ for ac_dir in contrib/config "$srcdir"/contrib/config; do fi done if test -z "$ac_aux_dir"; then - { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in contrib/config \"$srcdir\"/contrib/config" >&5 -$as_echo "$as_me: error: cannot find install-sh or install.sh in contrib/config \"$srcdir\"/contrib/config" >&2;} + { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in contrib/config \"$srcdir\"/contrib/config" >&5 +echo "$as_me: error: cannot find install-sh or install.sh in contrib/config \"$srcdir\"/contrib/config" >&2;} { (exit 1); exit 1; }; } fi @@ -2073,8 +1952,8 @@ cat >>confdefs.h <<_ACEOF #define DEAL_II_PATH "$DEAL_II_PATH" _ACEOF -{ $as_echo "$as_me:$LINENO: result: Configuring deal.II version $PACKAGE_VERSION" >&5 -$as_echo "Configuring deal.II version $PACKAGE_VERSION" >&6; } +{ echo "$as_me:$LINENO: result: Configuring deal.II version $PACKAGE_VERSION" >&5 +echo "${ECHO_T}Configuring deal.II version $PACKAGE_VERSION" >&6; } @@ -2084,34 +1963,34 @@ DEAL2_DIR="$DEAL_II_PATH" # Make sure we can run config.sub. $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || - { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5 -$as_echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;} + { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5 +echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;} { (exit 1); exit 1; }; } -{ $as_echo "$as_me:$LINENO: checking build system type" >&5 -$as_echo_n "checking build system type... " >&6; } +{ echo "$as_me:$LINENO: checking build system type" >&5 +echo $ECHO_N "checking build system type... $ECHO_C" >&6; } if test "${ac_cv_build+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_build_alias=$build_alias test "x$ac_build_alias" = x && ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` test "x$ac_build_alias" = x && - { { $as_echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 -$as_echo "$as_me: error: cannot guess build type; you must specify one" >&2;} + { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 +echo "$as_me: error: cannot guess build type; you must specify one" >&2;} { (exit 1); exit 1; }; } ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || - { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5 -$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;} + { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5 +echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;} { (exit 1); exit 1; }; } fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5 -$as_echo "$ac_cv_build" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5 +echo "${ECHO_T}$ac_cv_build" >&6; } case $ac_cv_build in *-*-*) ;; -*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical build" >&5 -$as_echo "$as_me: error: invalid value of canonical build" >&2;} +*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5 +echo "$as_me: error: invalid value of canonical build" >&2;} { (exit 1); exit 1; }; };; esac build=$ac_cv_build @@ -2128,27 +2007,27 @@ IFS=$ac_save_IFS case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac -{ $as_echo "$as_me:$LINENO: checking host system type" >&5 -$as_echo_n "checking host system type... " >&6; } +{ echo "$as_me:$LINENO: checking host system type" >&5 +echo $ECHO_N "checking host system type... $ECHO_C" >&6; } if test "${ac_cv_host+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test "x$host_alias" = x; then ac_cv_host=$ac_cv_build else ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || - { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5 -$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;} + { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5 +echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;} { (exit 1); exit 1; }; } fi fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5 -$as_echo "$ac_cv_host" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5 +echo "${ECHO_T}$ac_cv_host" >&6; } case $ac_cv_host in *-*-*) ;; -*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical host" >&5 -$as_echo "$as_me: error: invalid value of canonical host" >&2;} +*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5 +echo "$as_me: error: invalid value of canonical host" >&2;} { (exit 1); exit 1; }; };; esac host=$ac_cv_host @@ -2165,27 +2044,27 @@ IFS=$ac_save_IFS case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac -{ $as_echo "$as_me:$LINENO: checking target system type" >&5 -$as_echo_n "checking target system type... " >&6; } +{ echo "$as_me:$LINENO: checking target system type" >&5 +echo $ECHO_N "checking target system type... $ECHO_C" >&6; } if test "${ac_cv_target+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test "x$target_alias" = x; then ac_cv_target=$ac_cv_host else ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` || - { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&5 -$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&2;} + { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&5 +echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&2;} { (exit 1); exit 1; }; } fi fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_target" >&5 -$as_echo "$ac_cv_target" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_target" >&5 +echo "${ECHO_T}$ac_cv_target" >&6; } case $ac_cv_target in *-*-*) ;; -*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical target" >&5 -$as_echo "$as_me: error: invalid value of canonical target" >&2;} +*) { { echo "$as_me:$LINENO: error: invalid value of canonical target" >&5 +echo "$as_me: error: invalid value of canonical target" >&2;} { (exit 1); exit 1; }; };; esac target=$ac_cv_target @@ -2221,10 +2100,10 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -{ $as_echo "$as_me:$LINENO: result: " >&5 -$as_echo "" >&6; } -{ $as_echo "$as_me:$LINENO: result: ---------------- configuring C/C++ compilers ----------------" >&5 -$as_echo "---------------- configuring C/C++ compilers ----------------" >&6; } +{ echo "$as_me:$LINENO: result: " >&5 +echo "${ECHO_T}" >&6; } +{ echo "$as_me:$LINENO: result: ---------------- configuring C/C++ compilers ----------------" >&5 +echo "${ECHO_T}---------------- configuring C/C++ compilers ----------------" >&6; } OLDCFLAGS="$CFLAGS" ac_ext=c @@ -2235,10 +2114,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. set dummy ${ac_tool_prefix}gcc; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_CC+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -2251,7 +2130,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="${ac_tool_prefix}gcc" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -2262,11 +2141,11 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:$LINENO: result: $CC" >&5 -$as_echo "$CC" >&6; } + { echo "$as_me:$LINENO: result: $CC" >&5 +echo "${ECHO_T}$CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi @@ -2275,10 +2154,10 @@ if test -z "$ac_cv_prog_CC"; then ac_ct_CC=$CC # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_ac_ct_CC+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. @@ -2291,7 +2170,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CC="gcc" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -2302,11 +2181,11 @@ fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -$as_echo "$ac_ct_CC" >&6; } + { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 +echo "${ECHO_T}$ac_ct_CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi if test "x$ac_ct_CC" = x; then @@ -2314,8 +2193,12 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} ac_tool_warned=yes ;; esac CC=$ac_ct_CC @@ -2328,10 +2211,10 @@ if test -z "$CC"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. set dummy ${ac_tool_prefix}cc; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_CC+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -2344,7 +2227,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="${ac_tool_prefix}cc" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -2355,11 +2238,11 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:$LINENO: result: $CC" >&5 -$as_echo "$CC" >&6; } + { echo "$as_me:$LINENO: result: $CC" >&5 +echo "${ECHO_T}$CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi @@ -2368,10 +2251,10 @@ fi if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_CC+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -2389,7 +2272,7 @@ do continue fi ac_cv_prog_CC="cc" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -2412,11 +2295,11 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:$LINENO: result: $CC" >&5 -$as_echo "$CC" >&6; } + { echo "$as_me:$LINENO: result: $CC" >&5 +echo "${ECHO_T}$CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi @@ -2427,10 +2310,10 @@ if test -z "$CC"; then do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_CC+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -2443,7 +2326,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -2454,11 +2337,11 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:$LINENO: result: $CC" >&5 -$as_echo "$CC" >&6; } + { echo "$as_me:$LINENO: result: $CC" >&5 +echo "${ECHO_T}$CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi @@ -2471,10 +2354,10 @@ if test -z "$CC"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_ac_ct_CC+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. @@ -2487,7 +2370,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CC="$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -2498,11 +2381,11 @@ fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -$as_echo "$ac_ct_CC" >&6; } + { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 +echo "${ECHO_T}$ac_ct_CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi @@ -2514,8 +2397,12 @@ done else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} ac_tool_warned=yes ;; esac CC=$ac_ct_CC @@ -2525,50 +2412,44 @@ fi fi -test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH +test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH See \`config.log' for more details." >&5 -$as_echo "$as_me: error: no acceptable C compiler found in \$PATH +echo "$as_me: error: no acceptable C compiler found in \$PATH See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } + { (exit 1); exit 1; }; } # Provide some information about the compiler. -$as_echo "$as_me:$LINENO: checking for C compiler version" >&5 -set X $ac_compile -ac_compiler=$2 +echo "$as_me:$LINENO: checking for C compiler version" >&5 +ac_compiler=`set X $ac_compile; echo $2` { (ac_try="$ac_compiler --version >&5" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compiler --version >&5") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } { (ac_try="$ac_compiler -v >&5" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compiler -v >&5") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } { (ac_try="$ac_compiler -V >&5" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compiler -V >&5") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } cat >conftest.$ac_ext <<_ACEOF @@ -2587,22 +2468,27 @@ main () } _ACEOF ac_clean_files_save=$ac_clean_files -ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out" +ac_clean_files="$ac_clean_files a.out a.exe b.out" # Try to create an executable without -o first, disregard a.out. # It will help us diagnose broken compilers, and finding out an intuition # of exeext. -{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 -$as_echo_n "checking for C compiler default output file name... " >&6; } -ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` - -# The possible output files: -ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*" - +{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 +echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; } +ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` +# +# List of possible output files, starting from the most likely. +# The algorithm is not robust to junk in `.', hence go to wildcards (a.*) +# only as a last resort. b.out is created by i960 compilers. +ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out' +# +# The IRIX 6 linker writes into existing files which may not be +# executable, retaining their permissions. Remove them first so a +# subsequent execution test works. ac_rmfiles= for ac_file in $ac_files do case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; * ) ac_rmfiles="$ac_rmfiles $ac_file";; esac done @@ -2613,11 +2499,10 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_link_default") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. # So ignore a value of `no', otherwise this would lead to `EXEEXT = no' @@ -2628,7 +2513,7 @@ for ac_file in $ac_files '' do test -f "$ac_file" || continue case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; [ab].out ) # We found the default executable, but exeext='' is most @@ -2655,27 +2540,25 @@ else ac_file='' fi -{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5 -$as_echo "$ac_file" >&6; } +{ echo "$as_me:$LINENO: result: $ac_file" >&5 +echo "${ECHO_T}$ac_file" >&6; } if test -z "$ac_file"; then - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables +{ { echo "$as_me:$LINENO: error: C compiler cannot create executables See \`config.log' for more details." >&5 -$as_echo "$as_me: error: C compiler cannot create executables +echo "$as_me: error: C compiler cannot create executables See \`config.log' for more details." >&2;} - { (exit 77); exit 77; }; }; } + { (exit 77); exit 77; }; } fi ac_exeext=$ac_cv_exeext # Check that the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. -{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5 -$as_echo_n "checking whether the C compiler works... " >&6; } +{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5 +echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; } # FIXME: These cross compiler hacks should be removed for Autoconf 3.0 # If not cross compiling, check that we can run a simple program. if test "$cross_compiling" != yes; then @@ -2684,53 +2567,49 @@ if test "$cross_compiling" != yes; then *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_try") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cross_compiling=no else if test "$cross_compiling" = maybe; then cross_compiling=yes else - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs. + { { echo "$as_me:$LINENO: error: cannot run C compiled programs. If you meant to cross compile, use \`--host'. See \`config.log' for more details." >&5 -$as_echo "$as_me: error: cannot run C compiled programs. +echo "$as_me: error: cannot run C compiled programs. If you meant to cross compile, use \`--host'. See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } + { (exit 1); exit 1; }; } fi fi fi -{ $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } +{ echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } -rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out +rm -f a.out a.exe conftest$ac_cv_exeext b.out ac_clean_files=$ac_clean_files_save # Check that the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. -{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 -$as_echo_n "checking whether we are cross compiling... " >&6; } -{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5 -$as_echo "$cross_compiling" >&6; } +{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 +echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; } +{ echo "$as_me:$LINENO: result: $cross_compiling" >&5 +echo "${ECHO_T}$cross_compiling" >&6; } -{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5 -$as_echo_n "checking for suffix of executables... " >&6; } +{ echo "$as_me:$LINENO: checking for suffix of executables" >&5 +echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; } if { (ac_try="$ac_link" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_link") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then # If both `conftest.exe' and `conftest' are `present' (well, observable) # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will @@ -2739,33 +2618,31 @@ $as_echo "$ac_try_echo") >&5 for ac_file in conftest.exe conftest conftest.*; do test -f "$ac_file" || continue case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` break;; * ) break;; esac done else - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link + { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link See \`config.log' for more details." >&5 -$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link +echo "$as_me: error: cannot compute suffix of executables: cannot compile and link See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } + { (exit 1); exit 1; }; } fi rm -f conftest$ac_cv_exeext -{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 -$as_echo "$ac_cv_exeext" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 +echo "${ECHO_T}$ac_cv_exeext" >&6; } rm -f conftest.$ac_ext EXEEXT=$ac_cv_exeext ac_exeext=$EXEEXT -{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5 -$as_echo_n "checking for suffix of object files... " >&6; } +{ echo "$as_me:$LINENO: checking for suffix of object files" >&5 +echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; } if test "${ac_cv_objext+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -2788,43 +2665,40 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then for ac_file in conftest.o conftest.obj conftest.*; do test -f "$ac_file" || continue; case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;; + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;; *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` break;; esac done else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile +{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile See \`config.log' for more details." >&5 -$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile +echo "$as_me: error: cannot compute suffix of object files: cannot compile See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } + { (exit 1); exit 1; }; } fi rm -f conftest.$ac_cv_objext conftest.$ac_ext fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 -$as_echo "$ac_cv_objext" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 +echo "${ECHO_T}$ac_cv_objext" >&6; } OBJEXT=$ac_cv_objext ac_objext=$OBJEXT -{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 -$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } +{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 +echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; } if test "${ac_cv_c_compiler_gnu+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -2850,21 +2724,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then ac_compiler_gnu=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_compiler_gnu=no @@ -2874,19 +2747,15 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 -$as_echo "$ac_cv_c_compiler_gnu" >&6; } -if test $ac_compiler_gnu = yes; then - GCC=yes -else - GCC= -fi +{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 +echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; } +GCC=`test $ac_compiler_gnu = yes && echo yes` ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS -{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 -$as_echo_n "checking whether $CC accepts -g... " >&6; } +{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 +echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; } if test "${ac_cv_prog_cc_g+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_save_c_werror_flag=$ac_c_werror_flag ac_c_werror_flag=yes @@ -2913,21 +2782,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then ac_cv_prog_cc_g=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 CFLAGS="" @@ -2952,21 +2820,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then : else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_c_werror_flag=$ac_save_c_werror_flag @@ -2992,21 +2859,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then ac_cv_prog_cc_g=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -3021,8 +2887,8 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_c_werror_flag=$ac_save_c_werror_flag fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 -$as_echo "$ac_cv_prog_cc_g" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 +echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; } if test "$ac_test_CFLAGS" = set; then CFLAGS=$ac_save_CFLAGS elif test $ac_cv_prog_cc_g = yes; then @@ -3038,10 +2904,10 @@ else CFLAGS= fi fi -{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 -$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } +{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 +echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; } if test "${ac_cv_prog_cc_c89+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_cv_prog_cc_c89=no ac_save_CC=$CC @@ -3112,21 +2978,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then ac_cv_prog_cc_c89=$ac_arg else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -3142,15 +3007,15 @@ fi # AC_CACHE_VAL case "x$ac_cv_prog_cc_c89" in x) - { $as_echo "$as_me:$LINENO: result: none needed" >&5 -$as_echo "none needed" >&6; } ;; + { echo "$as_me:$LINENO: result: none needed" >&5 +echo "${ECHO_T}none needed" >&6; } ;; xno) - { $as_echo "$as_me:$LINENO: result: unsupported" >&5 -$as_echo "unsupported" >&6; } ;; + { echo "$as_me:$LINENO: result: unsupported" >&5 +echo "${ECHO_T}unsupported" >&6; } ;; *) CC="$CC $ac_cv_prog_cc_c89" - { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 -$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; + { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 +echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;; esac @@ -3176,10 +3041,10 @@ CFLAGS="$OLDCFLAGS" # Extract the first word of "$testprog", so it can be a program name with args. set dummy $testprog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_CC+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $CC in [\\/]* | ?:[\\/]*) @@ -3194,7 +3059,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_CC="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -3206,11 +3071,11 @@ esac fi CC=$ac_cv_path_CC if test -n "$CC"; then - { $as_echo "$as_me:$LINENO: result: $CC" >&5 -$as_echo "$CC" >&6; } + { echo "$as_me:$LINENO: result: $CC" >&5 +echo "${ECHO_T}$CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi @@ -3232,10 +3097,10 @@ if test -z "$CXX"; then do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_CXX+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$CXX"; then ac_cv_prog_CXX="$CXX" # Let the user override the test. @@ -3248,7 +3113,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -3259,11 +3124,11 @@ fi fi CXX=$ac_cv_prog_CXX if test -n "$CXX"; then - { $as_echo "$as_me:$LINENO: result: $CXX" >&5 -$as_echo "$CXX" >&6; } + { echo "$as_me:$LINENO: result: $CXX" >&5 +echo "${ECHO_T}$CXX" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi @@ -3276,10 +3141,10 @@ if test -z "$CXX"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$ac_ct_CXX"; then ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. @@ -3292,7 +3157,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CXX="$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -3303,11 +3168,11 @@ fi fi ac_ct_CXX=$ac_cv_prog_ac_ct_CXX if test -n "$ac_ct_CXX"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 -$as_echo "$ac_ct_CXX" >&6; } + { echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 +echo "${ECHO_T}$ac_ct_CXX" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi @@ -3319,8 +3184,12 @@ done else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} ac_tool_warned=yes ;; esac CXX=$ac_ct_CXX @@ -3330,47 +3199,43 @@ fi fi fi # Provide some information about the compiler. -$as_echo "$as_me:$LINENO: checking for C++ compiler version" >&5 -set X $ac_compile -ac_compiler=$2 +echo "$as_me:$LINENO: checking for C++ compiler version" >&5 +ac_compiler=`set X $ac_compile; echo $2` { (ac_try="$ac_compiler --version >&5" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compiler --version >&5") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } { (ac_try="$ac_compiler -v >&5" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compiler -v >&5") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } { (ac_try="$ac_compiler -V >&5" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compiler -V >&5") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5 -$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; } +{ echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5 +echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6; } if test "${ac_cv_cxx_compiler_gnu+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -3396,21 +3261,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then ac_compiler_gnu=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_compiler_gnu=no @@ -3420,19 +3284,15 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_cv_cxx_compiler_gnu=$ac_compiler_gnu fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 -$as_echo "$ac_cv_cxx_compiler_gnu" >&6; } -if test $ac_compiler_gnu = yes; then - GXX=yes -else - GXX= -fi +{ echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 +echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6; } +GXX=`test $ac_compiler_gnu = yes && echo yes` ac_test_CXXFLAGS=${CXXFLAGS+set} ac_save_CXXFLAGS=$CXXFLAGS -{ $as_echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 -$as_echo_n "checking whether $CXX accepts -g... " >&6; } +{ echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 +echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6; } if test "${ac_cv_prog_cxx_g+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_save_cxx_werror_flag=$ac_cxx_werror_flag ac_cxx_werror_flag=yes @@ -3459,21 +3319,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then ac_cv_prog_cxx_g=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 CXXFLAGS="" @@ -3498,21 +3357,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then : else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_cxx_werror_flag=$ac_save_cxx_werror_flag @@ -3538,21 +3396,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then ac_cv_prog_cxx_g=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -3567,8 +3424,8 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_cxx_werror_flag=$ac_save_cxx_werror_flag fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 -$as_echo "$ac_cv_prog_cxx_g" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 +echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6; } if test "$ac_test_CXXFLAGS" = set; then CXXFLAGS=$ac_save_CXXFLAGS elif test $ac_cv_prog_cxx_g = yes; then @@ -3606,10 +3463,10 @@ CXXFLAGS="$OLDCXXFLAGS" # Extract the first word of "$testprog", so it can be a program name with args. set dummy $testprog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_CXX+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $CXX in [\\/]* | ?:[\\/]*) @@ -3624,7 +3481,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_CXX="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -3636,11 +3493,11 @@ esac fi CXX=$ac_cv_path_CXX if test -n "$CXX"; then - { $as_echo "$as_me:$LINENO: result: $CXX" >&5 -$as_echo "$CXX" >&6; } + { echo "$as_me:$LINENO: result: $CXX" >&5 +echo "${ECHO_T}$CXX" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi @@ -3677,14 +3534,14 @@ fi esac ;; *2.96*) - { { $as_echo "$as_me:$LINENO: error: C++ compiler reports faulty gcc 2.96. Please install a new compiler" >&5 -$as_echo "$as_me: error: C++ compiler reports faulty gcc 2.96. Please install a new compiler" >&2;} + { { echo "$as_me:$LINENO: error: C++ compiler reports faulty gcc 2.96. Please install a new compiler" >&5 +echo "$as_me: error: C++ compiler reports faulty gcc 2.96. Please install a new compiler" >&2;} { (exit 1); exit 1; }; } GXX_VERSION=gcc2.96 ;; *2.97*) - { $as_echo "$as_me:$LINENO: result: C++ compiler is gcc-2.97" >&5 -$as_echo "C++ compiler is gcc-2.97" >&6; } + { echo "$as_me:$LINENO: result: C++ compiler is gcc-2.97" >&5 +echo "${ECHO_T}C++ compiler is gcc-2.97" >&6; } GXX_VERSION=gcc2.97 ;; *version\ 3.0*) @@ -3802,28 +3659,28 @@ $as_echo "C++ compiler is gcc-2.97" >&6; } esac ;; *2.4* | *2.5* | *2.6* | *2.7* | *2.8*) - { $as_echo "$as_me:$LINENO: result: C++ compiler is $GXX_VERSION_STRING" >&5 -$as_echo "C++ compiler is $GXX_VERSION_STRING" >&6; } - { { $as_echo "$as_me:$LINENO: error: C++ compiler is not supported" >&5 -$as_echo "$as_me: error: C++ compiler is not supported" >&2;} + { echo "$as_me:$LINENO: result: C++ compiler is $GXX_VERSION_STRING" >&5 +echo "${ECHO_T}C++ compiler is $GXX_VERSION_STRING" >&6; } + { { echo "$as_me:$LINENO: error: C++ compiler is not supported" >&5 +echo "$as_me: error: C++ compiler is not supported" >&2;} { (exit 1); exit 1; }; } ;; *) - { $as_echo "$as_me:$LINENO: result: C++ compiler is unknown but accepted gcc version" >&5 -$as_echo "C++ compiler is unknown but accepted gcc version" >&6; } + { echo "$as_me:$LINENO: result: C++ compiler is unknown but accepted gcc version" >&5 +echo "${ECHO_T}C++ compiler is unknown but accepted gcc version" >&6; } GXX_VERSION=gcc-other ;; esac - { $as_echo "$as_me:$LINENO: result: C++ compiler is $GXX_VERSION (subversion $GXX_VERSION_DETAILED)" >&5 -$as_echo "C++ compiler is $GXX_VERSION (subversion $GXX_VERSION_DETAILED)" >&6; } + { echo "$as_me:$LINENO: result: C++ compiler is $GXX_VERSION (subversion $GXX_VERSION_DETAILED)" >&5 +echo "${ECHO_T}C++ compiler is $GXX_VERSION (subversion $GXX_VERSION_DETAILED)" >&6; } else is_ibm_xlc="`($CXX -qversion 2>&1) | grep IBM`" if test "x$is_ibm_xlc" != "x" ; then - { $as_echo "$as_me:$LINENO: result: C++ compiler is IBM xlC" >&5 -$as_echo "C++ compiler is IBM xlC" >&6; } + { echo "$as_me:$LINENO: result: C++ compiler is IBM xlC" >&5 +echo "${ECHO_T}C++ compiler is IBM xlC" >&6; } GXX_VERSION=ibm_xlc GXX_VERSION_DETAILED="$GXX_VERSION" else @@ -3832,38 +3689,38 @@ $as_echo "C++ compiler is IBM xlC" >&6; } if test "x$mips_pro" != "x" ; then case "$mips_pro" in *7.0* | *7.1* | *7.2* | *7.3*) - { $as_echo "$as_me:$LINENO: result: C++ compiler is $mips_pro" >&5 -$as_echo "C++ compiler is $mips_pro" >&6; } - { { $as_echo "$as_me:$LINENO: error: This compiler is not supported" >&5 -$as_echo "$as_me: error: This compiler is not supported" >&2;} + { echo "$as_me:$LINENO: result: C++ compiler is $mips_pro" >&5 +echo "${ECHO_T}C++ compiler is $mips_pro" >&6; } + { { echo "$as_me:$LINENO: error: This compiler is not supported" >&5 +echo "$as_me: error: This compiler is not supported" >&2;} { (exit 1); exit 1; }; } GXX_VERSION=MIPSpro7.3 GXX_VERSION_DETAILED="$GXX_VERSION" ;; *7.4) - { $as_echo "$as_me:$LINENO: result: C++ compiler is MIPSpro compiler 7.4" >&5 -$as_echo "C++ compiler is MIPSpro compiler 7.4" >&6; } - { { $as_echo "$as_me:$LINENO: error: This compiler is not supported. Use MIPSPro compiler 7.4x" >&5 -$as_echo "$as_me: error: This compiler is not supported. Use MIPSPro compiler 7.4x" >&2;} + { echo "$as_me:$LINENO: result: C++ compiler is MIPSpro compiler 7.4" >&5 +echo "${ECHO_T}C++ compiler is MIPSpro compiler 7.4" >&6; } + { { echo "$as_me:$LINENO: error: This compiler is not supported. Use MIPSPro compiler 7.4x" >&5 +echo "$as_me: error: This compiler is not supported. Use MIPSPro compiler 7.4x" >&2;} { (exit 1); exit 1; }; } GXX_VERSION=MIPSpro7.4 GXX_VERSION_DETAILED="$GXX_VERSION" ;; *7.41* | *7.42* | *7.43* | *7.44*) - { $as_echo "$as_me:$LINENO: result: C++ compiler is MIPSpro compiler 7.4x" >&5 -$as_echo "C++ compiler is MIPSpro compiler 7.4x" >&6; } + { echo "$as_me:$LINENO: result: C++ compiler is MIPSpro compiler 7.4x" >&5 +echo "${ECHO_T}C++ compiler is MIPSpro compiler 7.4x" >&6; } GXX_VERSION=MIPSpro7.4x GXX_VERSION_DETAILED="$GXX_VERSION" ;; *"7.5"*) - { $as_echo "$as_me:$LINENO: result: C++ compiler is MIPSpro compiler 7.5" >&5 -$as_echo "C++ compiler is MIPSpro compiler 7.5" >&6; } + { echo "$as_me:$LINENO: result: C++ compiler is MIPSpro compiler 7.5" >&5 +echo "${ECHO_T}C++ compiler is MIPSpro compiler 7.5" >&6; } GXX_VERSION=MIPSpro7.5 GXX_VERSION_DETAILED="$GXX_VERSION" ;; *) - { $as_echo "$as_me:$LINENO: result: C++ compiler is unknown version but accepted MIPSpro compiler version" >&5 -$as_echo "C++ compiler is unknown version but accepted MIPSpro compiler version" >&6; } + { echo "$as_me:$LINENO: result: C++ compiler is unknown version but accepted MIPSpro compiler version" >&5 +echo "${ECHO_T}C++ compiler is unknown version but accepted MIPSpro compiler version" >&6; } GXX_VERSION=MIPSpro-other GXX_VERSION_DETAILED="$GXX_VERSION" ;; @@ -3886,36 +3743,36 @@ $as_echo "C++ compiler is unknown version but accepted MIPSpro compiler version" version10="`echo $version_string | grep 'Version 10'`" version11="`echo $version_string | grep 'Version 11'`" if test "x$version5" != "x" ; then - { $as_echo "$as_me:$LINENO: result: C++ compiler is icc-5" >&5 -$as_echo "C++ compiler is icc-5" >&6; } + { echo "$as_me:$LINENO: result: C++ compiler is icc-5" >&5 +echo "${ECHO_T}C++ compiler is icc-5" >&6; } GXX_VERSION=intel_icc5 else if test "x$version6" != "x" ; then - { $as_echo "$as_me:$LINENO: result: C++ compiler is icc-6" >&5 -$as_echo "C++ compiler is icc-6" >&6; } + { echo "$as_me:$LINENO: result: C++ compiler is icc-6" >&5 +echo "${ECHO_T}C++ compiler is icc-6" >&6; } GXX_VERSION=intel_icc6 else if test "x$version7" != "x" ; then - { $as_echo "$as_me:$LINENO: result: C++ compiler is icc-7" >&5 -$as_echo "C++ compiler is icc-7" >&6; } + { echo "$as_me:$LINENO: result: C++ compiler is icc-7" >&5 +echo "${ECHO_T}C++ compiler is icc-7" >&6; } GXX_VERSION=intel_icc7 else if test "x$version8" != "x" ; then - { $as_echo "$as_me:$LINENO: result: C++ compiler is icc-8" >&5 -$as_echo "C++ compiler is icc-8" >&6; } + { echo "$as_me:$LINENO: result: C++ compiler is icc-8" >&5 +echo "${ECHO_T}C++ compiler is icc-8" >&6; } GXX_VERSION=intel_icc8 else if test "x$version9" != "x" ; then - { $as_echo "$as_me:$LINENO: result: C++ compiler is icc-9" >&5 -$as_echo "C++ compiler is icc-9" >&6; } + { echo "$as_me:$LINENO: result: C++ compiler is icc-9" >&5 +echo "${ECHO_T}C++ compiler is icc-9" >&6; } GXX_VERSION=intel_icc9 else if test "x$version10" != "x" ; then - { $as_echo "$as_me:$LINENO: result: C++ compiler is icc-10" >&5 -$as_echo "C++ compiler is icc-10" >&6; } + { echo "$as_me:$LINENO: result: C++ compiler is icc-10" >&5 +echo "${ECHO_T}C++ compiler is icc-10" >&6; } GXX_VERSION=intel_icc10 else if test "x$version11" != "x" ; then - { $as_echo "$as_me:$LINENO: result: C++ compiler is icc-11" >&5 -$as_echo "C++ compiler is icc-11" >&6; } + { echo "$as_me:$LINENO: result: C++ compiler is icc-11" >&5 +echo "${ECHO_T}C++ compiler is icc-11" >&6; } GXX_VERSION=intel_icc11 else - { $as_echo "$as_me:$LINENO: result: C++ compiler is icc" >&5 -$as_echo "C++ compiler is icc" >&6; } + { echo "$as_me:$LINENO: result: C++ compiler is icc" >&5 +echo "${ECHO_T}C++ compiler is icc" >&6; } GXX_VERSION=intel_icc fi fi fi fi fi fi fi GXX_VERSION_DETAILED="$GXX_VERSION" @@ -3923,8 +3780,8 @@ $as_echo "C++ compiler is icc" >&6; } is_dec_cxx="`($CXX -V 2>&1) | grep 'Compaq C++'`" if test "x$is_dec_cxx" != "x" ; then - { $as_echo "$as_me:$LINENO: result: C++ compiler is Compaq-cxx" >&5 -$as_echo "C++ compiler is Compaq-cxx" >&6; } + { echo "$as_me:$LINENO: result: C++ compiler is Compaq-cxx" >&5 +echo "${ECHO_T}C++ compiler is Compaq-cxx" >&6; } GXX_VERSION=compaq_cxx GXX_VERSION_DETAILED="$GXX_VERSION" else @@ -3932,40 +3789,40 @@ $as_echo "C++ compiler is Compaq-cxx" >&6; } is_sun_cc_1="`($CXX -V 2>&1) | grep 'Sun WorkShop'`" is_sun_cc_2="`($CXX -V 2>&1) | grep 'Sun C++'`" if test "x$is_sun_cc_1$is_sun_cc_2" != "x" ; then - { $as_echo "$as_me:$LINENO: result: C++ compiler is Sun Workshop compiler" >&5 -$as_echo "C++ compiler is Sun Workshop compiler" >&6; } + { echo "$as_me:$LINENO: result: C++ compiler is Sun Workshop compiler" >&5 +echo "${ECHO_T}C++ compiler is Sun Workshop compiler" >&6; } GXX_VERSION=sun_workshop GXX_VERSION_DETAILED="$GXX_VERSION" else is_sun_forte_cc="`($CXX -V 2>&1) | grep 'Forte'`" if test "x$is_sun_forte_cc" != "x" ; then - { $as_echo "$as_me:$LINENO: result: C++ compiler is Sun Forte compiler" >&5 -$as_echo "C++ compiler is Sun Forte compiler" >&6; } + { echo "$as_me:$LINENO: result: C++ compiler is Sun Forte compiler" >&5 +echo "${ECHO_T}C++ compiler is Sun Forte compiler" >&6; } GXX_VERSION=sun_forte GXX_VERSION_DETAILED="$GXX_VERSION" else is_pgcc="`($CXX -V 2>&1) | grep 'Portland Group'`" if test "x$is_pgcc" != "x" ; then - { $as_echo "$as_me:$LINENO: result: C++ compiler is Portland Group C++" >&5 -$as_echo "C++ compiler is Portland Group C++" >&6; } + { echo "$as_me:$LINENO: result: C++ compiler is Portland Group C++" >&5 +echo "${ECHO_T}C++ compiler is Portland Group C++" >&6; } GXX_VERSION=portland_group GXX_VERSION_DETAILED="$GXX_VERSION" else is_aCC="`($CXX -V 2>&1) | grep 'aCC'`" if test "x$is_aCC" != "x" ; then - { $as_echo "$as_me:$LINENO: result: C++ compiler is HP aCC" >&5 -$as_echo "C++ compiler is HP aCC" >&6; } + { echo "$as_me:$LINENO: result: C++ compiler is HP aCC" >&5 +echo "${ECHO_T}C++ compiler is HP aCC" >&6; } GXX_VERSION=hp_aCC GXX_VERSION_DETAILED="$GXX_VERSION" else is_bcc="`($CXX -h 2>&1) | grep 'Borland'`" if test "x$is_bcc" != "x" ; then - { $as_echo "$as_me:$LINENO: result: C++ compiler is Borland C++" >&5 -$as_echo "C++ compiler is Borland C++" >&6; } + { echo "$as_me:$LINENO: result: C++ compiler is Borland C++" >&5 +echo "${ECHO_T}C++ compiler is Borland C++" >&6; } GXX_VERSION=borland_bcc GXX_VERSION_DETAILED="$GXX_VERSION" else @@ -3973,21 +3830,21 @@ $as_echo "C++ compiler is Borland C++" >&6; } is_kai_cc="`($CXX --version 2>&1) | grep 'KAI C++'`" is_kai_cc="$is_kai_cc`($CXX -v 2>&1) | grep /KCC/`" if test "x$is_kai_cc" != "x" ; then - { $as_echo "$as_me:$LINENO: result: C++ compiler is KAI C++" >&5 -$as_echo "C++ compiler is KAI C++" >&6; } + { echo "$as_me:$LINENO: result: C++ compiler is KAI C++" >&5 +echo "${ECHO_T}C++ compiler is KAI C++" >&6; } GXX_VERSION=kai_cc GXX_VERSION_DETAILED="$GXX_VERSION" else is_pathscale="`($CXX -v 2>&1) | grep PathScale`" if test "x$is_pathscale" != "x" ; then - { $as_echo "$as_me:$LINENO: result: C++ compiler is PathScale C++" >&5 -$as_echo "C++ compiler is PathScale C++" >&6; } + { echo "$as_me:$LINENO: result: C++ compiler is PathScale C++" >&5 +echo "${ECHO_T}C++ compiler is PathScale C++" >&6; } GXX_VERSION=pathscale_cc GXX_VERSION_DETAILED="$GXX_VERSION" else - { $as_echo "$as_me:$LINENO: result: Unrecognized C++ compiler -- Try to go ahead and get help from dealii@dealii.org" >&5 -$as_echo "Unrecognized C++ compiler -- Try to go ahead and get help from dealii@dealii.org" >&6; } + { echo "$as_me:$LINENO: result: Unrecognized C++ compiler -- Try to go ahead and get help from dealii@dealii.org" >&5 +echo "${ECHO_T}Unrecognized C++ compiler -- Try to go ahead and get help from dealii@dealii.org" >&6; } GXX_VERSION=unknown_cc GXX_VERSION_DETAILED="$GXX_VERSION" fi @@ -4005,8 +3862,8 @@ $as_echo "Unrecognized C++ compiler -- Try to go ahead and get help from dealii@ - { $as_echo "$as_me:$LINENO: checking if the compiler is built for MPI" >&5 -$as_echo_n "checking if the compiler is built for MPI... " >&6; } + { echo "$as_me:$LINENO: checking if the compiler is built for MPI" >&5 +echo $ECHO_N "checking if the compiler is built for MPI... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -4032,24 +3889,21 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } cat >>confdefs.h <<\_ACEOF #define DEAL_II_COMPILER_SUPPORTS_MPI 1 @@ -4057,16 +3911,15 @@ _ACEOF else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi -rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext @@ -4082,8 +3935,8 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ OLD_CXXFLAGS="$CXXFLAGS" CXXFLAGS=-std=c++0x - { $as_echo "$as_me:$LINENO: checking whether compiler has a flag to support C++0x" >&5 -$as_echo_n "checking whether compiler has a flag to support C++0x... " >&6; } + { echo "$as_me:$LINENO: checking whether compiler has a flag to support C++1x" >&5 +echo $ECHO_N "checking whether compiler has a flag to support C++1x... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -4105,46 +3958,45 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } - test_cxx0x=yes + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + test_cxx1x=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } - test_cxx0x=no + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } + test_cxx1x=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext CXXFLAGS="${OLD_CXXFLAGS}" - if test "x$test_cxx0x" = "xyes" ; then + if test "x$test_cxx1x" = "xyes" ; then OLD_CXXFLAGS="$CXXFLAGS" CXXFLAGS=""-std=c++0x"" - all_cxx0x_available=yes + all_cxx1x_available=yes - { $as_echo "$as_me:$LINENO: checking for std::array" >&5 -$as_echo_n "checking for std::array... " >&6; } + { echo "$as_me:$LINENO: checking for std::array" >&5 +echo $ECHO_N "checking for std::array... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -4166,33 +4018,32 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; }; all_cxx0x_available=no + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; }; all_cxx1x_available=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - { $as_echo "$as_me:$LINENO: checking for std::condition_variable" >&5 -$as_echo_n "checking for std::condition_variable... " >&6; } + { echo "$as_me:$LINENO: checking for std::condition_variable" >&5 +echo $ECHO_N "checking for std::condition_variable... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -4214,33 +4065,32 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; }; all_cxx0x_available=no + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; }; all_cxx1x_available=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - { $as_echo "$as_me:$LINENO: checking for std::function and std::bind" >&5 -$as_echo_n "checking for std::function and std::bind... " >&6; } + { echo "$as_me:$LINENO: checking for std::function and std::bind" >&5 +echo $ECHO_N "checking for std::function and std::bind... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -4264,33 +4114,32 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; }; all_cxx0x_available=no + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; }; all_cxx1x_available=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - { $as_echo "$as_me:$LINENO: checking for std::bind works with rvalues" >&5 -$as_echo_n "checking for std::bind works with rvalues... " >&6; } + { echo "$as_me:$LINENO: checking for std::bind works with rvalues" >&5 +echo $ECHO_N "checking for std::bind works with rvalues... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -4315,33 +4164,32 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; }; all_cxx0x_available=no + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; }; all_cxx1x_available=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - { $as_echo "$as_me:$LINENO: checking for std::shared_ptr" >&5 -$as_echo_n "checking for std::shared_ptr... " >&6; } + { echo "$as_me:$LINENO: checking for std::shared_ptr" >&5 +echo $ECHO_N "checking for std::shared_ptr... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -4363,33 +4211,32 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; }; all_cxx0x_available=no + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; }; all_cxx1x_available=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - { $as_echo "$as_me:$LINENO: checking for std::thread" >&5 -$as_echo_n "checking for std::thread... " >&6; } + { echo "$as_me:$LINENO: checking for std::thread" >&5 +echo $ECHO_N "checking for std::thread... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -4412,33 +4259,32 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; }; all_cxx0x_available=no + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; }; all_cxx1x_available=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - { $as_echo "$as_me:$LINENO: checking for std::mutex" >&5 -$as_echo_n "checking for std::mutex... " >&6; } + { echo "$as_me:$LINENO: checking for std::mutex" >&5 +echo $ECHO_N "checking for std::mutex... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -4460,33 +4306,32 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; }; all_cxx0x_available=no + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; }; all_cxx1x_available=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - { $as_echo "$as_me:$LINENO: checking for std::tuple" >&5 -$as_echo_n "checking for std::tuple... " >&6; } + { echo "$as_me:$LINENO: checking for std::tuple" >&5 +echo $ECHO_N "checking for std::tuple... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -4508,26 +4353,25 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; }; all_cxx0x_available=no + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; }; all_cxx1x_available=no fi @@ -4535,30 +4379,30 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext CXXFLAGS="${OLD_CXXFLAGS}" - { $as_echo "$as_me:$LINENO: checking whether C++0x support is complete enough" >&5 -$as_echo_n "checking whether C++0x support is complete enough... " >&6; } - if test "x$all_cxx0x_available" = "xyes" ; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: checking whether C++1x support is complete enough" >&5 +echo $ECHO_N "checking whether C++1x support is complete enough... $ECHO_C" >&6; } + if test "x$all_cxx1x_available" = "xyes" ; then + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } CXXFLAGSG="$CXXFLAGSG "-std=c++0x"" CXXFLAGSO="$CXXFLAGSO "-std=c++0x"" cat >>confdefs.h <<\_ACEOF -#define DEAL_II_CAN_USE_CXX0X 1 +#define DEAL_II_CAN_USE_CXX1X 1 _ACEOF else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi fi CXXFLAGS="-Wreturn-type -Werror" - { $as_echo "$as_me:$LINENO: checking whether qualifiers in return types lead to a warning" >&5 -$as_echo_n "checking whether qualifiers in return types lead to a warning... " >&6; } + { echo "$as_me:$LINENO: checking whether qualifiers in return types lead to a warning" >&5 +echo $ECHO_N "checking whether qualifiers in return types lead to a warning... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -4582,29 +4426,28 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } CXXFLAGSG="$CXXFLAGSG -Wno-return-type" fi @@ -4673,8 +4516,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext esac - { $as_echo "$as_me:$LINENO: checking for std::advance warning" >&5 -$as_echo_n "checking for std::advance warning... " >&6; } + { echo "$as_me:$LINENO: checking for std::advance warning" >&5 +echo $ECHO_N "checking for std::advance warning... $ECHO_C" >&6; } ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -4710,30 +4553,29 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } DEAL_II_ADVANCE_WARNING=no else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } DEAL_II_ADVANCE_WARNING=yes @@ -4750,8 +4592,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext OLD_CXXFLAGS="$CXXFLAGS" CXXFLAGS=-Wno-long-double - { $as_echo "$as_me:$LINENO: checking whether we can use -Wno-long-double" >&5 -$as_echo_n "checking whether we can use -Wno-long-double... " >&6; } + { echo "$as_me:$LINENO: checking whether we can use -Wno-long-double" >&5 +echo $ECHO_N "checking whether we can use -Wno-long-double... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -4773,31 +4615,30 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } CXXFLAGSG="$CXXFLAGSG -Wno-long-double" CXXFLAGSO="$CXXFLAGSO -Wno-long-double" else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi @@ -4807,8 +4648,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ;; *dec-osf*) - { $as_echo "$as_me:$LINENO: checking for preprocessor warning with cuserid" >&5 -$as_echo_n "checking for preprocessor warning with cuserid... " >&6; } + { echo "$as_me:$LINENO: checking for preprocessor warning with cuserid" >&5 +echo $ECHO_N "checking for preprocessor warning with cuserid... $ECHO_C" >&6; } CXXFLAGS="$CXXFLAGSG -Werror" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -4834,29 +4675,28 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } CXXFLAGSG="$CXXFLAGSG -Wp,-w" CXXFLAGSO="$CXXFLAGSO -Wp,-w" @@ -4933,8 +4773,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext esac - { $as_echo "$as_me:$LINENO: checking whether -wd1572 is allowed" >&5 -$as_echo_n "checking whether -wd1572 is allowed... " >&6; } + { echo "$as_me:$LINENO: checking whether -wd1572 is allowed" >&5 +echo $ECHO_N "checking whether -wd1572 is allowed... $ECHO_C" >&6; } ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -4963,30 +4803,29 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } CXXFLAGSG="$CXXFLAGSG -wd1572" else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi @@ -5047,8 +4886,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext LDFLAGSPIC="-G" CXXFLAGS="$CXXFLAGSG -library=stlport4" - { $as_echo "$as_me:$LINENO: checking whether -library=stlport4 works" >&5 -$as_echo_n "checking whether -library=stlport4 works... " >&6; } + { echo "$as_me:$LINENO: checking whether -library=stlport4 works" >&5 +echo $ECHO_N "checking whether -library=stlport4 works... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -5073,31 +4912,30 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } CXXFLAGSG="$CXXFLAGSG -library=stlport4" CXXFLAGSO="$CXXFLAGSO -library=stlport4" else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi @@ -5128,9 +4966,9 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext CXXFLAGSO="$CXXFLAGS -q -O2" CXXFLAGSPIC="" LDFLAGSPIC="" - { { $as_echo "$as_me:$LINENO: error: Attention! deal.II is not known to work with Borland C++! + { { echo "$as_me:$LINENO: error: Attention! deal.II is not known to work with Borland C++! If you intend to port it to Borland C++" >&5 -$as_echo "$as_me: error: Attention! deal.II is not known to work with Borland C++! +echo "$as_me: error: Attention! deal.II is not known to work with Borland C++! If you intend to port it to Borland C++" >&2;} { (exit please remove this message from aclocal.m4 and call autoconf and configure. If you do not @@ -5147,8 +4985,8 @@ $as_echo "$as_me: error: Attention! deal.II is not known to work with Borland C+ *) CXXFLAGSG="$CXXFLAGS -DDEBUG" CXXFLAGSO="$CXXFLAGS -O2" - { $as_echo "$as_me:$LINENO: result: Unknown C++ compiler - using generic options" >&5 -$as_echo "Unknown C++ compiler - using generic options" >&6; } + { echo "$as_me:$LINENO: result: Unknown C++ compiler - using generic options" >&5 +echo "${ECHO_T}Unknown C++ compiler - using generic options" >&6; } ;; esac fi @@ -5157,8 +4995,8 @@ $as_echo "Unknown C++ compiler - using generic options" >&6; } if test "$GXX" = yes ; then case "$target" in alpha*-osf*) - { $as_echo "$as_me:$LINENO: checking whether -ggdb works for long symbols" >&5 -$as_echo_n "checking whether -ggdb works for long symbols... " >&6; } + { echo "$as_me:$LINENO: checking whether -ggdb works for long symbols" >&5 +echo $ECHO_N "checking whether -ggdb works for long symbols... $ECHO_C" >&6; } CXXFLAGS="-ggdb $CXXFLAGSG" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -5198,31 +5036,30 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then CXXFLAGSG="-ggdb $CXXFLAGSG" - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 CXXFLAGSG="-gstabs $CXXFLAGSG" - { $as_echo "$as_me:$LINENO: result: no -- using -gstabs instead" >&5 -$as_echo "no -- using -gstabs instead" >&6; } + { echo "$as_me:$LINENO: result: no -- using -gstabs instead" >&5 +echo "${ECHO_T}no -- using -gstabs instead" >&6; } fi @@ -5230,8 +5067,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ;; *) - { $as_echo "$as_me:$LINENO: checking whether -ggdb works" >&5 -$as_echo_n "checking whether -ggdb works... " >&6; } + { echo "$as_me:$LINENO: checking whether -ggdb works" >&5 +echo $ECHO_N "checking whether -ggdb works... $ECHO_C" >&6; } CXXFLAGS="-ggdb $CXXFLAGSG" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -5254,31 +5091,30 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then CXXFLAGSG="-ggdb $CXXFLAGSG" - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 CXXFLAGSG="-g $CXXFLAGSG" - { $as_echo "$as_me:$LINENO: result: no -- using -g instead" >&5 -$as_echo "no -- using -g instead" >&6; } + { echo "$as_me:$LINENO: result: no -- using -g instead" >&5 +echo "${ECHO_T}no -- using -g instead" >&6; } fi @@ -5323,96 +5159,96 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext CC_VERSION_STRING=`($CC -v 2>&1) | grep "gcc version"` case "$CC_VERSION_STRING" in *"egcs-1.1"*) - { $as_echo "$as_me:$LINENO: result: C compiler is egcs-1.1" >&5 -$as_echo "C compiler is egcs-1.1" >&6; } + { echo "$as_me:$LINENO: result: C compiler is egcs-1.1" >&5 +echo "${ECHO_T}C compiler is egcs-1.1" >&6; } CC_VERSION=egcs1.1 ;; *2.95*) - { $as_echo "$as_me:$LINENO: result: C compiler is gcc-2.95" >&5 -$as_echo "C compiler is gcc-2.95" >&6; } + { echo "$as_me:$LINENO: result: C compiler is gcc-2.95" >&5 +echo "${ECHO_T}C compiler is gcc-2.95" >&6; } CC_VERSION=gcc2.95 ;; *2.96*) - { { $as_echo "$as_me:$LINENO: error: C compiler reports faulty gcc 2.96. Please install a new compiler" >&5 -$as_echo "$as_me: error: C compiler reports faulty gcc 2.96. Please install a new compiler" >&2;} + { { echo "$as_me:$LINENO: error: C compiler reports faulty gcc 2.96. Please install a new compiler" >&5 +echo "$as_me: error: C compiler reports faulty gcc 2.96. Please install a new compiler" >&2;} { (exit 1); exit 1; }; } CC_VERSION=gcc2.96 ;; *2.97*) - { $as_echo "$as_me:$LINENO: result: C compiler is gcc-2.97" >&5 -$as_echo "C compiler is gcc-2.97" >&6; } + { echo "$as_me:$LINENO: result: C compiler is gcc-2.97" >&5 +echo "${ECHO_T}C compiler is gcc-2.97" >&6; } CC_VERSION=gcc2.97 ;; *version\ 3.0*) - { $as_echo "$as_me:$LINENO: result: C compiler is gcc-3.0" >&5 -$as_echo "C compiler is gcc-3.0" >&6; } + { echo "$as_me:$LINENO: result: C compiler is gcc-3.0" >&5 +echo "${ECHO_T}C compiler is gcc-3.0" >&6; } CC_VERSION=gcc3.0 ;; *version\ 3.1*) - { $as_echo "$as_me:$LINENO: result: C compiler is gcc-3.1" >&5 -$as_echo "C compiler is gcc-3.1" >&6; } + { echo "$as_me:$LINENO: result: C compiler is gcc-3.1" >&5 +echo "${ECHO_T}C compiler is gcc-3.1" >&6; } CC_VERSION=gcc3.1 ;; *version\ 3.2*) - { $as_echo "$as_me:$LINENO: result: C compiler is gcc-3.2" >&5 -$as_echo "C compiler is gcc-3.2" >&6; } + { echo "$as_me:$LINENO: result: C compiler is gcc-3.2" >&5 +echo "${ECHO_T}C compiler is gcc-3.2" >&6; } CC_VERSION=gcc3.2 ;; *version\ 3.3*) - { $as_echo "$as_me:$LINENO: result: C compiler is gcc-3.3" >&5 -$as_echo "C compiler is gcc-3.3" >&6; } + { echo "$as_me:$LINENO: result: C compiler is gcc-3.3" >&5 +echo "${ECHO_T}C compiler is gcc-3.3" >&6; } CC_VERSION=gcc3.3 ;; *version\ 3.4*) - { $as_echo "$as_me:$LINENO: result: C compiler is gcc-3.4" >&5 -$as_echo "C compiler is gcc-3.4" >&6; } + { echo "$as_me:$LINENO: result: C compiler is gcc-3.4" >&5 +echo "${ECHO_T}C compiler is gcc-3.4" >&6; } CC_VERSION=gcc3.4 ;; *version\ 3.5*) - { $as_echo "$as_me:$LINENO: result: C compiler is gcc-3.5" >&5 -$as_echo "C compiler is gcc-3.5" >&6; } + { echo "$as_me:$LINENO: result: C compiler is gcc-3.5" >&5 +echo "${ECHO_T}C compiler is gcc-3.5" >&6; } CC_VERSION=gcc3.5 ;; *version\ 4.0*) - { $as_echo "$as_me:$LINENO: result: C compiler is gcc-4.0" >&5 -$as_echo "C compiler is gcc-4.0" >&6; } + { echo "$as_me:$LINENO: result: C compiler is gcc-4.0" >&5 +echo "${ECHO_T}C compiler is gcc-4.0" >&6; } CC_VERSION=gcc4.0 ;; *version\ 4.1*) - { $as_echo "$as_me:$LINENO: result: C compiler is gcc-4.1" >&5 -$as_echo "C compiler is gcc-4.1" >&6; } + { echo "$as_me:$LINENO: result: C compiler is gcc-4.1" >&5 +echo "${ECHO_T}C compiler is gcc-4.1" >&6; } CC_VERSION=gcc4.1 ;; *version\ 4.2*) - { $as_echo "$as_me:$LINENO: result: C compiler is gcc-4.2" >&5 -$as_echo "C compiler is gcc-4.2" >&6; } + { echo "$as_me:$LINENO: result: C compiler is gcc-4.2" >&5 +echo "${ECHO_T}C compiler is gcc-4.2" >&6; } CC_VERSION=gcc4.2 ;; *version\ 4.3*) - { $as_echo "$as_me:$LINENO: result: C compiler is gcc-4.3" >&5 -$as_echo "C compiler is gcc-4.3" >&6; } + { echo "$as_me:$LINENO: result: C compiler is gcc-4.3" >&5 +echo "${ECHO_T}C compiler is gcc-4.3" >&6; } CC_VERSION=gcc4.3 ;; *version\ 4.4*) - { $as_echo "$as_me:$LINENO: result: C compiler is gcc-4.4" >&5 -$as_echo "C compiler is gcc-4.4" >&6; } + { echo "$as_me:$LINENO: result: C compiler is gcc-4.4" >&5 +echo "${ECHO_T}C compiler is gcc-4.4" >&6; } CC_VERSION=gcc4.4 ;; *version\ 4.5*) - { $as_echo "$as_me:$LINENO: result: C compiler is gcc-4.5" >&5 -$as_echo "C compiler is gcc-4.5" >&6; } + { echo "$as_me:$LINENO: result: C compiler is gcc-4.5" >&5 +echo "${ECHO_T}C compiler is gcc-4.5" >&6; } CC_VERSION=gcc4.5 ;; *2.4* | *2.5* | *2.6* | *2.7* | *2.8*) - { $as_echo "$as_me:$LINENO: result: C compiler is $CC_VERSION_STRING" >&5 -$as_echo "C compiler is $CC_VERSION_STRING" >&6; } - { { $as_echo "$as_me:$LINENO: error: C compiler is not supported" >&5 -$as_echo "$as_me: error: C compiler is not supported" >&2;} + { echo "$as_me:$LINENO: result: C compiler is $CC_VERSION_STRING" >&5 +echo "${ECHO_T}C compiler is $CC_VERSION_STRING" >&6; } + { { echo "$as_me:$LINENO: error: C compiler is not supported" >&5 +echo "$as_me: error: C compiler is not supported" >&2;} { (exit 1); exit 1; }; } ;; *) - { $as_echo "$as_me:$LINENO: result: C compiler is unknown but accepted gcc version" >&5 -$as_echo "C compiler is unknown but accepted gcc version" >&6; } + { echo "$as_me:$LINENO: result: C compiler is unknown but accepted gcc version" >&5 +echo "${ECHO_T}C compiler is unknown but accepted gcc version" >&6; } CC_VERSION=gcc-other ;; esac @@ -5420,8 +5256,8 @@ $as_echo "C compiler is unknown but accepted gcc version" >&6; } is_ibm_xlc="`($CC 2>&1) | egrep 'VisualAge C|C Set ++|C for AIX Compiler'`" if test "x$is_ibm_xlc" != "x" ; then - { $as_echo "$as_me:$LINENO: result: C compiler is IBM xlC" >&5 -$as_echo "C compiler is IBM xlC" >&6; } + { echo "$as_me:$LINENO: result: C compiler is IBM xlC" >&5 +echo "${ECHO_T}C compiler is IBM xlC" >&6; } CC_VERSION=ibm_xlc else @@ -5429,34 +5265,34 @@ $as_echo "C compiler is IBM xlC" >&6; } if test "x$mips_pro" != "x" ; then case "$mips_pro" in *7.0* | *7.1* | *7.2* | *7.3*) - { $as_echo "$as_me:$LINENO: result: C compiler is $mips_pro" >&5 -$as_echo "C compiler is $mips_pro" >&6; } - { { $as_echo "$as_me:$LINENO: error: This compiler is not supported" >&5 -$as_echo "$as_me: error: This compiler is not supported" >&2;} + { echo "$as_me:$LINENO: result: C compiler is $mips_pro" >&5 +echo "${ECHO_T}C compiler is $mips_pro" >&6; } + { { echo "$as_me:$LINENO: error: This compiler is not supported" >&5 +echo "$as_me: error: This compiler is not supported" >&2;} { (exit 1); exit 1; }; } CC_VERSION=MIPSpro7.3 ;; *7.4) - { $as_echo "$as_me:$LINENO: result: C compiler is MIPSpro compiler 7.4" >&5 -$as_echo "C compiler is MIPSpro compiler 7.4" >&6; } - { { $as_echo "$as_me:$LINENO: error: This compiler is not supported. Use MIPSPro compiler 7.4x" >&5 -$as_echo "$as_me: error: This compiler is not supported. Use MIPSPro compiler 7.4x" >&2;} + { echo "$as_me:$LINENO: result: C compiler is MIPSpro compiler 7.4" >&5 +echo "${ECHO_T}C compiler is MIPSpro compiler 7.4" >&6; } + { { echo "$as_me:$LINENO: error: This compiler is not supported. Use MIPSPro compiler 7.4x" >&5 +echo "$as_me: error: This compiler is not supported. Use MIPSPro compiler 7.4x" >&2;} { (exit 1); exit 1; }; } CC_VERSION=MIPSpro7.4 ;; *7.41* | *7.42* | *7.43* | *7.44*) - { $as_echo "$as_me:$LINENO: result: C compiler is MIPSpro compiler 7.4x" >&5 -$as_echo "C compiler is MIPSpro compiler 7.4x" >&6; } + { echo "$as_me:$LINENO: result: C compiler is MIPSpro compiler 7.4x" >&5 +echo "${ECHO_T}C compiler is MIPSpro compiler 7.4x" >&6; } CC_VERSION=MIPSpro7.4x ;; *"7.5"*) - { $as_echo "$as_me:$LINENO: result: C compiler is MIPSpro compiler 7.5" >&5 -$as_echo "C compiler is MIPSpro compiler 7.5" >&6; } + { echo "$as_me:$LINENO: result: C compiler is MIPSpro compiler 7.5" >&5 +echo "${ECHO_T}C compiler is MIPSpro compiler 7.5" >&6; } CC_VERSION=MIPSpro7.5 ;; *) - { $as_echo "$as_me:$LINENO: result: C compiler is unknown version but accepted MIPSpro compiler version" >&5 -$as_echo "C compiler is unknown version but accepted MIPSpro compiler version" >&6; } + { echo "$as_me:$LINENO: result: C compiler is unknown version but accepted MIPSpro compiler version" >&5 +echo "${ECHO_T}C compiler is unknown version but accepted MIPSpro compiler version" >&6; } CC_VERSION=MIPSpro-other ;; esac @@ -5478,88 +5314,88 @@ $as_echo "C compiler is unknown version but accepted MIPSpro compiler version" > version9="`echo $version_string | grep 'Version 9'`" version10="`echo $version_string | grep 'Version 10'`" if test "x$version5" != "x" ; then - { $as_echo "$as_me:$LINENO: result: C compiler is icc-5" >&5 -$as_echo "C compiler is icc-5" >&6; } + { echo "$as_me:$LINENO: result: C compiler is icc-5" >&5 +echo "${ECHO_T}C compiler is icc-5" >&6; } CC_VERSION=intel_icc5 else if test "x$version6" != "x" ; then - { $as_echo "$as_me:$LINENO: result: C compiler is icc-6" >&5 -$as_echo "C compiler is icc-6" >&6; } + { echo "$as_me:$LINENO: result: C compiler is icc-6" >&5 +echo "${ECHO_T}C compiler is icc-6" >&6; } CC_VERSION=intel_icc6 else if test "x$version7" != "x" ; then - { $as_echo "$as_me:$LINENO: result: C compiler is icc-7" >&5 -$as_echo "C compiler is icc-7" >&6; } + { echo "$as_me:$LINENO: result: C compiler is icc-7" >&5 +echo "${ECHO_T}C compiler is icc-7" >&6; } CC_VERSION=intel_icc7 else if test "x$version8" != "x" ; then - { $as_echo "$as_me:$LINENO: result: C compiler is icc-8" >&5 -$as_echo "C compiler is icc-8" >&6; } + { echo "$as_me:$LINENO: result: C compiler is icc-8" >&5 +echo "${ECHO_T}C compiler is icc-8" >&6; } CC_VERSION=intel_icc8 else if test "x$version9" != "x" ; then - { $as_echo "$as_me:$LINENO: result: C compiler is icc-9" >&5 -$as_echo "C compiler is icc-9" >&6; } + { echo "$as_me:$LINENO: result: C compiler is icc-9" >&5 +echo "${ECHO_T}C compiler is icc-9" >&6; } CC_VERSION=intel_icc9 else if test "x$version10" != "x" ; then - { $as_echo "$as_me:$LINENO: result: C compiler is icc-10" >&5 -$as_echo "C compiler is icc-10" >&6; } + { echo "$as_me:$LINENO: result: C compiler is icc-10" >&5 +echo "${ECHO_T}C compiler is icc-10" >&6; } CC_VERSION=intel_icc10 else - { $as_echo "$as_me:$LINENO: result: C compiler is icc" >&5 -$as_echo "C compiler is icc" >&6; } + { echo "$as_me:$LINENO: result: C compiler is icc" >&5 +echo "${ECHO_T}C compiler is icc" >&6; } CC_VERSION=intel_icc fi fi fi fi fi fi else is_dec_cxx="`($CC -V 2>&1) | grep 'Compaq C'`" if test "x$is_dec_cxx" != "x" ; then - { $as_echo "$as_me:$LINENO: result: C compiler is Compaq cxx" >&5 -$as_echo "C compiler is Compaq cxx" >&6; } + { echo "$as_me:$LINENO: result: C compiler is Compaq cxx" >&5 +echo "${ECHO_T}C compiler is Compaq cxx" >&6; } CC_VERSION=compaq_cxx else is_sun_cc="`($CC -V 2>&1) | grep 'Sun WorkShop'`" if test "x$is_sun_cc" != "x" ; then - { $as_echo "$as_me:$LINENO: result: C compiler is Sun Workshop compiler" >&5 -$as_echo "C compiler is Sun Workshop compiler" >&6; } + { echo "$as_me:$LINENO: result: C compiler is Sun Workshop compiler" >&5 +echo "${ECHO_T}C compiler is Sun Workshop compiler" >&6; } CC_VERSION=sun_workshop else is_sun_forte_cc="`($CC -V 2>&1) | grep 'Forte'`" if test "x$is_sun_forte_cc" != "x" ; then - { $as_echo "$as_me:$LINENO: result: C compiler is Sun Forte compiler" >&5 -$as_echo "C compiler is Sun Forte compiler" >&6; } + { echo "$as_me:$LINENO: result: C compiler is Sun Forte compiler" >&5 +echo "${ECHO_T}C compiler is Sun Forte compiler" >&6; } CC_VERSION=sun_forte else is_pgcc="`($CC -V 2>&1) | grep 'Portland Group'`" if test "x$is_pgcc" != "x" ; then - { $as_echo "$as_me:$LINENO: result: C compiler is Portland Group C" >&5 -$as_echo "C compiler is Portland Group C" >&6; } + { echo "$as_me:$LINENO: result: C compiler is Portland Group C" >&5 +echo "${ECHO_T}C compiler is Portland Group C" >&6; } CC_VERSION=portland_group else is_aCC="`($CC -V 2>&1) | grep 'aCC'`" if test "x$is_aCC" != "x" ; then - { $as_echo "$as_me:$LINENO: result: C compiler is HP aCC" >&5 -$as_echo "C compiler is HP aCC" >&6; } + { echo "$as_me:$LINENO: result: C compiler is HP aCC" >&5 +echo "${ECHO_T}C compiler is HP aCC" >&6; } CC_VERSION=hp_aCC else is_bcc="`($CC -h 2>&1) | grep 'Borland'`" if test "x$is_bcc" != "x" ; then - { $as_echo "$as_me:$LINENO: result: C compiler is Borland C" >&5 -$as_echo "C compiler is Borland C" >&6; } + { echo "$as_me:$LINENO: result: C compiler is Borland C" >&5 +echo "${ECHO_T}C compiler is Borland C" >&6; } CC_VERSION=borland_bcc else is_kai_cc="`($CC --version 2>&1) | grep 'KAI C'`" is_kai_cc="$is_kai_cc`($CC -v 2>&1) | grep /KCC/`" if test "x$is_kai_cc" != "x" ; then - { $as_echo "$as_me:$LINENO: result: C compiler is KAI C" >&5 -$as_echo "C compiler is KAI C" >&6; } + { echo "$as_me:$LINENO: result: C compiler is KAI C" >&5 +echo "${ECHO_T}C compiler is KAI C" >&6; } CC_VERSION=kai_cc else - { $as_echo "$as_me:$LINENO: result: Unrecognized compiler -- still trying" >&5 -$as_echo "Unrecognized compiler -- still trying" >&6; } + { echo "$as_me:$LINENO: result: Unrecognized compiler -- still trying" >&5 +echo "${ECHO_T}Unrecognized compiler -- still trying" >&6; } CC_VERSION=unknown_cc fi fi @@ -5651,8 +5487,8 @@ $as_echo "Unrecognized compiler -- still trying" >&6; } esac - { $as_echo "$as_me:$LINENO: checking whether -wd1572 is allowed for the C compiler" >&5 -$as_echo_n "checking whether -wd1572 is allowed for the C compiler... " >&6; } + { echo "$as_me:$LINENO: checking whether -wd1572 is allowed for the C compiler" >&5 +echo $ECHO_N "checking whether -wd1572 is allowed for the C compiler... $ECHO_C" >&6; } ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -5682,29 +5518,28 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } CFLAGS="$OLDCFLAGS" @@ -5716,8 +5551,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ;; *) - { $as_echo "$as_me:$LINENO: result: Unknown C compiler - using generic options" >&5 -$as_echo "Unknown C compiler - using generic options" >&6; } + { echo "$as_me:$LINENO: result: Unknown C compiler - using generic options" >&5 +echo "${ECHO_T}Unknown C compiler - using generic options" >&6; } CFLAGS="$CFLAGS -O2" ;; esac @@ -5730,8 +5565,8 @@ $as_echo "Unknown C compiler - using generic options" >&6; } OLD_LDFLAGS="$LDFLAGS" LDFLAGS="-Wl,-rpath,$DEAL_II_PATH/lib $LDFLAGS" - { $as_echo "$as_me:$LINENO: checking whether compiler understands option -Wl,-rpath" >&5 -$as_echo_n "checking whether compiler understands option -Wl,-rpath... " >&6; } + { echo "$as_me:$LINENO: checking whether compiler understands option -Wl,-rpath" >&5 +echo $ECHO_N "checking whether compiler understands option -Wl,-rpath... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -5753,35 +5588,31 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } LD_PATH_OPTION="-Wl,-rpath " else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } LDFLAGS="$OLD_LDFLAGS" LD_PATH_OPTION="no" fi -rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext @@ -5805,8 +5636,8 @@ fi ;; *) - { $as_echo "$as_me:$LINENO: checking for platform specific thread flags" >&5 -$as_echo_n "checking for platform specific thread flags... " >&6; } + { echo "$as_me:$LINENO: checking for platform specific thread flags" >&5 +echo $ECHO_N "checking for platform specific thread flags... $ECHO_C" >&6; } ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -5841,20 +5672,20 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu done if test "$thread_flag" = invalid_last_entry ; then - { $as_echo "$as_me:$LINENO: result: no flag found!" >&5 -$as_echo "no flag found!" >&6; } - { { $as_echo "$as_me:$LINENO: error: Could not determine multithreading flag for this platform. Aborting!" >&5 -$as_echo "$as_me: error: Could not determine multithreading flag for this platform. Aborting!" >&2;} + { echo "$as_me:$LINENO: result: no flag found!" >&5 +echo "${ECHO_T}no flag found!" >&6; } + { { echo "$as_me:$LINENO: error: Could not determine multithreading flag for this platform. Aborting!" >&5 +echo "$as_me: error: Could not determine multithreading flag for this platform. Aborting!" >&2;} { (exit 1); exit 1; }; } fi - { $as_echo "$as_me:$LINENO: result: -$thread_flag" >&5 -$as_echo "-$thread_flag" >&6; } + { echo "$as_me:$LINENO: result: -$thread_flag" >&5 +echo "${ECHO_T}-$thread_flag" >&6; } ;; esac - { $as_echo "$as_me:$LINENO: checking for platform specific multi-threading defines" >&5 -$as_echo_n "checking for platform specific multi-threading defines... " >&6; } + { echo "$as_me:$LINENO: checking for platform specific multi-threading defines" >&5 +echo $ECHO_N "checking for platform specific multi-threading defines... $ECHO_C" >&6; } ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -5890,29 +5721,28 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - { $as_echo "$as_me:$LINENO: result: not necessary" >&5 -$as_echo "not necessary" >&6; } + { echo "$as_me:$LINENO: result: not necessary" >&5 +echo "${ECHO_T}not necessary" >&6; } else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: -D_REENTRANT -D_THREAD_SAFE" >&5 -$as_echo "-D_REENTRANT -D_THREAD_SAFE" >&6; } + { echo "$as_me:$LINENO: result: -D_REENTRANT -D_THREAD_SAFE" >&5 +echo "${ECHO_T}-D_REENTRANT -D_THREAD_SAFE" >&6; } CXXFLAGSG="$CXXFLAGSG -D_REENTRANT -D_THREAD_SAFE" CXXFLAGSO="$CXXFLAGSO -D_REENTRANT -D_THREAD_SAFE" @@ -5950,9 +5780,9 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ;; *) - { { $as_echo "$as_me:$LINENO: error: No threading compiler options for this C++ compiler + { { echo "$as_me:$LINENO: error: No threading compiler options for this C++ compiler specified at present" >&5 -$as_echo "$as_me: error: No threading compiler options for this C++ compiler +echo "$as_me: error: No threading compiler options for this C++ compiler specified at present" >&2;} { (exit 1); exit 1; }; } exit 1 @@ -5965,8 +5795,8 @@ $as_echo "$as_me: error: No threading compiler options for this C++ compiler if test "$enablemultithreading" = yes ; then case "$GXX_VERSION" in gcc*) - { $as_echo "$as_me:$LINENO: checking for only partly bracketed mutex initializer" >&5 -$as_echo_n "checking for only partly bracketed mutex initializer... " >&6; } + { echo "$as_me:$LINENO: checking for only partly bracketed mutex initializer" >&5 +echo $ECHO_N "checking for only partly bracketed mutex initializer... $ECHO_C" >&6; } ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -5997,29 +5827,28 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } CXXFLAGSG="$CXXFLAGSG -Wno-missing-braces" CXXFLAGSO="$CXXFLAGSO -Wno-missing-braces" @@ -6051,8 +5880,8 @@ fi if test "x$withmultithreading" != "xno" ; then if test "x$withmultithreading" = "xposix" ; then - { $as_echo "$as_me:$LINENO: checking for posix thread functions" >&5 -$as_echo_n "checking for posix thread functions... " >&6; } + { echo "$as_me:$LINENO: checking for posix thread functions" >&5 +echo $ECHO_N "checking for posix thread functions... $ECHO_C" >&6; } ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -6087,37 +5916,36 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - { $as_echo "$as_me:$LINENO: result: ok" >&5 -$as_echo "ok" >&6; } + { echo "$as_me:$LINENO: result: ok" >&5 +echo "${ECHO_T}ok" >&6; } else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { { $as_echo "$as_me:$LINENO: error: not found" >&5 -$as_echo "$as_me: error: not found" >&2;} + { { echo "$as_me:$LINENO: error: not found" >&5 +echo "$as_me: error: not found" >&2;} { (exit 1); exit 1; }; } fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - { $as_echo "$as_me:$LINENO: checking for posix thread mutex functions" >&5 -$as_echo_n "checking for posix thread mutex functions... " >&6; } + { echo "$as_me:$LINENO: checking for posix thread mutex functions" >&5 +echo $ECHO_N "checking for posix thread mutex functions... $ECHO_C" >&6; } ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -6153,37 +5981,36 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - { $as_echo "$as_me:$LINENO: result: ok" >&5 -$as_echo "ok" >&6; } + { echo "$as_me:$LINENO: result: ok" >&5 +echo "${ECHO_T}ok" >&6; } else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { { $as_echo "$as_me:$LINENO: error: not found" >&5 -$as_echo "$as_me: error: not found" >&2;} + { { echo "$as_me:$LINENO: error: not found" >&5 +echo "$as_me: error: not found" >&2;} { (exit 1); exit 1; }; } fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - { $as_echo "$as_me:$LINENO: checking for posix thread condition variable functions" >&5 -$as_echo_n "checking for posix thread condition variable functions... " >&6; } + { echo "$as_me:$LINENO: checking for posix thread condition variable functions" >&5 +echo $ECHO_N "checking for posix thread condition variable functions... $ECHO_C" >&6; } ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -6222,37 +6049,36 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - { $as_echo "$as_me:$LINENO: result: ok" >&5 -$as_echo "ok" >&6; } + { echo "$as_me:$LINENO: result: ok" >&5 +echo "${ECHO_T}ok" >&6; } else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { { $as_echo "$as_me:$LINENO: error: not found" >&5 -$as_echo "$as_me: error: not found" >&2;} + { { echo "$as_me:$LINENO: error: not found" >&5 +echo "$as_me: error: not found" >&2;} { (exit 1); exit 1; }; } fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - { $as_echo "$as_me:$LINENO: checking for posix thread barrier functions" >&5 -$as_echo_n "checking for posix thread barrier functions... " >&6; } + { echo "$as_me:$LINENO: checking for posix thread barrier functions" >&5 +echo $ECHO_N "checking for posix thread barrier functions... $ECHO_C" >&6; } ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -6287,30 +6113,29 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - { $as_echo "$as_me:$LINENO: result: ok" >&5 -$as_echo "ok" >&6; } + { echo "$as_me:$LINENO: result: ok" >&5 +echo "${ECHO_T}ok" >&6; } x=0 else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: not found. barriers will not be supported" >&5 -$as_echo "not found. barriers will not be supported" >&6; } + { echo "$as_me:$LINENO: result: not found. barriers will not be supported" >&5 +echo "${ECHO_T}not found. barriers will not be supported" >&6; } x=1 fi @@ -6330,8 +6155,8 @@ cat >>confdefs.h <<\_ACEOF _ACEOF else - { { $as_echo "$as_me:$LINENO: error: Invalid flag for --with-multithreading" >&5 -$as_echo "$as_me: error: Invalid flag for --with-multithreading" >&2;} + { { echo "$as_me:$LINENO: error: Invalid flag for --with-multithreading" >&5 +echo "$as_me: error: Invalid flag for --with-multithreading" >&2;} { (exit 1); exit 1; }; } fi @@ -6353,8 +6178,8 @@ _ACEOF - { $as_echo "$as_me:$LINENO: checking whether AssertThrow works with debug flags" >&5 -$as_echo_n "checking whether AssertThrow works with debug flags... " >&6; } + { echo "$as_me:$LINENO: checking whether AssertThrow works with debug flags" >&5 +echo $ECHO_N "checking whether AssertThrow works with debug flags... $ECHO_C" >&6; } ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -6455,29 +6280,28 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } CXXFLAGSG="-DDISABLE_ASSERT_THROW $CXXFLAGSG" fi @@ -6485,8 +6309,8 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - { $as_echo "$as_me:$LINENO: checking whether AssertThrow works with optimized flags" >&5 -$as_echo_n "checking whether AssertThrow works with optimized flags... " >&6; } + { echo "$as_me:$LINENO: checking whether AssertThrow works with optimized flags" >&5 +echo $ECHO_N "checking whether AssertThrow works with optimized flags... $ECHO_C" >&6; } ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -6587,29 +6411,28 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } CXXFLAGSO="-DDISABLE_ASSERT_THROW $CXXFLAGSO" fi @@ -6617,8 +6440,8 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - { $as_echo "$as_me:$LINENO: checking for local computed template typedef bug" >&5 -$as_echo_n "checking for local computed template typedef bug... " >&6; } + { echo "$as_me:$LINENO: checking for local computed template typedef bug" >&5 +echo $ECHO_N "checking for local computed template typedef bug... $ECHO_C" >&6; } ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -6656,29 +6479,28 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: yes. using workaround" >&5 -$as_echo "yes. using workaround" >&6; } + { echo "$as_me:$LINENO: result: yes. using workaround" >&5 +echo "${ECHO_T}yes. using workaround" >&6; } cat >>confdefs.h <<\_ACEOF #define DEAL_II_LOCAL_TYPEDEF_COMP_WORKAROUND 1 @@ -6690,8 +6512,8 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - { $as_echo "$as_me:$LINENO: checking for partially specialized template access control bug" >&5 -$as_echo_n "checking for partially specialized template access control bug... " >&6; } + { echo "$as_me:$LINENO: checking for partially specialized template access control bug" >&5 +echo $ECHO_N "checking for partially specialized template access control bug... $ECHO_C" >&6; } ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -6735,29 +6557,28 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: yes. using workaround" >&5 -$as_echo "yes. using workaround" >&6; } + { echo "$as_me:$LINENO: result: yes. using workaround" >&5 +echo "${ECHO_T}yes. using workaround" >&6; } cat >>confdefs.h <<\_ACEOF #define DEAL_II_TEMPLATE_SPEC_ACCESS_WORKAROUND 1 @@ -6769,8 +6590,8 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - { $as_echo "$as_me:$LINENO: checking for template member operator instantiation bug" >&5 -$as_echo_n "checking for template member operator instantiation bug... " >&6; } + { echo "$as_me:$LINENO: checking for template member operator instantiation bug" >&5 +echo $ECHO_N "checking for template member operator instantiation bug... $ECHO_C" >&6; } ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -6807,30 +6628,29 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } x="" else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: yes. using workaround" >&5 -$as_echo "yes. using workaround" >&6; } + { echo "$as_me:$LINENO: result: yes. using workaround" >&5 +echo "${ECHO_T}yes. using workaround" >&6; } x="template" fi @@ -6843,8 +6663,8 @@ _ACEOF - { $as_echo "$as_me:$LINENO: checking for 1st template friend in namespace bug" >&5 -$as_echo_n "checking for 1st template friend in namespace bug... " >&6; } + { echo "$as_me:$LINENO: checking for 1st template friend in namespace bug" >&5 +echo $ECHO_N "checking for 1st template friend in namespace bug... $ECHO_C" >&6; } ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -6895,29 +6715,28 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: yes. using workaround" >&5 -$as_echo "yes. using workaround" >&6; } + { echo "$as_me:$LINENO: result: yes. using workaround" >&5 +echo "${ECHO_T}yes. using workaround" >&6; } cat >>confdefs.h <<_ACEOF #define DEAL_II_NAMESP_TEMPL_FRIEND_BUG 1 @@ -6929,8 +6748,8 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - { $as_echo "$as_me:$LINENO: checking for 2nd template friend in namespace bug" >&5 -$as_echo_n "checking for 2nd template friend in namespace bug... " >&6; } + { echo "$as_me:$LINENO: checking for 2nd template friend in namespace bug" >&5 +echo $ECHO_N "checking for 2nd template friend in namespace bug... $ECHO_C" >&6; } ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -6973,29 +6792,28 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: yes. using workaround" >&5 -$as_echo "yes. using workaround" >&6; } + { echo "$as_me:$LINENO: result: yes. using workaround" >&5 +echo "${ECHO_T}yes. using workaround" >&6; } cat >>confdefs.h <<_ACEOF #define DEAL_II_NAMESP_TEMPL_FRIEND_BUG2 1 @@ -7007,8 +6825,8 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - { $as_echo "$as_me:$LINENO: checking for template specialization friend bug" >&5 -$as_echo_n "checking for template specialization friend bug... " >&6; } + { echo "$as_me:$LINENO: checking for template specialization friend bug" >&5 +echo $ECHO_N "checking for template specialization friend bug... $ECHO_C" >&6; } ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -7052,29 +6870,28 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } cat >>confdefs.h <<_ACEOF #define DEAL_II_TEMPL_SPEC_FRIEND_BUG 1 @@ -7086,8 +6903,8 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - { $as_echo "$as_me:$LINENO: checking for bug with implementing pure functions" >&5 -$as_echo_n "checking for bug with implementing pure functions... " >&6; } + { echo "$as_me:$LINENO: checking for bug with implementing pure functions" >&5 +echo $ECHO_N "checking for bug with implementing pure functions... $ECHO_C" >&6; } ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -7130,29 +6947,28 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: yes. using workaround" >&5 -$as_echo "yes. using workaround" >&6; } + { echo "$as_me:$LINENO: result: yes. using workaround" >&5 +echo "${ECHO_T}yes. using workaround" >&6; } cat >>confdefs.h <<\_ACEOF #define DEAL_II_IMPLEMENTED_PURE_FUNCTION_BUG 1 @@ -7164,8 +6980,8 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - { $as_echo "$as_me:$LINENO: checking for template template typedef bug" >&5 -$as_echo_n "checking for template template typedef bug... " >&6; } + { echo "$as_me:$LINENO: checking for template template typedef bug" >&5 +echo $ECHO_N "checking for template template typedef bug... $ECHO_C" >&6; } ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -7206,29 +7022,28 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: yes. using workaround" >&5 -$as_echo "yes. using workaround" >&6; } + { echo "$as_me:$LINENO: result: yes. using workaround" >&5 +echo "${ECHO_T}yes. using workaround" >&6; } cat >>confdefs.h <<\_ACEOF #define DEAL_II_TEMPLATE_TEMPLATE_TYPEDEF_BUG 1 @@ -7240,8 +7055,8 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - { $as_echo "$as_me:$LINENO: checking for address of template template function bug" >&5 -$as_echo_n "checking for address of template template function bug... " >&6; } + { echo "$as_me:$LINENO: checking for address of template template function bug" >&5 +echo $ECHO_N "checking for address of template template function bug... $ECHO_C" >&6; } ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -7284,29 +7099,28 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: yes. using workaround" >&5 -$as_echo "yes. using workaround" >&6; } + { echo "$as_me:$LINENO: result: yes. using workaround" >&5 +echo "${ECHO_T}yes. using workaround" >&6; } cat >>confdefs.h <<\_ACEOF #define DEAL_II_FUNPTR_TEMPLATE_TEMPLATE_BUG 1 @@ -7318,8 +7132,8 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - { $as_echo "$as_me:$LINENO: checking for nested classes are implicit friends bug" >&5 -$as_echo_n "checking for nested classes are implicit friends bug... " >&6; } + { echo "$as_me:$LINENO: checking for nested classes are implicit friends bug" >&5 +echo $ECHO_N "checking for nested classes are implicit friends bug... $ECHO_C" >&6; } ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -7358,29 +7172,28 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: yes. using workaround" >&5 -$as_echo "yes. using workaround" >&6; } + { echo "$as_me:$LINENO: result: yes. using workaround" >&5 +echo "${ECHO_T}yes. using workaround" >&6; } cat >>confdefs.h <<\_ACEOF #define DEAL_II_NESTED_CLASS_FRIEND_BUG 1 @@ -7392,8 +7205,8 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - { $as_echo "$as_me:$LINENO: checking for nested template class friends bug" >&5 -$as_echo_n "checking for nested template class friends bug... " >&6; } + { echo "$as_me:$LINENO: checking for nested template class friends bug" >&5 +echo $ECHO_N "checking for nested template class friends bug... $ECHO_C" >&6; } ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -7432,29 +7245,28 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: yes. using workaround" >&5 -$as_echo "yes. using workaround" >&6; } + { echo "$as_me:$LINENO: result: yes. using workaround" >&5 +echo "${ECHO_T}yes. using workaround" >&6; } cat >>confdefs.h <<\_ACEOF #define DEAL_II_NESTED_CLASS_TEMPL_FRIEND_BUG 1 @@ -7466,8 +7278,8 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - { $as_echo "$as_me:$LINENO: checking for member variable specialization bug" >&5 -$as_echo_n "checking for member variable specialization bug... " >&6; } + { echo "$as_me:$LINENO: checking for member variable specialization bug" >&5 +echo $ECHO_N "checking for member variable specialization bug... $ECHO_C" >&6; } ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -7503,29 +7315,28 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: yes. using workaround" >&5 -$as_echo "yes. using workaround" >&6; } + { echo "$as_me:$LINENO: result: yes. using workaround" >&5 +echo "${ECHO_T}yes. using workaround" >&6; } cat >>confdefs.h <<\_ACEOF #define DEAL_II_MEMBER_VAR_SPECIALIZATION_BUG 1 @@ -7537,8 +7348,8 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - { $as_echo "$as_me:$LINENO: checking for member array specialization bug" >&5 -$as_echo_n "checking for member array specialization bug... " >&6; } + { echo "$as_me:$LINENO: checking for member array specialization bug" >&5 +echo $ECHO_N "checking for member array specialization bug... $ECHO_C" >&6; } ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -7576,29 +7387,28 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: yes. using workaround" >&5 -$as_echo "yes. using workaround" >&6; } + { echo "$as_me:$LINENO: result: yes. using workaround" >&5 +echo "${ECHO_T}yes. using workaround" >&6; } cat >>confdefs.h <<\_ACEOF #define DEAL_II_MEMBER_ARRAY_SPECIALIZATION_BUG 1 @@ -7610,8 +7420,8 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - { $as_echo "$as_me:$LINENO: checking for template member function specialization bug" >&5 -$as_echo_n "checking for template member function specialization bug... " >&6; } + { echo "$as_me:$LINENO: checking for template member function specialization bug" >&5 +echo $ECHO_N "checking for template member function specialization bug... $ECHO_C" >&6; } ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -7652,29 +7462,28 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: yes. using workaround" >&5 -$as_echo "yes. using workaround" >&6; } + { echo "$as_me:$LINENO: result: yes. using workaround" >&5 +echo "${ECHO_T}yes. using workaround" >&6; } cat >>confdefs.h <<\_ACEOF #define DEAL_II_MEMBER_TEMPLATE_SPECIALIZATION_BUG 1 @@ -7686,8 +7495,8 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - { $as_echo "$as_me:$LINENO: checking for long double optimization bug" >&5 -$as_echo_n "checking for long double optimization bug... " >&6; } + { echo "$as_me:$LINENO: checking for long double optimization bug" >&5 +echo $ECHO_N "checking for long double optimization bug... $ECHO_C" >&6; } ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -7735,29 +7544,28 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: yes. disabling respective functions" >&5 -$as_echo "yes. disabling respective functions" >&6; } + { echo "$as_me:$LINENO: result: yes. disabling respective functions" >&5 +echo "${ECHO_T}yes. disabling respective functions" >&6; } cat >>confdefs.h <<\_ACEOF #define DEAL_II_LONG_DOUBLE_LOOP_BUG 1 @@ -7769,8 +7577,8 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - { $as_echo "$as_me:$LINENO: checking for anonymous namespace and name mangling bug" >&5 -$as_echo_n "checking for anonymous namespace and name mangling bug... " >&6; } + { echo "$as_me:$LINENO: checking for anonymous namespace and name mangling bug" >&5 +echo $ECHO_N "checking for anonymous namespace and name mangling bug... $ECHO_C" >&6; } echo "namespace { int SYMBOL() {return 1;}; }" > conftest.cc echo "static int f() { return SYMBOL(); }" >> conftest.cc @@ -7784,11 +7592,11 @@ $as_echo_n "checking for anonymous namespace and name mangling bug... " >&6; } if (($CXX conftest.1.$ac_objext conftest.2.$ac_objext \ conftest.3.$ac_objext -o conftest 2>&1 ) > /dev/null );\ then - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } else - { $as_echo "$as_me:$LINENO: result: yes. using workaround" >&5 -$as_echo "yes. using workaround" >&6; } + { echo "$as_me:$LINENO: result: yes. using workaround" >&5 +echo "${ECHO_T}yes. using workaround" >&6; } cat >>confdefs.h <<\_ACEOF #define DEAL_II_ANON_NAMESPACE_BUG 1 @@ -7798,8 +7606,8 @@ _ACEOF rm -f conftest.1.$ac_objext conftest.2.$ac_objext conftest - { $as_echo "$as_me:$LINENO: checking for anonymous namespace and weak linkage bug" >&5 -$as_echo_n "checking for anonymous namespace and weak linkage bug... " >&6; } + { echo "$as_me:$LINENO: checking for anonymous namespace and weak linkage bug" >&5 +echo $ECHO_N "checking for anonymous namespace and weak linkage bug... $ECHO_C" >&6; } echo "namespace { int SYMBOL() {return 1;}; }" > conftest.cc echo "static int f() { return SYMBOL(); }" >> conftest.cc @@ -7810,11 +7618,11 @@ $as_echo_n "checking for anonymous namespace and weak linkage bug... " >&6; } if test "x$check" = "x" ; then - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } else - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } cat >>confdefs.h <<\_ACEOF #define DEAL_II_ANON_NAMESPACE_LINKAGE_BUG 1 @@ -7824,8 +7632,8 @@ _ACEOF rm -f conftest.$ac_objext - { $as_echo "$as_me:$LINENO: checking for bogus warning with anonymous namespaces" >&5 -$as_echo_n "checking for bogus warning with anonymous namespaces... " >&6; } + { echo "$as_me:$LINENO: checking for bogus warning with anonymous namespaces" >&5 +echo $ECHO_N "checking for bogus warning with anonymous namespaces... $ECHO_C" >&6; } ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' @@ -7901,29 +7709,28 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } cat >>confdefs.h <<_ACEOF #define DEAL_II_ANON_NAMESPACE_BOGUS_WARNING 1 @@ -7939,8 +7746,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext case "$target" in *-apple-darwin* ) - { $as_echo "$as_me:$LINENO: checking for weak linkage bug (Apple gcc3.3) " >&5 -$as_echo_n "checking for weak linkage bug (Apple gcc3.3) ... " >&6; } + { echo "$as_me:$LINENO: checking for weak linkage bug (Apple gcc3.3) " >&5 +echo $ECHO_N "checking for weak linkage bug (Apple gcc3.3) ... $ECHO_C" >&6; } echo "template void SYMBOL() {}" > conftest.cc echo "int g() { SYMBOL<1> (); }" >> conftest.cc @@ -7962,11 +7769,11 @@ $as_echo_n "checking for weak linkage bug (Apple gcc3.3) ... " >&6; } if test "x$check" = "x" ; then - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } else - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } DARWIN_GCC_WEAK_LINKAGE_BUG="yes" cat >>confdefs.h <<\_ACEOF @@ -7980,8 +7787,8 @@ _ACEOF esac - { $as_echo "$as_me:$LINENO: checking for SFINAE bug" >&5 -$as_echo_n "checking for SFINAE bug... " >&6; } + { echo "$as_me:$LINENO: checking for SFINAE bug" >&5 +echo $ECHO_N "checking for SFINAE bug... $ECHO_C" >&6; } ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -8033,29 +7840,28 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: yes. disabling template constraints" >&5 -$as_echo "yes. disabling template constraints" >&6; } + { echo "$as_me:$LINENO: result: yes. disabling template constraints" >&5 +echo "${ECHO_T}yes. disabling template constraints" >&6; } cat >>confdefs.h <<\_ACEOF #define DEAL_II_SFINAE_BUG 1 @@ -8067,8 +7873,8 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - { $as_echo "$as_me:$LINENO: checking for template operator disambiguation bug" >&5 -$as_echo_n "checking for template operator disambiguation bug... " >&6; } + { echo "$as_me:$LINENO: checking for template operator disambiguation bug" >&5 +echo $ECHO_N "checking for template operator disambiguation bug... $ECHO_C" >&6; } ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -8108,29 +7914,28 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: yes. using workaround" >&5 -$as_echo "yes. using workaround" >&6; } + { echo "$as_me:$LINENO: result: yes. using workaround" >&5 +echo "${ECHO_T}yes. using workaround" >&6; } cat >>confdefs.h <<\_ACEOF #define DEAL_II_TEMPL_OP_DISAMBIGUATION_BUG 1 @@ -8142,8 +7947,8 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - { $as_echo "$as_me:$LINENO: checking for array assignment in conditional bug" >&5 -$as_echo_n "checking for array assignment in conditional bug... " >&6; } + { echo "$as_me:$LINENO: checking for array assignment in conditional bug" >&5 +echo $ECHO_N "checking for array assignment in conditional bug... $ECHO_C" >&6; } ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -8177,29 +7982,28 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } cat >>confdefs.h <<\_ACEOF #define DEAL_II_ARRAY_CONDITIONAL_DECAY_BUG 1 @@ -8211,8 +8015,8 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - { $as_echo "$as_me:$LINENO: checking for explicit template constructor bug" >&5 -$as_echo_n "checking for explicit template constructor bug... " >&6; } + { echo "$as_me:$LINENO: checking for explicit template constructor bug" >&5 +echo $ECHO_N "checking for explicit template constructor bug... $ECHO_C" >&6; } ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -8250,21 +8054,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - { $as_echo "$as_me:$LINENO: result: yes. disabling some functions" >&5 -$as_echo "yes. disabling some functions" >&6; } + { echo "$as_me:$LINENO: result: yes. disabling some functions" >&5 +echo "${ECHO_T}yes. disabling some functions" >&6; } cat >>confdefs.h <<\_ACEOF #define DEAL_II_EXPLICIT_CONSTRUCTOR_BUG 1 @@ -8272,12 +8075,12 @@ _ACEOF else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi @@ -8286,8 +8089,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext case "$GXX_VERSION" in gcc*) - { $as_echo "$as_me:$LINENO: checking for warning bug with type qualifiers" >&5 -$as_echo_n "checking for warning bug with type qualifiers... " >&6; } + { echo "$as_me:$LINENO: checking for warning bug with type qualifiers" >&5 +echo $ECHO_N "checking for warning bug with type qualifiers... $ECHO_C" >&6; } ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -8333,29 +8136,28 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } CXXFLAGSG="$CXXFLAGSG -Wno-ignored-qualifiers" fi @@ -8366,8 +8168,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext if test "x$GXX" = "xyes" ; then - { $as_echo "$as_me:$LINENO: checking for problem with -Wsynth and std::complex" >&5 -$as_echo_n "checking for problem with -Wsynth and std::complex... " >&6; } + { echo "$as_me:$LINENO: checking for problem with -Wsynth and std::complex" >&5 +echo $ECHO_N "checking for problem with -Wsynth and std::complex... $ECHO_C" >&6; } ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -8401,29 +8203,28 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } CXXFLAGSG="`echo $CXXFLAGSG | perl -pi -e 's/-Wsynth\s*//g;'`" fi @@ -8432,8 +8233,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi - { $as_echo "$as_me:$LINENO: checking for __PRETTY_FUNCTION__" >&5 -$as_echo_n "checking for __PRETTY_FUNCTION__... " >&6; } + { echo "$as_me:$LINENO: checking for __PRETTY_FUNCTION__" >&5 +echo $ECHO_N "checking for __PRETTY_FUNCTION__... $ECHO_C" >&6; } ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -8466,31 +8267,30 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } - { $as_echo "$as_me:$LINENO: checking for __func__" >&5 -$as_echo_n "checking for __func__... " >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } + { echo "$as_me:$LINENO: checking for __func__" >&5 +echo $ECHO_N "checking for __func__... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -8516,30 +8316,29 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } x=__func__ else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } x="\"(not available)\"" fi @@ -8556,8 +8355,8 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - { $as_echo "$as_me:$LINENO: checking for std::iterator class" >&5 -$as_echo_n "checking for std::iterator class... " >&6; } + { echo "$as_me:$LINENO: checking for std::iterator class" >&5 +echo $ECHO_N "checking for std::iterator class... $ECHO_C" >&6; } ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -8590,21 +8389,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } cat >>confdefs.h <<\_ACEOF #define HAVE_STD_ITERATOR_CLASS 1 @@ -8612,20 +8410,20 @@ _ACEOF else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - { $as_echo "$as_me:$LINENO: checking for std::i/ostringstream classes" >&5 -$as_echo_n "checking for std::i/ostringstream classes... " >&6; } + { echo "$as_me:$LINENO: checking for std::i/ostringstream classes" >&5 +echo $ECHO_N "checking for std::i/ostringstream classes... $ECHO_C" >&6; } ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -8659,21 +8457,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } cat >>confdefs.h <<\_ACEOF #define HAVE_STD_STRINGSTREAM 1 @@ -8681,20 +8478,20 @@ _ACEOF else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - { $as_echo "$as_me:$LINENO: checking for std::numeric_limits classes" >&5 -$as_echo_n "checking for std::numeric_limits classes... " >&6; } + { echo "$as_me:$LINENO: checking for std::numeric_limits classes" >&5 +echo $ECHO_N "checking for std::numeric_limits classes... $ECHO_C" >&6; } ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -8727,21 +8524,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } cat >>confdefs.h <<\_ACEOF #define HAVE_STD_NUMERIC_LIMITS 1 @@ -8749,20 +8545,20 @@ _ACEOF else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - { $as_echo "$as_me:$LINENO: checking for header" >&5 -$as_echo_n "checking for header... " >&6; } + { echo "$as_me:$LINENO: checking for header" >&5 +echo $ECHO_N "checking for header... $ECHO_C" >&6; } ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -8795,21 +8591,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } cat >>confdefs.h <<\_ACEOF #define HAVE_STD_OSTREAM_HEADER 1 @@ -8817,20 +8612,20 @@ _ACEOF else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - { $as_echo "$as_me:$LINENO: checking for header" >&5 -$as_echo_n "checking for header... " >&6; } + { echo "$as_me:$LINENO: checking for header" >&5 +echo $ECHO_N "checking for header... $ECHO_C" >&6; } ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -8863,21 +8658,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } cat >>confdefs.h <<\_ACEOF #define HAVE_STD_IOSFWD_HEADER 1 @@ -8885,12 +8679,12 @@ _ACEOF else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi @@ -8898,8 +8692,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext if test ! "x$GXX_VERSION" = "xportland_group" ; then - { $as_echo "$as_me:$LINENO: checking for __builtin_expect" >&5 -$as_echo_n "checking for __builtin_expect... " >&6; } + { echo "$as_me:$LINENO: checking for __builtin_expect" >&5 +echo $ECHO_N "checking for __builtin_expect... $ECHO_C" >&6; } ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -8932,24 +8726,21 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } cat >>confdefs.h <<\_ACEOF #define HAVE_BUILTIN_EXPECT 1 @@ -8957,23 +8748,22 @@ _ACEOF else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi -rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi - { $as_echo "$as_me:$LINENO: checking for __verbose_terminate_handler" >&5 -$as_echo_n "checking for __verbose_terminate_handler... " >&6; } + { echo "$as_me:$LINENO: checking for __verbose_terminate_handler" >&5 +echo $ECHO_N "checking for __verbose_terminate_handler... $ECHO_C" >&6; } ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -9019,24 +8809,21 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } cat >>confdefs.h <<\_ACEOF #define HAVE_VERBOSE_TERMINATE 1 @@ -9044,22 +8831,21 @@ _ACEOF else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi -rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext - { $as_echo "$as_me:$LINENO: checking for glibc-like stacktrace information" >&5 -$as_echo_n "checking for glibc-like stacktrace information... " >&6; } + { echo "$as_me:$LINENO: checking for glibc-like stacktrace information" >&5 +echo $ECHO_N "checking for glibc-like stacktrace information... $ECHO_C" >&6; } ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -9096,21 +8882,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } cat >>confdefs.h <<\_ACEOF #define HAVE_GLIBC_STACKTRACE 1 @@ -9122,8 +8907,8 @@ _ACEOF ;; *) - { $as_echo "$as_me:$LINENO: checking whether compiler accepts -rdynamic" >&5 -$as_echo_n "checking whether compiler accepts -rdynamic... " >&6; } + { echo "$as_me:$LINENO: checking whether compiler accepts -rdynamic" >&5 +echo $ECHO_N "checking whether compiler accepts -rdynamic... $ECHO_C" >&6; } CXXFLAGS="$CXXFLAGSG -rdynamic" cat >conftest.$ac_ext <<_ACEOF @@ -9147,57 +8932,53 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } LDFLAGS="$LDFLAGS -rdynamic" else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi -rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext ;; esac else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - { $as_echo "$as_me:$LINENO: checking for libstdc++ demangler" >&5 -$as_echo_n "checking for libstdc++ demangler... " >&6; } + { echo "$as_me:$LINENO: checking for libstdc++ demangler" >&5 +echo $ECHO_N "checking for libstdc++ demangler... $ECHO_C" >&6; } ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -9257,24 +9038,21 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } cat >>confdefs.h <<\_ACEOF #define HAVE_LIBSTDCXX_DEMANGLER 1 @@ -9282,16 +9060,15 @@ _ACEOF else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi -rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext @@ -9304,16 +9081,14 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu CXXFLAGS="$CXXFLAGSG -Werror" - { $as_echo "$as_me:$LINENO: checking for minimal std::vector capacity" >&5 -$as_echo_n "checking for minimal std::vector capacity... " >&6; } + { echo "$as_me:$LINENO: checking for minimal std::vector capacity" >&5 +echo $ECHO_N "checking for minimal std::vector capacity... $ECHO_C" >&6; } if test "$cross_compiling" = yes; then - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling + { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling See \`config.log' for more details." >&5 -$as_echo "$as_me: error: cannot run test program while cross compiling +echo "$as_me: error: cannot run test program while cross compiling See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } + { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -9337,37 +9112,35 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_link") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' { (case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_try") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - { { $as_echo "$as_me:$LINENO: error: impossible result -- aborting" >&5 -$as_echo "$as_me: error: impossible result -- aborting" >&2;} + { { echo "$as_me:$LINENO: error: impossible result -- aborting" >&5 +echo "$as_me: error: impossible result -- aborting" >&2;} { (exit 1); exit 1; }; } else - $as_echo "$as_me: program exited with status $ac_status" >&5 -$as_echo "$as_me: failed program was:" >&5 + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) result="$?" - { $as_echo "$as_me:$LINENO: result: $result" >&5 -$as_echo "$result" >&6; } + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } cat >>confdefs.h <<_ACEOF #define DEAL_II_MIN_VECTOR_CAPACITY $result @@ -9376,22 +9149,19 @@ _ACEOF fi -rm -rf conftest.dSYM rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi - { $as_echo "$as_me:$LINENO: checking for minimal std::vector capacity" >&5 -$as_echo_n "checking for minimal std::vector capacity... " >&6; } + { echo "$as_me:$LINENO: checking for minimal std::vector capacity" >&5 +echo $ECHO_N "checking for minimal std::vector capacity... $ECHO_C" >&6; } if test "$cross_compiling" = yes; then - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling + { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling See \`config.log' for more details." >&5 -$as_echo "$as_me: error: cannot run test program while cross compiling +echo "$as_me: error: cannot run test program while cross compiling See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } + { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -9415,37 +9185,35 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_link") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' { (case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_try") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - { { $as_echo "$as_me:$LINENO: error: impossible result -- aborting" >&5 -$as_echo "$as_me: error: impossible result -- aborting" >&2;} + { { echo "$as_me:$LINENO: error: impossible result -- aborting" >&5 +echo "$as_me: error: impossible result -- aborting" >&2;} { (exit 1); exit 1; }; } else - $as_echo "$as_me: program exited with status $ac_status" >&5 -$as_echo "$as_me: failed program was:" >&5 + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) result="$?" - { $as_echo "$as_me:$LINENO: result: $result" >&5 -$as_echo "$result" >&6; } + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } cat >>confdefs.h <<_ACEOF #define DEAL_II_MIN_BOOL_VECTOR_CAPACITY $result @@ -9454,15 +9222,14 @@ _ACEOF fi -rm -rf conftest.dSYM rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi - { $as_echo "$as_me:$LINENO: checking for exception specifications on abort()" >&5 -$as_echo_n "checking for exception specifications on abort()... " >&6; } + { echo "$as_me:$LINENO: checking for exception specifications on abort()" >&5 +echo $ECHO_N "checking for exception specifications on abort()... $ECHO_C" >&6; } ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -9495,29 +9262,28 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - { $as_echo "$as_me:$LINENO: result: none" >&5 -$as_echo "none" >&6; } + { echo "$as_me:$LINENO: result: none" >&5 +echo "${ECHO_T}none" >&6; } else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } cat >>confdefs.h <<\_ACEOF #define DEAL_II_ABORT_NOTHROW_EXCEPTION 1 @@ -9530,8 +9296,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - { $as_echo "$as_me:$LINENO: checking whether getrusage is properly declared" >&5 -$as_echo_n "checking whether getrusage is properly declared... " >&6; } + { echo "$as_me:$LINENO: checking whether getrusage is properly declared" >&5 +echo $ECHO_N "checking whether getrusage is properly declared... $ECHO_C" >&6; } ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -9565,29 +9331,28 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } cat >>confdefs.h <<\_ACEOF #define NO_HAVE_GETRUSAGE 1 @@ -9601,8 +9366,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - { $as_echo "$as_me:$LINENO: checking whether isnan is declared with debug flags" >&5 -$as_echo_n "checking whether isnan is declared with debug flags... " >&6; } + { echo "$as_me:$LINENO: checking whether isnan is declared with debug flags" >&5 +echo $ECHO_N "checking whether isnan is declared with debug flags... $ECHO_C" >&6; } ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -9637,26 +9402,25 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } deal_II_isnan_flag="-DHAVE_ISNAN" CXXFLAGSG="$deal_II_isnan_flag $CXXFLAGSG" else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -9692,26 +9456,25 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } deal_II_isnan_flag="-DHAVE_UNDERSCORE_ISNAN" CXXFLAGSG="$deal_II_isnan_flag $CXXFLAGSG" else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -9751,14 +9514,13 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err @@ -9768,7 +9530,7 @@ $as_echo "$ac_try_echo") >&5 break; else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -9802,14 +9564,13 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err @@ -9819,7 +9580,7 @@ $as_echo "$ac_try_echo") >&5 break; else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -9829,18 +9590,18 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext done if test "x$deal_II_isnan_flag" = "x" ; then - { $as_echo "$as_me:$LINENO: result: no." >&5 -$as_echo "no." >&6; } + { echo "$as_me:$LINENO: result: no." >&5 +echo "${ECHO_T}no." >&6; } else - { $as_echo "$as_me:$LINENO: result: using $testflag" >&5 -$as_echo "using $testflag" >&6; } + { echo "$as_me:$LINENO: result: using $testflag" >&5 +echo "${ECHO_T}using $testflag" >&6; } CXXFLAGSG="$deal_II_isnan_flag $CXXFLAGSG" fi fi - { $as_echo "$as_me:$LINENO: checking whether isnan is declared with optimized flags" >&5 -$as_echo_n "checking whether isnan is declared with optimized flags... " >&6; } + { echo "$as_me:$LINENO: checking whether isnan is declared with optimized flags" >&5 +echo $ECHO_N "checking whether isnan is declared with optimized flags... $ECHO_C" >&6; } ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -9875,26 +9636,25 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } deal_II_isnan_flag="-DHAVE_ISNAN" CXXFLAGSO="$deal_II_isnan_flag $CXXFLAGSO" else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -9930,26 +9690,25 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } deal_II_isnan_flag="-DHAVE_UNDERSCORE_ISNAN" CXXFLAGSO="$deal_II_isnan_flag $CXXFLAGSO" else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -9989,14 +9748,13 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err @@ -10006,7 +9764,7 @@ $as_echo "$ac_try_echo") >&5 break; else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -10040,14 +9798,13 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err @@ -10057,7 +9814,7 @@ $as_echo "$ac_try_echo") >&5 break; else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -10067,11 +9824,11 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext done if test "x$deal_II_isnan_flag" = "x" ; then - { $as_echo "$as_me:$LINENO: result: no." >&5 -$as_echo "no." >&6; } + { echo "$as_me:$LINENO: result: no." >&5 +echo "${ECHO_T}no." >&6; } else - { $as_echo "$as_me:$LINENO: result: using $testflag" >&5 -$as_echo "using $testflag" >&6; } + { echo "$as_me:$LINENO: result: using $testflag" >&5 +echo "${ECHO_T}using $testflag" >&6; } CXXFLAGSO="$deal_II_isnan_flag $CXXFLAGSO" fi fi @@ -10079,8 +9836,8 @@ $as_echo "using $testflag" >&6; } - { $as_echo "$as_me:$LINENO: checking for std::isfinite" >&5 -$as_echo_n "checking for std::isfinite... " >&6; } + { echo "$as_me:$LINENO: checking for std::isfinite" >&5 +echo $ECHO_N "checking for std::isfinite... $ECHO_C" >&6; } ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -10114,21 +9871,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } cat >>confdefs.h <<\_ACEOF #define DEAL_II_HAVE_ISFINITE 1 @@ -10136,20 +9892,20 @@ _ACEOF else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - { $as_echo "$as_me:$LINENO: checking for rand_r" >&5 -$as_echo_n "checking for rand_r... " >&6; } + { echo "$as_me:$LINENO: checking for rand_r" >&5 +echo $ECHO_N "checking for rand_r... $ECHO_C" >&6; } ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -10183,21 +9939,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } cat >>confdefs.h <<\_ACEOF #define HAVE_RAND_R 1 @@ -10205,12 +9960,12 @@ _ACEOF else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi @@ -10218,8 +9973,8 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - { $as_echo "$as_me:$LINENO: checking for quad vs. quad_t define" >&5 -$as_echo_n "checking for quad vs. quad_t define... " >&6; } + { echo "$as_me:$LINENO: checking for quad vs. quad_t define" >&5 +echo $ECHO_N "checking for quad vs. quad_t define... $ECHO_C" >&6; } ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -10254,29 +10009,28 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: yes. working around" >&5 -$as_echo "yes. working around" >&6; } + { echo "$as_me:$LINENO: result: yes. working around" >&5 +echo "${ECHO_T}yes. working around" >&6; } CXXFLAGSG="$CXXFLAGSG -D_POSIX_SOURCE" CXXFLAGSO="$CXXFLAGSO -D_POSIX_SOURCE" @@ -10285,8 +10039,8 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - { $as_echo "$as_me:$LINENO: checking for definitions of error codes in errno.h" >&5 -$as_echo_n "checking for definitions of error codes in errno.h... " >&6; } + { echo "$as_me:$LINENO: checking for definitions of error codes in errno.h" >&5 +echo $ECHO_N "checking for definitions of error codes in errno.h... $ECHO_C" >&6; } ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -10321,29 +10075,28 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: no. working around" >&5 -$as_echo "no. working around" >&6; } + { echo "$as_me:$LINENO: result: no. working around" >&5 +echo "${ECHO_T}no. working around" >&6; } cat >>confdefs.h <<\_ACEOF #define DEAL_II_USE_DIRECT_ERRNO_H 1 @@ -10360,11 +10113,11 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext for ac_func in $ac_func_list do -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 -$as_echo_n "checking for $ac_func... " >&6; } +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -10417,42 +10170,35 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then eval "$as_ac_var=yes" else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 eval "$as_ac_var=no" fi -rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi -ac_res=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF fi @@ -10475,11 +10221,11 @@ ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -{ $as_echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5 -$as_echo_n "checking how to run the C++ preprocessor... " >&6; } +{ echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5 +echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6; } if test -z "$CXXCPP"; then if test "${ac_cv_prog_CXXCPP+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else # Double quotes because CXXCPP needs to be expanded for CXXCPP in "$CXX -E" "/lib/cpp" @@ -10511,21 +10257,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null && { test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || test ! -s conftest.err }; then : else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 # Broken: fails on valid input. @@ -10549,14 +10294,13 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null && { test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || test ! -s conftest.err @@ -10564,7 +10308,7 @@ $as_echo "$ac_try_echo") >&5 # Broken: success on invalid input. continue else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 # Passes both tests. @@ -10589,8 +10333,8 @@ fi else ac_cv_prog_CXXCPP=$CXXCPP fi -{ $as_echo "$as_me:$LINENO: result: $CXXCPP" >&5 -$as_echo "$CXXCPP" >&6; } +{ echo "$as_me:$LINENO: result: $CXXCPP" >&5 +echo "${ECHO_T}$CXXCPP" >&6; } ac_preproc_ok=false for ac_cxx_preproc_warn_flag in '' yes do @@ -10618,21 +10362,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null && { test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || test ! -s conftest.err }; then : else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 # Broken: fails on valid input. @@ -10656,14 +10399,13 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null && { test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || test ! -s conftest.err @@ -10671,7 +10413,7 @@ $as_echo "$ac_try_echo") >&5 # Broken: success on invalid input. continue else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 # Passes both tests. @@ -10687,13 +10429,11 @@ rm -f conftest.err conftest.$ac_ext if $ac_preproc_ok; then : else - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check + { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check See \`config.log' for more details." >&5 -$as_echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check +echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } + { (exit 1); exit 1; }; } fi ac_ext=cpp @@ -10703,37 +10443,42 @@ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ex ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5 -$as_echo_n "checking for grep that handles long lines and -e... " >&6; } +{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5 +echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; } +if test "${ac_cv_path_GREP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + # Extract the first word of "grep ggrep" to use in msg output +if test -z "$GREP"; then +set dummy grep ggrep; ac_prog_name=$2 if test "${ac_cv_path_GREP+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else - if test -z "$GREP"; then ac_path_GREP_found=false - # Loop through the user's path and test for each of PROGNAME-LIST - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +# Loop through the user's path and test for each of PROGNAME-LIST +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_prog in grep ggrep; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue -# Check for GNU ac_path_GREP and select it if it is found. + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" + { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue + # Check for GNU ac_path_GREP and select it if it is found. # Check for GNU $ac_path_GREP case `"$ac_path_GREP" --version 2>&1` in *GNU*) ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; *) ac_count=0 - $as_echo_n 0123456789 >"conftest.in" + echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" while : do cat "conftest.in" "conftest.in" >"conftest.tmp" mv "conftest.tmp" "conftest.in" cp "conftest.in" "conftest.nl" - $as_echo 'GREP' >> "conftest.nl" + echo 'GREP' >> "conftest.nl" "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break ac_count=`expr $ac_count + 1` @@ -10748,60 +10493,74 @@ case `"$ac_path_GREP" --version 2>&1` in rm -f conftest.in conftest.tmp conftest.nl conftest.out;; esac - $ac_path_GREP_found && break 3 - done + + $ac_path_GREP_found && break 3 done done + +done IFS=$as_save_IFS - if test -z "$ac_cv_path_GREP"; then - { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 -$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} + + +fi + +GREP="$ac_cv_path_GREP" +if test -z "$GREP"; then + { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 +echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} { (exit 1); exit 1; }; } - fi +fi + else ac_cv_path_GREP=$GREP fi + fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5 -$as_echo "$ac_cv_path_GREP" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5 +echo "${ECHO_T}$ac_cv_path_GREP" >&6; } GREP="$ac_cv_path_GREP" -{ $as_echo "$as_me:$LINENO: checking for egrep" >&5 -$as_echo_n "checking for egrep... " >&6; } +{ echo "$as_me:$LINENO: checking for egrep" >&5 +echo $ECHO_N "checking for egrep... $ECHO_C" >&6; } if test "${ac_cv_path_EGREP+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 then ac_cv_path_EGREP="$GREP -E" else - if test -z "$EGREP"; then + # Extract the first word of "egrep" to use in msg output +if test -z "$EGREP"; then +set dummy egrep; ac_prog_name=$2 +if test "${ac_cv_path_EGREP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else ac_path_EGREP_found=false - # Loop through the user's path and test for each of PROGNAME-LIST - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +# Loop through the user's path and test for each of PROGNAME-LIST +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_prog in egrep; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue -# Check for GNU ac_path_EGREP and select it if it is found. + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" + { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue + # Check for GNU ac_path_EGREP and select it if it is found. # Check for GNU $ac_path_EGREP case `"$ac_path_EGREP" --version 2>&1` in *GNU*) ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; *) ac_count=0 - $as_echo_n 0123456789 >"conftest.in" + echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" while : do cat "conftest.in" "conftest.in" >"conftest.tmp" mv "conftest.tmp" "conftest.in" cp "conftest.in" "conftest.nl" - $as_echo 'EGREP' >> "conftest.nl" + echo 'EGREP' >> "conftest.nl" "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break ac_count=`expr $ac_count + 1` @@ -10816,31 +10575,40 @@ case `"$ac_path_EGREP" --version 2>&1` in rm -f conftest.in conftest.tmp conftest.nl conftest.out;; esac - $ac_path_EGREP_found && break 3 - done + + $ac_path_EGREP_found && break 3 done done + +done IFS=$as_save_IFS - if test -z "$ac_cv_path_EGREP"; then - { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 -$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} + + +fi + +EGREP="$ac_cv_path_EGREP" +if test -z "$EGREP"; then + { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 +echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} { (exit 1); exit 1; }; } - fi +fi + else ac_cv_path_EGREP=$EGREP fi + fi fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5 -$as_echo "$ac_cv_path_EGREP" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5 +echo "${ECHO_T}$ac_cv_path_EGREP" >&6; } EGREP="$ac_cv_path_EGREP" -{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5 -$as_echo_n "checking for ANSI C header files... " >&6; } +{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5 +echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; } if test "${ac_cv_header_stdc+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -10867,21 +10635,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then ac_cv_header_stdc=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_header_stdc=no @@ -10973,40 +10740,37 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_link") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' { (case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_try") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else - $as_echo "$as_me: program exited with status $ac_status" >&5 -$as_echo "$as_me: failed program was:" >&5 + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) ac_cv_header_stdc=no fi -rm -rf conftest.dSYM rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 -$as_echo "$ac_cv_header_stdc" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 +echo "${ECHO_T}$ac_cv_header_stdc" >&6; } if test $ac_cv_header_stdc = yes; then cat >>confdefs.h <<\_ACEOF @@ -11028,11 +10792,11 @@ fi for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ inttypes.h stdint.h unistd.h do -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -11050,21 +10814,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then eval "$as_ac_Header=yes" else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 eval "$as_ac_Header=no" @@ -11072,15 +10835,12 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF fi @@ -11094,21 +10854,20 @@ done for ac_header in $ac_header_list do -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } else # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 -$as_echo_n "checking $ac_header usability... " >&6; } +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -11124,33 +10883,32 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then ac_header_compiler=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_header_compiler=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 -$as_echo_n "checking $ac_header presence... " >&6; } +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -11164,52 +10922,51 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null && { test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || test ! -s conftest.err }; then ac_header_preproc=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in yes:no: ) - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} ac_header_preproc=yes ;; no:yes:* ) - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX ## -------------------------------- ## ## Report this to dealii@dealii.org ## @@ -11218,24 +10975,21 @@ _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else eval "$as_ac_Header=\$ac_header_preproc" fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } fi -as_val=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then +if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF fi @@ -11251,8 +11005,8 @@ done - { $as_echo "$as_me:$LINENO: checking for bad socket functions/FPU interaction" >&5 -$as_echo_n "checking for bad socket functions/FPU interaction... " >&6; } + { echo "$as_me:$LINENO: checking for bad socket functions/FPU interaction" >&5 +echo $ECHO_N "checking for bad socket functions/FPU interaction... $ECHO_C" >&6; } ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -11261,13 +11015,11 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu CXXFLAGS="$CXXFLAGSG" if test "$cross_compiling" = yes; then - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling + { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling See \`config.log' for more details." >&5 -$as_echo "$as_me: error: cannot run test program while cross compiling +echo "$as_me: error: cannot run test program while cross compiling See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } + { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -11301,35 +11053,33 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_link") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' { (case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_try") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } else - $as_echo "$as_me: program exited with status $ac_status" >&5 -$as_echo "$as_me: failed program was:" >&5 + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) - { $as_echo "$as_me:$LINENO: result: yes. disabling socket functions" >&5 -$as_echo "yes. disabling socket functions" >&6; } + { echo "$as_me:$LINENO: result: yes. disabling socket functions" >&5 +echo "${ECHO_T}yes. disabling socket functions" >&6; } cat >>confdefs.h <<\_ACEOF #define DEAL_II_BROKEN_SOCKETS 1 @@ -11337,7 +11087,6 @@ _ACEOF fi -rm -rf conftest.dSYM rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi @@ -11367,17 +11116,17 @@ fi LDFLAGS="$BOOST_LIB_DIR $LDFLAGS" if test "${ac_cv_header_boost_shared_ptr_hpp+set}" = set; then - { $as_echo "$as_me:$LINENO: checking for boost/shared_ptr.hpp" >&5 -$as_echo_n "checking for boost/shared_ptr.hpp... " >&6; } + { echo "$as_me:$LINENO: checking for boost/shared_ptr.hpp" >&5 +echo $ECHO_N "checking for boost/shared_ptr.hpp... $ECHO_C" >&6; } if test "${ac_cv_header_boost_shared_ptr_hpp+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_boost_shared_ptr_hpp" >&5 -$as_echo "$ac_cv_header_boost_shared_ptr_hpp" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_header_boost_shared_ptr_hpp" >&5 +echo "${ECHO_T}$ac_cv_header_boost_shared_ptr_hpp" >&6; } else # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking boost/shared_ptr.hpp usability" >&5 -$as_echo_n "checking boost/shared_ptr.hpp usability... " >&6; } +{ echo "$as_me:$LINENO: checking boost/shared_ptr.hpp usability" >&5 +echo $ECHO_N "checking boost/shared_ptr.hpp usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -11393,33 +11142,32 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then ac_header_compiler=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_header_compiler=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -{ $as_echo "$as_me:$LINENO: checking boost/shared_ptr.hpp presence" >&5 -$as_echo_n "checking boost/shared_ptr.hpp presence... " >&6; } +{ echo "$as_me:$LINENO: checking boost/shared_ptr.hpp presence" >&5 +echo $ECHO_N "checking boost/shared_ptr.hpp presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -11433,52 +11181,51 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null && { test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || test ! -s conftest.err }; then ac_header_preproc=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in yes:no: ) - { $as_echo "$as_me:$LINENO: WARNING: boost/shared_ptr.hpp: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: boost/shared_ptr.hpp: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: boost/shared_ptr.hpp: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: boost/shared_ptr.hpp: proceeding with the compiler's result" >&2;} + { echo "$as_me:$LINENO: WARNING: boost/shared_ptr.hpp: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: boost/shared_ptr.hpp: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: boost/shared_ptr.hpp: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: boost/shared_ptr.hpp: proceeding with the compiler's result" >&2;} ac_header_preproc=yes ;; no:yes:* ) - { $as_echo "$as_me:$LINENO: WARNING: boost/shared_ptr.hpp: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: boost/shared_ptr.hpp: present but cannot be compiled" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: boost/shared_ptr.hpp: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: boost/shared_ptr.hpp: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: boost/shared_ptr.hpp: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: boost/shared_ptr.hpp: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: boost/shared_ptr.hpp: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: boost/shared_ptr.hpp: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: boost/shared_ptr.hpp: proceeding with the preprocessor's result" >&5 -$as_echo "$as_me: WARNING: boost/shared_ptr.hpp: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: boost/shared_ptr.hpp: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: boost/shared_ptr.hpp: in the future, the compiler will take precedence" >&2;} + { echo "$as_me:$LINENO: WARNING: boost/shared_ptr.hpp: present but cannot be compiled" >&5 +echo "$as_me: WARNING: boost/shared_ptr.hpp: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: boost/shared_ptr.hpp: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: boost/shared_ptr.hpp: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: boost/shared_ptr.hpp: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: boost/shared_ptr.hpp: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: boost/shared_ptr.hpp: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: boost/shared_ptr.hpp: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: boost/shared_ptr.hpp: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: boost/shared_ptr.hpp: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: boost/shared_ptr.hpp: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: boost/shared_ptr.hpp: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX ## -------------------------------- ## ## Report this to dealii@dealii.org ## @@ -11487,38 +11234,38 @@ _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac -{ $as_echo "$as_me:$LINENO: checking for boost/shared_ptr.hpp" >&5 -$as_echo_n "checking for boost/shared_ptr.hpp... " >&6; } +{ echo "$as_me:$LINENO: checking for boost/shared_ptr.hpp" >&5 +echo $ECHO_N "checking for boost/shared_ptr.hpp... $ECHO_C" >&6; } if test "${ac_cv_header_boost_shared_ptr_hpp+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_cv_header_boost_shared_ptr_hpp=$ac_header_preproc fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_boost_shared_ptr_hpp" >&5 -$as_echo "$ac_cv_header_boost_shared_ptr_hpp" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_header_boost_shared_ptr_hpp" >&5 +echo "${ECHO_T}$ac_cv_header_boost_shared_ptr_hpp" >&6; } fi -if test "x$ac_cv_header_boost_shared_ptr_hpp" = x""yes; then +if test $ac_cv_header_boost_shared_ptr_hpp = yes; then : else - { { $as_echo "$as_me:$LINENO: error: Your boost installation is incomplete!" >&5 -$as_echo "$as_me: error: Your boost installation is incomplete!" >&2;} + { { echo "$as_me:$LINENO: error: Your boost installation is incomplete!" >&5 +echo "$as_me: error: Your boost installation is incomplete!" >&2;} { (exit 1); exit 1; }; } fi if test "${ac_cv_header_boost_type_traits_hpp+set}" = set; then - { $as_echo "$as_me:$LINENO: checking for boost/type_traits.hpp" >&5 -$as_echo_n "checking for boost/type_traits.hpp... " >&6; } + { echo "$as_me:$LINENO: checking for boost/type_traits.hpp" >&5 +echo $ECHO_N "checking for boost/type_traits.hpp... $ECHO_C" >&6; } if test "${ac_cv_header_boost_type_traits_hpp+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_boost_type_traits_hpp" >&5 -$as_echo "$ac_cv_header_boost_type_traits_hpp" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_header_boost_type_traits_hpp" >&5 +echo "${ECHO_T}$ac_cv_header_boost_type_traits_hpp" >&6; } else # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking boost/type_traits.hpp usability" >&5 -$as_echo_n "checking boost/type_traits.hpp usability... " >&6; } +{ echo "$as_me:$LINENO: checking boost/type_traits.hpp usability" >&5 +echo $ECHO_N "checking boost/type_traits.hpp usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -11534,33 +11281,32 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then ac_header_compiler=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_header_compiler=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -{ $as_echo "$as_me:$LINENO: checking boost/type_traits.hpp presence" >&5 -$as_echo_n "checking boost/type_traits.hpp presence... " >&6; } +{ echo "$as_me:$LINENO: checking boost/type_traits.hpp presence" >&5 +echo $ECHO_N "checking boost/type_traits.hpp presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -11574,52 +11320,51 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null && { test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || test ! -s conftest.err }; then ac_header_preproc=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in yes:no: ) - { $as_echo "$as_me:$LINENO: WARNING: boost/type_traits.hpp: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: boost/type_traits.hpp: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: boost/type_traits.hpp: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: boost/type_traits.hpp: proceeding with the compiler's result" >&2;} + { echo "$as_me:$LINENO: WARNING: boost/type_traits.hpp: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: boost/type_traits.hpp: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: boost/type_traits.hpp: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: boost/type_traits.hpp: proceeding with the compiler's result" >&2;} ac_header_preproc=yes ;; no:yes:* ) - { $as_echo "$as_me:$LINENO: WARNING: boost/type_traits.hpp: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: boost/type_traits.hpp: present but cannot be compiled" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: boost/type_traits.hpp: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: boost/type_traits.hpp: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: boost/type_traits.hpp: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: boost/type_traits.hpp: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: boost/type_traits.hpp: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: boost/type_traits.hpp: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: boost/type_traits.hpp: proceeding with the preprocessor's result" >&5 -$as_echo "$as_me: WARNING: boost/type_traits.hpp: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: boost/type_traits.hpp: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: boost/type_traits.hpp: in the future, the compiler will take precedence" >&2;} + { echo "$as_me:$LINENO: WARNING: boost/type_traits.hpp: present but cannot be compiled" >&5 +echo "$as_me: WARNING: boost/type_traits.hpp: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: boost/type_traits.hpp: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: boost/type_traits.hpp: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: boost/type_traits.hpp: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: boost/type_traits.hpp: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: boost/type_traits.hpp: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: boost/type_traits.hpp: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: boost/type_traits.hpp: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: boost/type_traits.hpp: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: boost/type_traits.hpp: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: boost/type_traits.hpp: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX ## -------------------------------- ## ## Report this to dealii@dealii.org ## @@ -11628,38 +11373,38 @@ _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac -{ $as_echo "$as_me:$LINENO: checking for boost/type_traits.hpp" >&5 -$as_echo_n "checking for boost/type_traits.hpp... " >&6; } +{ echo "$as_me:$LINENO: checking for boost/type_traits.hpp" >&5 +echo $ECHO_N "checking for boost/type_traits.hpp... $ECHO_C" >&6; } if test "${ac_cv_header_boost_type_traits_hpp+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_cv_header_boost_type_traits_hpp=$ac_header_preproc fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_boost_type_traits_hpp" >&5 -$as_echo "$ac_cv_header_boost_type_traits_hpp" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_header_boost_type_traits_hpp" >&5 +echo "${ECHO_T}$ac_cv_header_boost_type_traits_hpp" >&6; } fi -if test "x$ac_cv_header_boost_type_traits_hpp" = x""yes; then +if test $ac_cv_header_boost_type_traits_hpp = yes; then : else - { { $as_echo "$as_me:$LINENO: error: Your boost installation is incomplete!" >&5 -$as_echo "$as_me: error: Your boost installation is incomplete!" >&2;} + { { echo "$as_me:$LINENO: error: Your boost installation is incomplete!" >&5 +echo "$as_me: error: Your boost installation is incomplete!" >&2;} { (exit 1); exit 1; }; } fi if test "${ac_cv_header_boost_tuple_tuple_hpp+set}" = set; then - { $as_echo "$as_me:$LINENO: checking for boost/tuple/tuple.hpp" >&5 -$as_echo_n "checking for boost/tuple/tuple.hpp... " >&6; } + { echo "$as_me:$LINENO: checking for boost/tuple/tuple.hpp" >&5 +echo $ECHO_N "checking for boost/tuple/tuple.hpp... $ECHO_C" >&6; } if test "${ac_cv_header_boost_tuple_tuple_hpp+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_boost_tuple_tuple_hpp" >&5 -$as_echo "$ac_cv_header_boost_tuple_tuple_hpp" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_header_boost_tuple_tuple_hpp" >&5 +echo "${ECHO_T}$ac_cv_header_boost_tuple_tuple_hpp" >&6; } else # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking boost/tuple/tuple.hpp usability" >&5 -$as_echo_n "checking boost/tuple/tuple.hpp usability... " >&6; } +{ echo "$as_me:$LINENO: checking boost/tuple/tuple.hpp usability" >&5 +echo $ECHO_N "checking boost/tuple/tuple.hpp usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -11675,33 +11420,32 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then ac_header_compiler=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_header_compiler=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -{ $as_echo "$as_me:$LINENO: checking boost/tuple/tuple.hpp presence" >&5 -$as_echo_n "checking boost/tuple/tuple.hpp presence... " >&6; } +{ echo "$as_me:$LINENO: checking boost/tuple/tuple.hpp presence" >&5 +echo $ECHO_N "checking boost/tuple/tuple.hpp presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -11715,52 +11459,51 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null && { test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || test ! -s conftest.err }; then ac_header_preproc=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in yes:no: ) - { $as_echo "$as_me:$LINENO: WARNING: boost/tuple/tuple.hpp: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: boost/tuple/tuple.hpp: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: boost/tuple/tuple.hpp: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: boost/tuple/tuple.hpp: proceeding with the compiler's result" >&2;} + { echo "$as_me:$LINENO: WARNING: boost/tuple/tuple.hpp: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: boost/tuple/tuple.hpp: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: boost/tuple/tuple.hpp: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: boost/tuple/tuple.hpp: proceeding with the compiler's result" >&2;} ac_header_preproc=yes ;; no:yes:* ) - { $as_echo "$as_me:$LINENO: WARNING: boost/tuple/tuple.hpp: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: boost/tuple/tuple.hpp: present but cannot be compiled" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: boost/tuple/tuple.hpp: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: boost/tuple/tuple.hpp: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: boost/tuple/tuple.hpp: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: boost/tuple/tuple.hpp: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: boost/tuple/tuple.hpp: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: boost/tuple/tuple.hpp: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: boost/tuple/tuple.hpp: proceeding with the preprocessor's result" >&5 -$as_echo "$as_me: WARNING: boost/tuple/tuple.hpp: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: boost/tuple/tuple.hpp: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: boost/tuple/tuple.hpp: in the future, the compiler will take precedence" >&2;} + { echo "$as_me:$LINENO: WARNING: boost/tuple/tuple.hpp: present but cannot be compiled" >&5 +echo "$as_me: WARNING: boost/tuple/tuple.hpp: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: boost/tuple/tuple.hpp: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: boost/tuple/tuple.hpp: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: boost/tuple/tuple.hpp: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: boost/tuple/tuple.hpp: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: boost/tuple/tuple.hpp: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: boost/tuple/tuple.hpp: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: boost/tuple/tuple.hpp: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: boost/tuple/tuple.hpp: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: boost/tuple/tuple.hpp: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: boost/tuple/tuple.hpp: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX ## -------------------------------- ## ## Report this to dealii@dealii.org ## @@ -11769,30 +11512,30 @@ _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac -{ $as_echo "$as_me:$LINENO: checking for boost/tuple/tuple.hpp" >&5 -$as_echo_n "checking for boost/tuple/tuple.hpp... " >&6; } +{ echo "$as_me:$LINENO: checking for boost/tuple/tuple.hpp" >&5 +echo $ECHO_N "checking for boost/tuple/tuple.hpp... $ECHO_C" >&6; } if test "${ac_cv_header_boost_tuple_tuple_hpp+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_cv_header_boost_tuple_tuple_hpp=$ac_header_preproc fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_boost_tuple_tuple_hpp" >&5 -$as_echo "$ac_cv_header_boost_tuple_tuple_hpp" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_header_boost_tuple_tuple_hpp" >&5 +echo "${ECHO_T}$ac_cv_header_boost_tuple_tuple_hpp" >&6; } fi -if test "x$ac_cv_header_boost_tuple_tuple_hpp" = x""yes; then +if test $ac_cv_header_boost_tuple_tuple_hpp = yes; then : else - { { $as_echo "$as_me:$LINENO: error: Your boost installation is incomplete!" >&5 -$as_echo "$as_me: error: Your boost installation is incomplete!" >&2;} + { { echo "$as_me:$LINENO: error: Your boost installation is incomplete!" >&5 +echo "$as_me: error: Your boost installation is incomplete!" >&2;} { (exit 1); exit 1; }; } fi if test "x$GXX" = "xyes" ; then - { $as_echo "$as_me:$LINENO: checking for boost::shared_ptr assignment operator= template buglet" >&5 -$as_echo_n "checking for boost::shared_ptr assignment operator= template buglet... " >&6; } + { echo "$as_me:$LINENO: checking for boost::shared_ptr assignment operator= template buglet" >&5 +echo $ECHO_N "checking for boost::shared_ptr assignment operator= template buglet... $ECHO_C" >&6; } ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -11826,29 +11569,28 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } CXXFLAGSG="`echo $CXXFLAGSG | perl -pi -e 's/-Wsynth\s*//g;'`" fi @@ -11862,19 +11604,19 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: " >&5 -$as_echo "" >&6; } -{ $as_echo "$as_me:$LINENO: result: ----------------- configuring F77 compilers -----------------" >&5 -$as_echo "----------------- configuring F77 compilers -----------------" >&6; } +{ echo "$as_me:$LINENO: result: " >&5 +echo "${ECHO_T}" >&6; } +{ echo "$as_me:$LINENO: result: ----------------- configuring F77 compilers -----------------" >&5 +echo "${ECHO_T}----------------- configuring F77 compilers -----------------" >&6; } for ac_prog in gfortran f77 g77 do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_F77+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $F77 in [\\/]* | ?:[\\/]*) @@ -11889,7 +11631,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_F77="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -11901,11 +11643,11 @@ esac fi F77=$ac_cv_path_F77 if test -n "$F77"; then - { $as_echo "$as_me:$LINENO: result: $F77" >&5 -$as_echo "$F77" >&6; } + { echo "$as_me:$LINENO: result: $F77" >&5 +echo "${ECHO_T}$F77" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi @@ -11923,83 +11665,83 @@ if test "x$F77" != "x" ; then G77_VERSION_STRING="`($F77 -v 2>&1) | grep \"gcc version\"`" case "$G77_VERSION_STRING" in *"egcs-1.1"*) - { $as_echo "$as_me:$LINENO: result: F77 compiler is egcs-1.1" >&5 -$as_echo "F77 compiler is egcs-1.1" >&6; } + { echo "$as_me:$LINENO: result: F77 compiler is egcs-1.1" >&5 +echo "${ECHO_T}F77 compiler is egcs-1.1" >&6; } F77_VERSION=egcs1.1 ;; *version\ 2.95*) - { $as_echo "$as_me:$LINENO: result: F77 compiler is gcc-2.95" >&5 -$as_echo "F77 compiler is gcc-2.95" >&6; } + { echo "$as_me:$LINENO: result: F77 compiler is gcc-2.95" >&5 +echo "${ECHO_T}F77 compiler is gcc-2.95" >&6; } F77_VERSION=gcc2.95 ;; *version\ 2.96*) - { $as_echo "$as_me:$LINENO: result: F77 compiler is gcc-2.96" >&5 -$as_echo "F77 compiler is gcc-2.96" >&6; } + { echo "$as_me:$LINENO: result: F77 compiler is gcc-2.96" >&5 +echo "${ECHO_T}F77 compiler is gcc-2.96" >&6; } F77_VERSION=gcc2.96 ;; *version\ 2.97*) - { $as_echo "$as_me:$LINENO: result: F77 compiler is gcc-2.97" >&5 -$as_echo "F77 compiler is gcc-2.97" >&6; } + { echo "$as_me:$LINENO: result: F77 compiler is gcc-2.97" >&5 +echo "${ECHO_T}F77 compiler is gcc-2.97" >&6; } F77_VERSION=gcc2.97 ;; *version\ 3.0*) - { $as_echo "$as_me:$LINENO: result: F77 compiler is gcc-3.0" >&5 -$as_echo "F77 compiler is gcc-3.0" >&6; } + { echo "$as_me:$LINENO: result: F77 compiler is gcc-3.0" >&5 +echo "${ECHO_T}F77 compiler is gcc-3.0" >&6; } F77_VERSION=gcc3.0 ;; *version\ 3.1*) - { $as_echo "$as_me:$LINENO: result: F77 compiler is gcc-3.1" >&5 -$as_echo "F77 compiler is gcc-3.1" >&6; } + { echo "$as_me:$LINENO: result: F77 compiler is gcc-3.1" >&5 +echo "${ECHO_T}F77 compiler is gcc-3.1" >&6; } F77_VERSION=gcc3.1 ;; *version\ 3.2*) - { $as_echo "$as_me:$LINENO: result: F77 compiler is gcc-3.2" >&5 -$as_echo "F77 compiler is gcc-3.2" >&6; } + { echo "$as_me:$LINENO: result: F77 compiler is gcc-3.2" >&5 +echo "${ECHO_T}F77 compiler is gcc-3.2" >&6; } F77_VERSION=gcc3.2 ;; *version\ 3.3*) - { $as_echo "$as_me:$LINENO: result: F77 compiler is gcc-3.3" >&5 -$as_echo "F77 compiler is gcc-3.3" >&6; } + { echo "$as_me:$LINENO: result: F77 compiler is gcc-3.3" >&5 +echo "${ECHO_T}F77 compiler is gcc-3.3" >&6; } F77_VERSION=gcc3.3 ;; *version\ 3.4*) - { $as_echo "$as_me:$LINENO: result: F77 compiler is gcc-3.4" >&5 -$as_echo "F77 compiler is gcc-3.4" >&6; } + { echo "$as_me:$LINENO: result: F77 compiler is gcc-3.4" >&5 +echo "${ECHO_T}F77 compiler is gcc-3.4" >&6; } F77_VERSION=gcc3.4 ;; *version\ 3.5*) - { $as_echo "$as_me:$LINENO: result: F77 compiler is gcc-3.5" >&5 -$as_echo "F77 compiler is gcc-3.5" >&6; } + { echo "$as_me:$LINENO: result: F77 compiler is gcc-3.5" >&5 +echo "${ECHO_T}F77 compiler is gcc-3.5" >&6; } F77_VERSION=gcc3.5 ;; *version\ 4.0*) - { $as_echo "$as_me:$LINENO: result: F77 compiler is gcc-4.0" >&5 -$as_echo "F77 compiler is gcc-4.0" >&6; } + { echo "$as_me:$LINENO: result: F77 compiler is gcc-4.0" >&5 +echo "${ECHO_T}F77 compiler is gcc-4.0" >&6; } F77_VERSION=gcc4.0 ;; *version\ 4.1*) - { $as_echo "$as_me:$LINENO: result: F77 compiler is gcc-4.1" >&5 -$as_echo "F77 compiler is gcc-4.1" >&6; } + { echo "$as_me:$LINENO: result: F77 compiler is gcc-4.1" >&5 +echo "${ECHO_T}F77 compiler is gcc-4.1" >&6; } F77_VERSION=gcc4.1 ;; *version\ 4.2*) - { $as_echo "$as_me:$LINENO: result: F77 compiler is gcc-4.2" >&5 -$as_echo "F77 compiler is gcc-4.2" >&6; } + { echo "$as_me:$LINENO: result: F77 compiler is gcc-4.2" >&5 +echo "${ECHO_T}F77 compiler is gcc-4.2" >&6; } F77_VERSION=gcc4.2 ;; *version\ 4.3*) - { $as_echo "$as_me:$LINENO: result: F77 compiler is gcc-4.3" >&5 -$as_echo "F77 compiler is gcc-4.3" >&6; } + { echo "$as_me:$LINENO: result: F77 compiler is gcc-4.3" >&5 +echo "${ECHO_T}F77 compiler is gcc-4.3" >&6; } F77_VERSION=gcc4.3 ;; *version\ 4.4*) - { $as_echo "$as_me:$LINENO: result: F77 compiler is gcc-4.4" >&5 -$as_echo "F77 compiler is gcc-4.4" >&6; } + { echo "$as_me:$LINENO: result: F77 compiler is gcc-4.4" >&5 +echo "${ECHO_T}F77 compiler is gcc-4.4" >&6; } F77_VERSION=gcc4.4 ;; *) - { $as_echo "$as_me:$LINENO: result: F77 compiler is unknown but accepted gcc version" >&5 -$as_echo "F77 compiler is unknown but accepted gcc version" >&6; } + { echo "$as_me:$LINENO: result: F77 compiler is unknown but accepted gcc version" >&5 +echo "${ECHO_T}F77 compiler is unknown but accepted gcc version" >&6; } F77_VERSION=gcc-other ;; esac @@ -12009,8 +11751,8 @@ $as_echo "F77 compiler is unknown but accepted gcc version" >&6; } if test -n "`echo $F77_VERSION_STRING | grep \"XL Fortran for AIX\"`" ; then F77_VERSION=AIXF77 - { $as_echo "$as_me:$LINENO: result: F77 compiler is AIX Fortran77" >&5 -$as_echo "F77 compiler is AIX Fortran77" >&6; } + { echo "$as_me:$LINENO: result: F77 compiler is AIX Fortran77" >&5 +echo "${ECHO_T}F77 compiler is AIX Fortran77" >&6; } else @@ -12020,16 +11762,16 @@ $as_echo "F77 compiler is AIX Fortran77" >&6; } -n "`echo $F77_VERSION_STRING | grep \"Sun WorkShop\"`" \ -o \ -n "`echo $F77_VERSION_STRING | grep \"Forte Developer\"`" ; then - { $as_echo "$as_me:$LINENO: result: F77 compiler is Sun WorkShop f77" >&5 -$as_echo "F77 compiler is Sun WorkShop f77" >&6; } + { echo "$as_me:$LINENO: result: F77 compiler is Sun WorkShop f77" >&5 +echo "${ECHO_T}F77 compiler is Sun WorkShop f77" >&6; } F77_VERSION="SunF77" else F77_VERSION_STRING=`($F77 -version 2>&1)` if test -n "`echo $F77_VERSION_STRING | grep MIPSpro`" ; then - { $as_echo "$as_me:$LINENO: result: F77 compiler is MIPSpro f77" >&5 -$as_echo "F77 compiler is MIPSpro f77" >&6; } + { echo "$as_me:$LINENO: result: F77 compiler is MIPSpro f77" >&5 +echo "${ECHO_T}F77 compiler is MIPSpro f77" >&6; } F77_VERSION="MIPSproF77" else @@ -12037,16 +11779,16 @@ $as_echo "F77 compiler is MIPSpro f77" >&6; } F77_VERSION_STRING=`($F77 -V 2>&1)` is_intel_ifc="`echo $F77_VERSION_STRING | grep 'Intel(R) Fortran'`" if test "x$is_intel_ifc" != "x" ; then - { $as_echo "$as_me:$LINENO: result: F77 compiler is Intel Fortran" >&5 -$as_echo "F77 compiler is Intel Fortran" >&6; } + { echo "$as_me:$LINENO: result: F77 compiler is Intel Fortran" >&5 +echo "${ECHO_T}F77 compiler is Intel Fortran" >&6; } F77_VERSION=INTEL_F77 else F77_VERSION="UnknownF77" - { $as_echo "$as_me:$LINENO: result: F77 compiler is unkown. no flags set!" >&5 -$as_echo "F77 compiler is unkown. no flags set!" >&6; } + { echo "$as_me:$LINENO: result: F77 compiler is unkown. no flags set!" >&5 +echo "${ECHO_T}F77 compiler is unkown. no flags set!" >&6; } fi fi fi @@ -12073,10 +11815,10 @@ $as_echo "F77 compiler is unkown. no flags set!" >&6; } ;; esac - { $as_echo "$as_me:$LINENO: checking for e_wsfe in -lg2c" >&5 -$as_echo_n "checking for e_wsfe in -lg2c... " >&6; } + { echo "$as_me:$LINENO: checking for e_wsfe in -lg2c" >&5 +echo $ECHO_N "checking for e_wsfe in -lg2c... $ECHO_C" >&6; } if test "${ac_cv_lib_g2c_e_wsfe+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lg2c $LIBS" @@ -12108,45 +11850,41 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_g2c_e_wsfe=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_lib_g2c_e_wsfe=no fi -rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_g2c_e_wsfe" >&5 -$as_echo "$ac_cv_lib_g2c_e_wsfe" >&6; } -if test "x$ac_cv_lib_g2c_e_wsfe" = x""yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_lib_g2c_e_wsfe" >&5 +echo "${ECHO_T}$ac_cv_lib_g2c_e_wsfe" >&6; } +if test $ac_cv_lib_g2c_e_wsfe = yes; then F77LIBS="$F77LIBS -lg2c" fi - { $as_echo "$as_me:$LINENO: checking for _gfortran_allocate in -lgfortran" >&5 -$as_echo_n "checking for _gfortran_allocate in -lgfortran... " >&6; } + { echo "$as_me:$LINENO: checking for _gfortran_allocate in -lgfortran" >&5 +echo $ECHO_N "checking for _gfortran_allocate in -lgfortran... $ECHO_C" >&6; } if test "${ac_cv_lib_gfortran__gfortran_allocate+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lgfortran $LIBS" @@ -12178,44 +11916,40 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_gfortran__gfortran_allocate=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_lib_gfortran__gfortran_allocate=no fi -rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_gfortran__gfortran_allocate" >&5 -$as_echo "$ac_cv_lib_gfortran__gfortran_allocate" >&6; } -if test "x$ac_cv_lib_gfortran__gfortran_allocate" = x""yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_lib_gfortran__gfortran_allocate" >&5 +echo "${ECHO_T}$ac_cv_lib_gfortran__gfortran_allocate" >&6; } +if test $ac_cv_lib_gfortran__gfortran_allocate = yes; then found=1 fi - { $as_echo "$as_me:$LINENO: checking for _gfortran_st_write_done in -lgfortran" >&5 -$as_echo_n "checking for _gfortran_st_write_done in -lgfortran... " >&6; } + { echo "$as_me:$LINENO: checking for _gfortran_st_write_done in -lgfortran" >&5 +echo $ECHO_N "checking for _gfortran_st_write_done in -lgfortran... $ECHO_C" >&6; } if test "${ac_cv_lib_gfortran__gfortran_st_write_done+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lgfortran $LIBS" @@ -12247,37 +11981,33 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_gfortran__gfortran_st_write_done=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_lib_gfortran__gfortran_st_write_done=no fi -rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_gfortran__gfortran_st_write_done" >&5 -$as_echo "$ac_cv_lib_gfortran__gfortran_st_write_done" >&6; } -if test "x$ac_cv_lib_gfortran__gfortran_st_write_done" = x""yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_lib_gfortran__gfortran_st_write_done" >&5 +echo "${ECHO_T}$ac_cv_lib_gfortran__gfortran_st_write_done" >&6; } +if test $ac_cv_lib_gfortran__gfortran_st_write_done = yes; then found=1 fi @@ -12322,14 +12052,14 @@ fi F77LIBS="$F77LIBS" F77FLAGSPIC="unknown!" - { $as_echo "$as_me:$LINENO: result: Unknown FORTRAN compiler has been disabled!" >&5 -$as_echo "Unknown FORTRAN compiler has been disabled!" >&6; } + { echo "$as_me:$LINENO: result: Unknown FORTRAN compiler has been disabled!" >&5 +echo "${ECHO_T}Unknown FORTRAN compiler has been disabled!" >&6; } ;; *) - { { $as_echo "$as_me:$LINENO: error: No compiler options for F77 compiler + { { echo "$as_me:$LINENO: error: No compiler options for F77 compiler \"$F77_VERSION\" specified: modification of aclocal.m4 necessary" >&5 -$as_echo "$as_me: error: No compiler options for F77 compiler +echo "$as_me: error: No compiler options for F77 compiler \"$F77_VERSION\" specified: modification of aclocal.m4 necessary" >&2;} { (exit 1); exit 1; }; } ;; @@ -12348,10 +12078,10 @@ fi -{ $as_echo "$as_me:$LINENO: result: " >&5 -$as_echo "" >&6; } -{ $as_echo "$as_me:$LINENO: result: -------------- configuring shared/static libs ---------------" >&5 -$as_echo "-------------- configuring shared/static libs ---------------" >&6; } +{ echo "$as_me:$LINENO: result: " >&5 +echo "${ECHO_T}" >&6; } +{ echo "$as_me:$LINENO: result: -------------- configuring shared/static libs ---------------" >&5 +echo "${ECHO_T}-------------- configuring shared/static libs ---------------" >&6; } # Check whether --enable-shared was given. if test "${enable_shared+set}" = set; then @@ -12363,8 +12093,8 @@ fi case "$target" in *-aix4* | alpha*-linux* | alpha*-osf45* | hppa64-unknown-linux-gnu ) - { $as_echo "$as_me:$LINENO: WARNING: Shared libraries not supported on $target. Using static libs instead" >&5 -$as_echo "$as_me: WARNING: Shared libraries not supported on $target. Using static libs instead" >&2;} + { echo "$as_me:$LINENO: WARNING: Shared libraries not supported on $target. Using static libs instead" >&5 +echo "$as_me: WARNING: Shared libraries not supported on $target. Using static libs instead" >&2;} enableshared=no ;; *cygwin ) @@ -12404,8 +12134,8 @@ if test "x$enableshared" = "xyes" ; then OLD_LDFLAGS="$LDFLAGS" LDFLAGS="-Wl,-soname,libbase.so.6.2.1 $LDFLAGS $SHLIBFLAGS" - { $as_echo "$as_me:$LINENO: checking whether compiler understands option -Wl,-soname" >&5 -$as_echo_n "checking whether compiler understands option -Wl,-soname... " >&6; } + { echo "$as_me:$LINENO: checking whether compiler understands option -Wl,-soname" >&5 +echo $ECHO_N "checking whether compiler understands option -Wl,-soname... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -12427,39 +12157,35 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } DEAL_II_LD_UNDERSTANDS_SONAME="yes" else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } DEAL_II_LD_UNDERSTANDS_SONAME="no" fi -rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LDFLAGS="$OLD_LDFLAGS" @@ -12467,8 +12193,8 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ OLD_LDFLAGS="$LDFLAGS" LDFLAGS="-Wl,-dynamic,-install_name -Wl,libbase.so.6.2.1 $LDFLAGS -shared" - { $as_echo "$as_me:$LINENO: checking whether compiler understands option -Wl,-dynamic,-install_name" >&5 -$as_echo_n "checking whether compiler understands option -Wl,-dynamic,-install_name... " >&6; } + { echo "$as_me:$LINENO: checking whether compiler understands option -Wl,-dynamic,-install_name" >&5 +echo $ECHO_N "checking whether compiler understands option -Wl,-dynamic,-install_name... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -12490,39 +12216,35 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } DEAL_II_LD_UNDERSTANDS_DYLIB_INSTALL_NAME="yes" else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } DEAL_II_LD_UNDERSTANDS_DYLIB_INSTALL_NAME="no" fi -rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LDFLAGS="$OLD_LDFLAGS" @@ -12536,10 +12258,10 @@ fi # Extract the first word of "ar", so it can be a program name with args. set dummy ar; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_AR+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$AR"; then ac_cv_prog_AR="$AR" # Let the user override the test. @@ -12552,7 +12274,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_AR="ar" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -12563,20 +12285,20 @@ fi fi AR=$ac_cv_prog_AR if test -n "$AR"; then - { $as_echo "$as_me:$LINENO: result: $AR" >&5 -$as_echo "$AR" >&6; } + { echo "$as_me:$LINENO: result: $AR" >&5 +echo "${ECHO_T}$AR" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi # Extract the first word of "$AR", so it can be a program name with args. set dummy $AR; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_AR+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $AR in [\\/]* | ?:[\\/]*) @@ -12591,7 +12313,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_AR="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -12603,21 +12325,21 @@ esac fi AR=$ac_cv_path_AR if test -n "$AR"; then - { $as_echo "$as_me:$LINENO: result: $AR" >&5 -$as_echo "$AR" >&6; } + { echo "$as_me:$LINENO: result: $AR" >&5 +echo "${ECHO_T}$AR" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_RANLIB+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$RANLIB"; then ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. @@ -12630,7 +12352,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -12641,11 +12363,11 @@ fi fi RANLIB=$ac_cv_prog_RANLIB if test -n "$RANLIB"; then - { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5 -$as_echo "$RANLIB" >&6; } + { echo "$as_me:$LINENO: result: $RANLIB" >&5 +echo "${ECHO_T}$RANLIB" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi @@ -12654,10 +12376,10 @@ if test -z "$ac_cv_prog_RANLIB"; then ac_ct_RANLIB=$RANLIB # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$ac_ct_RANLIB"; then ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. @@ -12670,7 +12392,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_RANLIB="ranlib" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -12681,11 +12403,11 @@ fi fi ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB if test -n "$ac_ct_RANLIB"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 -$as_echo "$ac_ct_RANLIB" >&6; } + { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 +echo "${ECHO_T}$ac_ct_RANLIB" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi if test "x$ac_ct_RANLIB" = x; then @@ -12693,8 +12415,12 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} ac_tool_warned=yes ;; esac RANLIB=$ac_ct_RANLIB @@ -12706,10 +12432,10 @@ fi if test "$RANLIB" != ":" ; then # Extract the first word of "$RANLIB", so it can be a program name with args. set dummy $RANLIB; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_RANLIB+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $RANLIB in [\\/]* | ?:[\\/]*) @@ -12724,7 +12450,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_RANLIB="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -12736,11 +12462,11 @@ esac fi RANLIB=$ac_cv_path_RANLIB if test -n "$RANLIB"; then - { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5 -$as_echo "$RANLIB" >&6; } + { echo "$as_me:$LINENO: result: $RANLIB" >&5 +echo "${ECHO_T}$RANLIB" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi @@ -12754,16 +12480,16 @@ fi if test "${enable_parser+set}" = set; then enableval=$enable_parser; enableparser="$enableval" if test "x$enableval" = "xno" ; then - { $as_echo "$as_me:$LINENO: result: Function parser disabled" >&5 -$as_echo "Function parser disabled" >&6; } + { echo "$as_me:$LINENO: result: Function parser disabled" >&5 +echo "${ECHO_T}Function parser disabled" >&6; } cat >>confdefs.h <<\_ACEOF #define DEAL_II_DISABLE_PARSER 1 _ACEOF else - { $as_echo "$as_me:$LINENO: result: Function parser enabled" >&5 -$as_echo "Function parser enabled" >&6; } + { echo "$as_me:$LINENO: result: Function parser enabled" >&5 +echo "${ECHO_T}Function parser enabled" >&6; } fi else enableparser=yes @@ -12788,12 +12514,12 @@ fi for i in $disable_compat ; do case $i in mapping) - { $as_echo "$as_me:$LINENO: result: Disabling backward compatibility feature: \"$i\"" >&5 -$as_echo "Disabling backward compatibility feature: \"$i\"" >&6; } + { echo "$as_me:$LINENO: result: Disabling backward compatibility feature: \"$i\"" >&5 +echo "${ECHO_T}Disabling backward compatibility feature: \"$i\"" >&6; } ;; *) - { { $as_echo "$as_me:$LINENO: error: Backward compatibility feature \"$i\" unknown" >&5 -$as_echo "$as_me: error: Backward compatibility feature \"$i\" unknown" >&2;} + { { echo "$as_me:$LINENO: error: Backward compatibility feature \"$i\" unknown" >&5 +echo "$as_me: error: Backward compatibility feature \"$i\" unknown" >&2;} { (exit 1); exit 1; }; } ;; esac @@ -12817,8 +12543,8 @@ _ACEOF ;; *) - { { $as_echo "$as_me:$LINENO: error: Backward compatibility feature \"$i\" unknown" >&5 -$as_echo "$as_me: error: Backward compatibility feature \"$i\" unknown" >&2;} + { { echo "$as_me:$LINENO: error: Backward compatibility feature \"$i\" unknown" >&5 +echo "$as_me: error: Backward compatibility feature \"$i\" unknown" >&2;} { (exit 1); exit 1; }; } ;; esac @@ -12829,35 +12555,35 @@ $as_echo "$as_me: error: Backward compatibility feature \"$i\" unknown" >&2;} -{ $as_echo "$as_me:$LINENO: result: " >&5 -$as_echo "" >&6; } -{ $as_echo "$as_me:$LINENO: result: ---------------- configuring additional libs ----------------" >&5 -$as_echo "---------------- configuring additional libs ----------------" >&6; } +{ echo "$as_me:$LINENO: result: " >&5 +echo "${ECHO_T}" >&6; } +{ echo "$as_me:$LINENO: result: ---------------- configuring additional libs ----------------" >&5 +echo "${ECHO_T}---------------- configuring additional libs ----------------" >&6; } - { $as_echo "$as_me:$LINENO: checking for PETSc library directory" >&5 -$as_echo_n "checking for PETSc library directory... " >&6; } + { echo "$as_me:$LINENO: checking for PETSc library directory" >&5 +echo $ECHO_N "checking for PETSc library directory... $ECHO_C" >&6; } # Check whether --with-petsc was given. if test "${with_petsc+set}" = set; then withval=$with_petsc; if test "x$withval" = "xno" ; then - { $as_echo "$as_me:$LINENO: result: explicitly disabled" >&5 -$as_echo "explicitly disabled" >&6; } + { echo "$as_me:$LINENO: result: explicitly disabled" >&5 +echo "${ECHO_T}explicitly disabled" >&6; } USE_CONTRIB_PETSC=no else USE_CONTRIB_PETSC=yes DEAL_II_PETSC_DIR="$withval" - { $as_echo "$as_me:$LINENO: result: $DEAL_II_PETSC_DIR" >&5 -$as_echo "$DEAL_II_PETSC_DIR" >&6; } + { echo "$as_me:$LINENO: result: $DEAL_II_PETSC_DIR" >&5 +echo "${ECHO_T}$DEAL_II_PETSC_DIR" >&6; } if test ! -d $DEAL_II_PETSC_DIR/include \ ; then - { { $as_echo "$as_me:$LINENO: error: Path to PETSc specified with --with-petsc does not + { { echo "$as_me:$LINENO: error: Path to PETSc specified with --with-petsc does not point to a complete PETSc installation" >&5 -$as_echo "$as_me: error: Path to PETSc specified with --with-petsc does not +echo "$as_me: error: Path to PETSc specified with --with-petsc does not point to a complete PETSc installation" >&2;} { (exit 1); exit 1; }; } fi @@ -12868,15 +12594,15 @@ else if test "x$PETSC_DIR" != "x" ; then USE_CONTRIB_PETSC=yes DEAL_II_PETSC_DIR="$PETSC_DIR" - { $as_echo "$as_me:$LINENO: result: $DEAL_II_PETSC_DIR" >&5 -$as_echo "$DEAL_II_PETSC_DIR" >&6; } + { echo "$as_me:$LINENO: result: $DEAL_II_PETSC_DIR" >&5 +echo "${ECHO_T}$DEAL_II_PETSC_DIR" >&6; } if test ! -d $DEAL_II_PETSC_DIR/include \ ; then - { { $as_echo "$as_me:$LINENO: error: The path to PETSc specified in the PETSC_DIR + { { echo "$as_me:$LINENO: error: The path to PETSc specified in the PETSC_DIR environment variable does not point to a complete PETSc installation" >&5 -$as_echo "$as_me: error: The path to PETSc specified in the PETSC_DIR +echo "$as_me: error: The path to PETSc specified in the PETSC_DIR environment variable does not point to a complete PETSc installation" >&2;} { (exit 1); exit 1; }; } @@ -12884,8 +12610,8 @@ $as_echo "$as_me: error: The path to PETSc specified in the PETSC_DIR else USE_CONTRIB_PETSC=no DEAL_II_PETSC_DIR="" - { $as_echo "$as_me:$LINENO: result: not found" >&5 -$as_echo "not found" >&6; } + { echo "$as_me:$LINENO: result: not found" >&5 +echo "${ECHO_T}not found" >&6; } fi fi @@ -12909,8 +12635,8 @@ _ACEOF if test "$USE_CONTRIB_PETSC" = "yes" ; then - { $as_echo "$as_me:$LINENO: checking for PETSc version" >&5 -$as_echo_n "checking for PETSc version... " >&6; } + { echo "$as_me:$LINENO: checking for PETSc version" >&5 +echo $ECHO_N "checking for PETSc version... $ECHO_C" >&6; } DEAL_II_PETSC_VERSION_MAJOR=`cat $DEAL_II_PETSC_DIR/include/petscversion.h \ | grep "#define PETSC_VERSION_MAJOR" \ @@ -12922,32 +12648,32 @@ $as_echo_n "checking for PETSc version... " >&6; } | grep "#define PETSC_VERSION_SUBMINOR" \ | perl -pi -e 's/.*MINOR\s+//g;'` PETSC_VERSION="$DEAL_II_PETSC_VERSION_MAJOR.$DEAL_II_PETSC_VERSION_MINOR.$DEAL_II_PETSC_VERSION_SUBMINOR" - { $as_echo "$as_me:$LINENO: result: $PETSC_VERSION" >&5 -$as_echo "$PETSC_VERSION" >&6; } + { echo "$as_me:$LINENO: result: $PETSC_VERSION" >&5 +echo "${ECHO_T}$PETSC_VERSION" >&6; } - { $as_echo "$as_me:$LINENO: checking for PETSc library architecture" >&5 -$as_echo_n "checking for PETSc library architecture... " >&6; } + { echo "$as_me:$LINENO: checking for PETSc library architecture" >&5 +echo $ECHO_N "checking for PETSc library architecture... $ECHO_C" >&6; } # Check whether --with-petsc-arch was given. if test "${with_petsc_arch+set}" = set; then withval=$with_petsc_arch; DEAL_II_PETSC_ARCH="$withval" - { $as_echo "$as_me:$LINENO: result: $DEAL_II_PETSC_ARCH" >&5 -$as_echo "$DEAL_II_PETSC_ARCH" >&6; } + { echo "$as_me:$LINENO: result: $DEAL_II_PETSC_ARCH" >&5 +echo "${ECHO_T}$DEAL_II_PETSC_ARCH" >&6; } else if test "x$PETSC_ARCH" != "x" ; then DEAL_II_PETSC_ARCH="$PETSC_ARCH" - { $as_echo "$as_me:$LINENO: result: $DEAL_II_PETSC_ARCH" >&5 -$as_echo "$DEAL_II_PETSC_ARCH" >&6; } + { echo "$as_me:$LINENO: result: $DEAL_II_PETSC_ARCH" >&5 +echo "${ECHO_T}$DEAL_II_PETSC_ARCH" >&6; } else - { { $as_echo "$as_me:$LINENO: error: If PETSc is used, you must specify the architecture + { { echo "$as_me:$LINENO: error: If PETSc is used, you must specify the architecture either through the PETSC_ARCH environment variable, or through the --with-petsc-arch flag" >&5 -$as_echo "$as_me: error: If PETSc is used, you must specify the architecture +echo "$as_me: error: If PETSc is used, you must specify the architecture either through the PETSC_ARCH environment variable, or through the --with-petsc-arch flag" >&2;} { (exit 1); exit 1; }; } @@ -12964,15 +12690,15 @@ fi ; then if test -d $DEAL_II_PETSC_DIR/lib/libg/$DEAL_II_PETSC_ARCH \ ; then - { { $as_echo "$as_me:$LINENO: error: PETSc has not been compiled for C++, but + { { echo "$as_me:$LINENO: error: PETSc has not been compiled for C++, but deal.II needs this" >&5 -$as_echo "$as_me: error: PETSc has not been compiled for C++, but +echo "$as_me: error: PETSc has not been compiled for C++, but deal.II needs this" >&2;} { (exit 1); exit 1; }; } else - { { $as_echo "$as_me:$LINENO: error: PETSc has not been compiled for the architecture + { { echo "$as_me:$LINENO: error: PETSc has not been compiled for the architecture specified with --with-petsc-arch" >&5 -$as_echo "$as_me: error: PETSc has not been compiled for the architecture +echo "$as_me: error: PETSc has not been compiled for the architecture specified with --with-petsc-arch" >&2;} { (exit 1); exit 1; }; } fi @@ -12982,9 +12708,9 @@ $as_echo "$as_me: error: PETSc has not been compiled for the architecture 2.3*) if test ! -d $DEAL_II_PETSC_DIR/lib/$DEAL_II_PETSC_ARCH \ ; then - { { $as_echo "$as_me:$LINENO: error: PETSc has not been compiled for the architecture + { { echo "$as_me:$LINENO: error: PETSc has not been compiled for the architecture specified with --with-petsc-arch" >&5 -$as_echo "$as_me: error: PETSc has not been compiled for the architecture +echo "$as_me: error: PETSc has not been compiled for the architecture specified with --with-petsc-arch" >&2;} { (exit 1); exit 1; }; } fi @@ -12993,25 +12719,25 @@ $as_echo "$as_me: error: PETSc has not been compiled for the architecture 3.*) if test ! -d $DEAL_II_PETSC_DIR/$DEAL_II_PETSC_ARCH/lib \ ; then - { { $as_echo "$as_me:$LINENO: error: PETSc has not been compiled for the architecture + { { echo "$as_me:$LINENO: error: PETSc has not been compiled for the architecture specified with --with-petsc-arch" >&5 -$as_echo "$as_me: error: PETSc has not been compiled for the architecture +echo "$as_me: error: PETSc has not been compiled for the architecture specified with --with-petsc-arch" >&2;} { (exit 1); exit 1; }; } fi ;; *) - { { $as_echo "$as_me:$LINENO: error: Unknown PETSc version" >&5 -$as_echo "$as_me: error: Unknown PETSc version" >&2;} + { { echo "$as_me:$LINENO: error: Unknown PETSc version" >&5 +echo "$as_me: error: Unknown PETSc version" >&2;} { (exit 1); exit 1; }; } ;; esac fi - { $as_echo "$as_me:$LINENO: checking for PETSc libmpiuni library" >&5 -$as_echo_n "checking for PETSc libmpiuni library... " >&6; } + { echo "$as_me:$LINENO: checking for PETSc libmpiuni library" >&5 +echo $ECHO_N "checking for PETSc libmpiuni library... $ECHO_C" >&6; } if test -f $DEAL_II_PETSC_DIR/lib/libg_c++/$DEAL_II_PETSC_ARCH/libmpiuni.a ; then DEAL_II_PETSC_MPIUNI_LIB="$DEAL_II_PETSC_DIR/lib/libg_c++/$DEAL_II_PETSC_ARCH/libmpiuni.a" ; @@ -13023,8 +12749,8 @@ $as_echo_n "checking for PETSc libmpiuni library... " >&6; } DEAL_II_PETSC_MPIUNI_LIB="$DEAL_II_PETSC_DIR/lib/$DEAL_II_PETSC_ARCH/libmpiuni.so" ; fi fi fi fi - { $as_echo "$as_me:$LINENO: result: $DEAL_II_PETSC_MPIUNI_LIB" >&5 -$as_echo "$DEAL_II_PETSC_MPIUNI_LIB" >&6; } + { echo "$as_me:$LINENO: result: $DEAL_II_PETSC_MPIUNI_LIB" >&5 +echo "${ECHO_T}$DEAL_II_PETSC_MPIUNI_LIB" >&6; } DEAL_II_EXPAND_PETSC_VECTOR="PETScWrappers::Vector" @@ -13048,29 +12774,29 @@ $as_echo "$DEAL_II_PETSC_MPIUNI_LIB" >&6; } - { $as_echo "$as_me:$LINENO: checking for SLEPc include directory" >&5 -$as_echo_n "checking for SLEPc include directory... " >&6; } + { echo "$as_me:$LINENO: checking for SLEPc include directory" >&5 +echo $ECHO_N "checking for SLEPc include directory... $ECHO_C" >&6; } # Check whether --with-slepc was given. if test "${with_slepc+set}" = set; then withval=$with_slepc; if test "x$withval" = "xno" ; then - { $as_echo "$as_me:$LINENO: result: explicitly disabled" >&5 -$as_echo "explicitly disabled" >&6; } + { echo "$as_me:$LINENO: result: explicitly disabled" >&5 +echo "${ECHO_T}explicitly disabled" >&6; } USE_CONTRIB_SLEPC=no else USE_CONTRIB_SLEPC=yes DEAL_II_SLEPC_DIR="$withval" - { $as_echo "$as_me:$LINENO: result: $DEAL_II_SLEPC_DIR" >&5 -$as_echo "$DEAL_II_SLEPC_DIR" >&6; } + { echo "$as_me:$LINENO: result: $DEAL_II_SLEPC_DIR" >&5 +echo "${ECHO_T}$DEAL_II_SLEPC_DIR" >&6; } if test ! -d $DEAL_II_SLEPC_DIR \ -o ! -d $DEAL_II_SLEPC_DIR/include \ ; then - { { $as_echo "$as_me:$LINENO: error: Path to SLEPc specified with --with-slepc does not + { { echo "$as_me:$LINENO: error: Path to SLEPc specified with --with-slepc does not point to a complete SLEPc installation" >&5 -$as_echo "$as_me: error: Path to SLEPc specified with --with-slepc does not +echo "$as_me: error: Path to SLEPc specified with --with-slepc does not point to a complete SLEPc installation" >&2;} { (exit 1); exit 1; }; } fi @@ -13081,16 +12807,16 @@ else if test "x$SLEPC_DIR" != "x" ; then USE_CONTRIB_SLEPC=yes DEAL_II_SLEPC_DIR="$SLEPC_DIR" - { $as_echo "$as_me:$LINENO: result: $DEAL_II_SLEPC_DIR" >&5 -$as_echo "$DEAL_II_SLEPC_DIR" >&6; } + { echo "$as_me:$LINENO: result: $DEAL_II_SLEPC_DIR" >&5 +echo "${ECHO_T}$DEAL_II_SLEPC_DIR" >&6; } if test ! -d $DEAL_II_SLEPC_DIR \ -o ! -d $DEAL_II_SLEPC_DIR/include \ ; then - { { $as_echo "$as_me:$LINENO: error: The path to SLEPc specified in the SLEPC_DIR + { { echo "$as_me:$LINENO: error: The path to SLEPc specified in the SLEPC_DIR environment variable does not point to a complete SLEPc installation" >&5 -$as_echo "$as_me: error: The path to SLEPc specified in the SLEPC_DIR +echo "$as_me: error: The path to SLEPc specified in the SLEPC_DIR environment variable does not point to a complete SLEPc installation" >&2;} { (exit 1); exit 1; }; } @@ -13098,8 +12824,8 @@ $as_echo "$as_me: error: The path to SLEPc specified in the SLEPC_DIR else USE_CONTRIB_SLEPC=no DEAL_II_SLEPC_DIR="" - { $as_echo "$as_me:$LINENO: result: not found" >&5 -$as_echo "not found" >&6; } + { echo "$as_me:$LINENO: result: not found" >&5 +echo "${ECHO_T}not found" >&6; } fi fi @@ -13117,28 +12843,28 @@ _ACEOF if test "$USE_CONTRIB_SLEPC" = "yes" \ ; then - { $as_echo "$as_me:$LINENO: checking for SLEPc library architecture" >&5 -$as_echo_n "checking for SLEPc library architecture... " >&6; } + { echo "$as_me:$LINENO: checking for SLEPc library architecture" >&5 +echo $ECHO_N "checking for SLEPc library architecture... $ECHO_C" >&6; } # Check whether --with-slepc-arch was given. if test "${with_slepc_arch+set}" = set; then withval=$with_slepc_arch; DEAL_II_SLEPC_ARCH="$withval" - { $as_echo "$as_me:$LINENO: result: $DEAL_II_SLEPC_ARCH" >&5 -$as_echo "$DEAL_II_SLEPC_ARCH" >&6; } + { echo "$as_me:$LINENO: result: $DEAL_II_SLEPC_ARCH" >&5 +echo "${ECHO_T}$DEAL_II_SLEPC_ARCH" >&6; } else if test "x$SLEPC_ARCH" != "x" ; then DEAL_II_SLEPC_ARCH="$SLEPC_ARCH" - { $as_echo "$as_me:$LINENO: result: $DEAL_II_SLEPC_ARCH" >&5 -$as_echo "$DEAL_II_SLEPC_ARCH" >&6; } + { echo "$as_me:$LINENO: result: $DEAL_II_SLEPC_ARCH" >&5 +echo "${ECHO_T}$DEAL_II_SLEPC_ARCH" >&6; } else - { { $as_echo "$as_me:$LINENO: error: If SLEPc is used, you must specify the architecture + { { echo "$as_me:$LINENO: error: If SLEPc is used, you must specify the architecture either through the SLEPC_ARCH environment variable, or through the --with-slepc-arch flag" >&5 -$as_echo "$as_me: error: If SLEPc is used, you must specify the architecture +echo "$as_me: error: If SLEPc is used, you must specify the architecture either through the SLEPC_ARCH environment variable, or through the --with-slepc-arch flag" >&2;} { (exit 1); exit 1; }; } @@ -13151,9 +12877,9 @@ fi if test ! -d $DEAL_II_SLEPC_DIR/$DEAL_II_SLEPC_ARCH \ -o ! -d $DEAL_II_SLEPC_DIR/$DEAL_II_SLEPC_ARCH/lib \ ; then - { { $as_echo "$as_me:$LINENO: error: SLEPc has not been compiled for the architecture + { { echo "$as_me:$LINENO: error: SLEPc has not been compiled for the architecture specified with --with-slepc-arch" >&5 -$as_echo "$as_me: error: SLEPc has not been compiled for the architecture +echo "$as_me: error: SLEPc has not been compiled for the architecture specified with --with-slepc-arch" >&2;} { (exit 1); exit 1; }; } fi @@ -13161,11 +12887,11 @@ $as_echo "$as_me: error: SLEPc has not been compiled for the architecture if test "$DEAL_II_SLEPC_ARCH" != "$DEAL_II_PETSC_ARCH" \ ; then - { { $as_echo "$as_me:$LINENO: error: If SLEPc is used, you must specify the same + { { echo "$as_me:$LINENO: error: If SLEPc is used, you must specify the same architecture as your PETSc Installation either through the SLEPC_ARCH environment variable, or through the --with-slepc-arch flag" >&5 -$as_echo "$as_me: error: If SLEPc is used, you must specify the same +echo "$as_me: error: If SLEPc is used, you must specify the same architecture as your PETSc Installation either through the SLEPC_ARCH environment variable, or through the --with-slepc-arch flag" >&2;} @@ -13173,8 +12899,8 @@ $as_echo "$as_me: error: If SLEPc is used, you must specify the same fi - { $as_echo "$as_me:$LINENO: checking for SLEPc version" >&5 -$as_echo_n "checking for SLEPc version... " >&6; } + { echo "$as_me:$LINENO: checking for SLEPc version" >&5 +echo $ECHO_N "checking for SLEPc version... $ECHO_C" >&6; } DEAL_II_SLEPC_VERSION_MAJOR=`cat $DEAL_II_SLEPC_DIR/include/slepcversion.h \ | grep "#define SLEPC_VERSION_MAJOR" \ @@ -13186,14 +12912,14 @@ $as_echo_n "checking for SLEPc version... " >&6; } | grep "#define SLEPC_VERSION_SUBMINOR" \ | perl -pi -e 's/.*MINOR\s+//g;'` SLEPC_VERSION="$DEAL_II_SLEPC_VERSION_MAJOR.$DEAL_II_SLEPC_VERSION_MINOR.$DEAL_II_SLEPC_VERSION_SUBMINOR" - { $as_echo "$as_me:$LINENO: result: $SLEPC_VERSION" >&5 -$as_echo "$SLEPC_VERSION" >&6; } + { echo "$as_me:$LINENO: result: $SLEPC_VERSION" >&5 +echo "${ECHO_T}$SLEPC_VERSION" >&6; } if test "${PETSC_VERSION}" != "${SLEPC_VERSION}" \ ; then - { { $as_echo "$as_me:$LINENO: error: If SLEPc is used, you must use the same version + { { echo "$as_me:$LINENO: error: If SLEPc is used, you must use the same version number as your PETSc Installation" >&5 -$as_echo "$as_me: error: If SLEPc is used, you must use the same version +echo "$as_me: error: If SLEPc is used, you must use the same version number as your PETSc Installation" >&2;} { (exit 1); exit 1; }; } fi @@ -13213,27 +12939,27 @@ $as_echo "$as_me: error: If SLEPc is used, you must use the same version - { $as_echo "$as_me:$LINENO: checking for Trilinos directory" >&5 -$as_echo_n "checking for Trilinos directory... " >&6; } + { echo "$as_me:$LINENO: checking for Trilinos directory" >&5 +echo $ECHO_N "checking for Trilinos directory... $ECHO_C" >&6; } # Check whether --with-trilinos was given. if test "${with_trilinos+set}" = set; then withval=$with_trilinos; if test "x$withval" = "xno" ; then - { $as_echo "$as_me:$LINENO: result: explicitly disabled" >&5 -$as_echo "explicitly disabled" >&6; } + { echo "$as_me:$LINENO: result: explicitly disabled" >&5 +echo "${ECHO_T}explicitly disabled" >&6; } USE_CONTRIB_TRILINOS=no else USE_CONTRIB_TRILINOS=yes DEAL_II_TRILINOS_DIR="$withval" - { $as_echo "$as_me:$LINENO: result: $DEAL_II_TRILINOS_DIR" >&5 -$as_echo "$DEAL_II_TRILINOS_DIR" >&6; } + { echo "$as_me:$LINENO: result: $DEAL_II_TRILINOS_DIR" >&5 +echo "${ECHO_T}$DEAL_II_TRILINOS_DIR" >&6; } if test ! -d $DEAL_II_TRILINOS_DIR/include \ -o ! -d $DEAL_II_TRILINOS_DIR/lib ; then - { { $as_echo "$as_me:$LINENO: error: Path to Trilinos specified with --with-trilinos does not + { { echo "$as_me:$LINENO: error: Path to Trilinos specified with --with-trilinos does not point to a complete Trilinos installation" >&5 -$as_echo "$as_me: error: Path to Trilinos specified with --with-trilinos does not +echo "$as_me: error: Path to Trilinos specified with --with-trilinos does not point to a complete Trilinos installation" >&2;} { (exit 1); exit 1; }; } fi @@ -13247,15 +12973,15 @@ else if test "x$TRILINOS_DIR" != "x" ; then USE_CONTRIB_TRILINOS=yes DEAL_II_TRILINOS_DIR="$TRILINOS_DIR" - { $as_echo "$as_me:$LINENO: result: $DEAL_II_TRILINOS_DIR" >&5 -$as_echo "$DEAL_II_TRILINOS_DIR" >&6; } + { echo "$as_me:$LINENO: result: $DEAL_II_TRILINOS_DIR" >&5 +echo "${ECHO_T}$DEAL_II_TRILINOS_DIR" >&6; } if test ! -d $DEAL_II_TRILINOS_DIR/include \ -o ! -d $DEAL_II_TRILINOS_DIR/lib ; then - { { $as_echo "$as_me:$LINENO: error: The path to Trilinos specified in the TRILINOS_DIR + { { echo "$as_me:$LINENO: error: The path to Trilinos specified in the TRILINOS_DIR environment variable does not point to a complete Trilinos installation" >&5 -$as_echo "$as_me: error: The path to Trilinos specified in the TRILINOS_DIR +echo "$as_me: error: The path to Trilinos specified in the TRILINOS_DIR environment variable does not point to a complete Trilinos installation" >&2;} { (exit 1); exit 1; }; } @@ -13265,33 +12991,33 @@ $as_echo "$as_me: error: The path to Trilinos specified in the TRILINOS_DIR else USE_CONTRIB_TRILINOS=no DEAL_II_TRILINOS_DIR="" - { $as_echo "$as_me:$LINENO: result: not found" >&5 -$as_echo "not found" >&6; } + { echo "$as_me:$LINENO: result: not found" >&5 +echo "${ECHO_T}not found" >&6; } fi fi - { $as_echo "$as_me:$LINENO: checking for Trilinos header directory" >&5 -$as_echo_n "checking for Trilinos header directory... " >&6; } + { echo "$as_me:$LINENO: checking for Trilinos header directory" >&5 +echo $ECHO_N "checking for Trilinos header directory... $ECHO_C" >&6; } # Check whether --with-trilinos-include was given. if test "${with_trilinos_include+set}" = set; then withval=$with_trilinos_include; if test "x$withval" = "xno" ; then - { $as_echo "$as_me:$LINENO: result: explicitly disabled" >&5 -$as_echo "explicitly disabled" >&6; } + { echo "$as_me:$LINENO: result: explicitly disabled" >&5 +echo "${ECHO_T}explicitly disabled" >&6; } USE_CONTRIB_TRILINOS=no else USE_CONTRIB_TRILINOS=yes DEAL_II_TRILINOS_INCDIR="$withval" - { $as_echo "$as_me:$LINENO: result: $DEAL_II_TRILINOS_INCDIR" >&5 -$as_echo "$DEAL_II_TRILINOS_INCDIR" >&6; } + { echo "$as_me:$LINENO: result: $DEAL_II_TRILINOS_INCDIR" >&5 +echo "${ECHO_T}$DEAL_II_TRILINOS_INCDIR" >&6; } if test ! -d $DEAL_II_TRILINOS_INCDIR ; then - { { $as_echo "$as_me:$LINENO: error: Path to Trilinos specified with --with-trilinos-include does not + { { echo "$as_me:$LINENO: error: Path to Trilinos specified with --with-trilinos-include does not point to a complete Trilinos installation" >&5 -$as_echo "$as_me: error: Path to Trilinos specified with --with-trilinos-include does not +echo "$as_me: error: Path to Trilinos specified with --with-trilinos-include does not point to a complete Trilinos installation" >&2;} { (exit 1); exit 1; }; } fi @@ -13302,13 +13028,13 @@ else if test "x$TRILINOS_INCDIR" != "x" ; then USE_CONTRIB_TRILINOS=yes DEAL_II_TRILINOS_INCDIR="$TRILINOS_INCDIR" - { $as_echo "$as_me:$LINENO: result: $DEAL_II_TRILINOS_INCDIR" >&5 -$as_echo "$DEAL_II_TRILINOS_INCDIR" >&6; } + { echo "$as_me:$LINENO: result: $DEAL_II_TRILINOS_INCDIR" >&5 +echo "${ECHO_T}$DEAL_II_TRILINOS_INCDIR" >&6; } if test ! -d $DEAL_II_TRILINOS_INCDIR ; then - { { $as_echo "$as_me:$LINENO: error: The path to Trilinos includes specified in the TRILINOS_INCDIR + { { echo "$as_me:$LINENO: error: The path to Trilinos includes specified in the TRILINOS_INCDIR environment variable does not point to a valid directory" >&5 -$as_echo "$as_me: error: The path to Trilinos includes specified in the TRILINOS_INCDIR +echo "$as_me: error: The path to Trilinos includes specified in the TRILINOS_INCDIR environment variable does not point to a valid directory" >&2;} { (exit 1); exit 1; }; } fi @@ -13316,37 +13042,37 @@ $as_echo "$as_me: error: The path to Trilinos includes specified in the TRILINOS if test "x${USE_CONTRIB_TRILINOS}" != "xyes" ; then USE_CONTRIB_TRILINOS=no DEAL_II_TRILINOS_INCDIR="" - { $as_echo "$as_me:$LINENO: result: not found" >&5 -$as_echo "not found" >&6; } + { echo "$as_me:$LINENO: result: not found" >&5 +echo "${ECHO_T}not found" >&6; } else - { $as_echo "$as_me:$LINENO: result: not explicitly specified" >&5 -$as_echo "not explicitly specified" >&6; } + { echo "$as_me:$LINENO: result: not explicitly specified" >&5 +echo "${ECHO_T}not explicitly specified" >&6; } fi fi fi - { $as_echo "$as_me:$LINENO: checking for Trilinos library directory" >&5 -$as_echo_n "checking for Trilinos library directory... " >&6; } + { echo "$as_me:$LINENO: checking for Trilinos library directory" >&5 +echo $ECHO_N "checking for Trilinos library directory... $ECHO_C" >&6; } # Check whether --with-trilinos-libs was given. if test "${with_trilinos_libs+set}" = set; then withval=$with_trilinos_libs; if test "x$withval" = "xno" ; then - { $as_echo "$as_me:$LINENO: result: explicitly disabled" >&5 -$as_echo "explicitly disabled" >&6; } + { echo "$as_me:$LINENO: result: explicitly disabled" >&5 +echo "${ECHO_T}explicitly disabled" >&6; } USE_CONTRIB_TRILINOS=no else USE_CONTRIB_TRILINOS=yes DEAL_II_TRILINOS_LIBDIR="$withval" - { $as_echo "$as_me:$LINENO: result: $DEAL_II_TRILINOS_LIBDIR" >&5 -$as_echo "$DEAL_II_TRILINOS_LIBDIR" >&6; } + { echo "$as_me:$LINENO: result: $DEAL_II_TRILINOS_LIBDIR" >&5 +echo "${ECHO_T}$DEAL_II_TRILINOS_LIBDIR" >&6; } if test ! -d $DEAL_II_TRILINOS_LIBDIR ; then - { { $as_echo "$as_me:$LINENO: error: Path to Trilinos libraries with --with-trilinos-libs does not + { { echo "$as_me:$LINENO: error: Path to Trilinos libraries with --with-trilinos-libs does not point to a valid directory" >&5 -$as_echo "$as_me: error: Path to Trilinos libraries with --with-trilinos-libs does not +echo "$as_me: error: Path to Trilinos libraries with --with-trilinos-libs does not point to a valid directory" >&2;} { (exit 1); exit 1; }; } fi @@ -13357,14 +13083,14 @@ else if test "x$TRILINOS_LIBDIR" != "x" ; then USE_CONTRIB_TRILINOS=yes DEAL_II_TRILINOS_LIBDIR="$TRILINOS_LIBDIR" - { $as_echo "$as_me:$LINENO: result: $DEAL_II_TRILINOS_LIBDIR" >&5 -$as_echo "$DEAL_II_TRILINOS_LIBDIR" >&6; } + { echo "$as_me:$LINENO: result: $DEAL_II_TRILINOS_LIBDIR" >&5 +echo "${ECHO_T}$DEAL_II_TRILINOS_LIBDIR" >&6; } if test ! -d $DEAL_II_TRILINOS_LIBDIR ; then - { { $as_echo "$as_me:$LINENO: error: The path to Trilinos specified in the TRILINOS_LIBDIR + { { echo "$as_me:$LINENO: error: The path to Trilinos specified in the TRILINOS_LIBDIR environment variable does not point to a complete Trilinos installation" >&5 -$as_echo "$as_me: error: The path to Trilinos specified in the TRILINOS_LIBDIR +echo "$as_me: error: The path to Trilinos specified in the TRILINOS_LIBDIR environment variable does not point to a complete Trilinos installation" >&2;} { (exit 1); exit 1; }; } @@ -13373,11 +13099,11 @@ $as_echo "$as_me: error: The path to Trilinos specified in the TRILINOS_LIBDIR if test "x${USE_CONTRIB_TRILINOS}" != "xyes" ; then USE_CONTRIB_TRILINOS=no DEAL_II_TRILINOS_LIBDIR="" - { $as_echo "$as_me:$LINENO: result: not found" >&5 -$as_echo "not found" >&6; } + { echo "$as_me:$LINENO: result: not found" >&5 +echo "${ECHO_T}not found" >&6; } else - { $as_echo "$as_me:$LINENO: result: not explicitly specified" >&5 -$as_echo "not explicitly specified" >&6; } + { echo "$as_me:$LINENO: result: not explicitly specified" >&5 +echo "${ECHO_T}not explicitly specified" >&6; } fi fi @@ -13395,49 +13121,49 @@ _ACEOF - { $as_echo "$as_me:$LINENO: checking whether Trilinos uses shared libraries" >&5 -$as_echo_n "checking whether Trilinos uses shared libraries... " >&6; } + { echo "$as_me:$LINENO: checking whether Trilinos uses shared libraries" >&5 +echo $ECHO_N "checking whether Trilinos uses shared libraries... $ECHO_C" >&6; } if test -f $DEAL_II_TRILINOS_LIBDIR/libepetra${shared_lib_suffix} ; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } DEAL_II_TRILINOS_SHARED=yes else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi - { $as_echo "$as_me:$LINENO: checking whether Trilinos uses static libraries" >&5 -$as_echo_n "checking whether Trilinos uses static libraries... " >&6; } + { echo "$as_me:$LINENO: checking whether Trilinos uses static libraries" >&5 +echo $ECHO_N "checking whether Trilinos uses static libraries... $ECHO_C" >&6; } if test -f $DEAL_II_TRILINOS_LIBDIR/libepetra${static_lib_suffix} ; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } DEAL_II_TRILINOS_STATIC=yes else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi if test "x${DEAL_II_TRILINOS_SHARED}${DEAL_II_TRILINOS_STATIC}" = "x" ; then - { { $as_echo "$as_me:$LINENO: error: Unable to determine whether Trilinos uses shared or + { { echo "$as_me:$LINENO: error: Unable to determine whether Trilinos uses shared or static libraries." >&5 -$as_echo "$as_me: error: Unable to determine whether Trilinos uses shared or +echo "$as_me: error: Unable to determine whether Trilinos uses shared or static libraries." >&2;} { (exit 1); exit 1; }; } fi if test "x$enableshared" = "xyes" -a "x$DEAL_II_TRILINOS_SHARED" != "xyes" ; then - { { $as_echo "$as_me:$LINENO: error: When building deal.II with shared libraries, Trilinos also + { { echo "$as_me:$LINENO: error: When building deal.II with shared libraries, Trilinos also needs to be built with shared libraries" >&5 -$as_echo "$as_me: error: When building deal.II with shared libraries, Trilinos also +echo "$as_me: error: When building deal.II with shared libraries, Trilinos also needs to be built with shared libraries" >&2;} { (exit 1); exit 1; }; } fi if test "x$enableshared" = "xno" -a "x$DEAL_II_TRILINOS_STATIC" != "xyes" ; then - { { $as_echo "$as_me:$LINENO: error: When building deal.II with shared libraries, Trilinos also + { { echo "$as_me:$LINENO: error: When building deal.II with shared libraries, Trilinos also needs to be built with shared libraries" >&5 -$as_echo "$as_me: error: When building deal.II with shared libraries, Trilinos also +echo "$as_me: error: When building deal.II with shared libraries, Trilinos also needs to be built with shared libraries" >&2;} { (exit 1); exit 1; }; } fi @@ -13452,8 +13178,8 @@ $as_echo "$as_me: error: When building deal.II with shared libraries, Trilinos a OLD_CXXFLAGS="$CXXFLAGS" - { $as_echo "$as_me:$LINENO: checking whether we can use -Wno-unused to suppress Trilinos warnings" >&5 -$as_echo_n "checking whether we can use -Wno-unused to suppress Trilinos warnings... " >&6; } + { echo "$as_me:$LINENO: checking whether we can use -Wno-unused to suppress Trilinos warnings" >&5 +echo $ECHO_N "checking whether we can use -Wno-unused to suppress Trilinos warnings... $ECHO_C" >&6; } CXXFLAGS=-Wno-unused cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -13476,37 +13202,36 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } CXXFLAGSG="$CXXFLAGSG -Wno-unused" else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - { $as_echo "$as_me:$LINENO: checking whether we can use -Wno-overloaded-virtual to suppress Trilinos warnings" >&5 -$as_echo_n "checking whether we can use -Wno-overloaded-virtual to suppress Trilinos warnings... " >&6; } + { echo "$as_me:$LINENO: checking whether we can use -Wno-overloaded-virtual to suppress Trilinos warnings" >&5 +echo $ECHO_N "checking whether we can use -Wno-overloaded-virtual to suppress Trilinos warnings... $ECHO_C" >&6; } CXXFLAGS=-Wno-overloaded-virtual cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -13529,37 +13254,36 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } CXXFLAGSG="$CXXFLAGSG -Wno-overloaded-virtual" else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - { $as_echo "$as_me:$LINENO: checking whether we can use -Wno-extra to suppress Trilinos warnings" >&5 -$as_echo_n "checking whether we can use -Wno-extra to suppress Trilinos warnings... " >&6; } + { echo "$as_me:$LINENO: checking whether we can use -Wno-extra to suppress Trilinos warnings" >&5 +echo $ECHO_N "checking whether we can use -Wno-extra to suppress Trilinos warnings... $ECHO_C" >&6; } CXXFLAGS=-Wno-extra cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -13582,30 +13306,29 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } CXXFLAGSG="$CXXFLAGSG -Wno-extra" else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi @@ -13687,21 +13410,20 @@ for ac_header in Amesos.h \ Thyra_VectorSpaceImpl.hpp do -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } else # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 -$as_echo_n "checking $ac_header usability... " >&6; } +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -13717,33 +13439,32 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then ac_header_compiler=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_header_compiler=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 -$as_echo_n "checking $ac_header presence... " >&6; } +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -13757,52 +13478,51 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null && { test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || test ! -s conftest.err }; then ac_header_preproc=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in yes:no: ) - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} ac_header_preproc=yes ;; no:yes:* ) - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX ## -------------------------------- ## ## Report this to dealii@dealii.org ## @@ -13811,33 +13531,30 @@ _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else eval "$as_ac_Header=\$ac_header_preproc" fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } fi -as_val=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then +if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF else - { { $as_echo "$as_me:$LINENO: error: The Trilinos installation is missing one or more + { { echo "$as_me:$LINENO: error: The Trilinos installation is missing one or more header files necessary for the deal.II Trilinos interfaces. Please re-install Trilinos with the missing Trilinos sub-packages enabled." >&5 -$as_echo "$as_me: error: The Trilinos installation is missing one or more +echo "$as_me: error: The Trilinos installation is missing one or more header files necessary for the deal.II Trilinos interfaces. Please re-install Trilinos with the missing Trilinos sub-packages enabled." >&2;} @@ -13935,11 +13652,11 @@ if test "${with_blas+set}" = set; then if test "x$withval" != "xno" ; then if test "x$withval" != "xyes" ; then blas="$withval" - as_ac_Lib=`$as_echo "ac_cv_lib_$blas''_daxpy_" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for daxpy_ in -l$blas" >&5 -$as_echo_n "checking for daxpy_ in -l$blas... " >&6; } + as_ac_Lib=`echo "ac_cv_lib_$blas''_daxpy_" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for daxpy_ in -l$blas" >&5 +echo $ECHO_N "checking for daxpy_ in -l$blas... $ECHO_C" >&6; } if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-l$blas $F77LIBS $LIBS" @@ -13971,41 +13688,34 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then eval "$as_ac_Lib=yes" else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 eval "$as_ac_Lib=no" fi -rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -ac_res=`eval 'as_val=${'$as_ac_Lib'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_Lib'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then +ac_res=`eval echo '${'$as_ac_Lib'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_Lib'}'` = yes; then LIBS="-l$blas $LIBS" @@ -14025,8 +13735,8 @@ fi if (echo $target | grep apple-darwin > /dev/null) ; then OLD_LDFLAGS="$LDFLAGS" - { $as_echo "$as_me:$LINENO: checking -framework Accelerate" >&5 -$as_echo_n "checking -framework Accelerate... " >&6; } + { echo "$as_me:$LINENO: checking -framework Accelerate" >&5 +echo $ECHO_N "checking -framework Accelerate... $ECHO_C" >&6; } LDFLAGS="$OLD_LDFLAGS -framework Accelerate" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -14050,43 +13760,39 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } framework_works=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi -rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext if test "x$framework_works" != "xyes"; then - { $as_echo "$as_me:$LINENO: checking -framework vecLib" >&5 -$as_echo_n "checking -framework vecLib... " >&6; } + { echo "$as_me:$LINENO: checking -framework vecLib" >&5 +echo $ECHO_N "checking -framework vecLib... $ECHO_C" >&6; } LDFLAGS="$OLD_LDFLAGS -framework vecLib" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -14110,37 +13816,33 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } framework_works=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi -rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi @@ -14152,11 +13854,11 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ if test "x$framework_works" != "xyes"; then blas="blas"; - as_ac_Lib=`$as_echo "ac_cv_lib_$blas''_daxpy_" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for daxpy_ in -l$blas" >&5 -$as_echo_n "checking for daxpy_ in -l$blas... " >&6; } + as_ac_Lib=`echo "ac_cv_lib_$blas''_daxpy_" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for daxpy_ in -l$blas" >&5 +echo $ECHO_N "checking for daxpy_ in -l$blas... $ECHO_C" >&6; } if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-l$blas $F77LIBS $LIBS" @@ -14188,41 +13890,34 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then eval "$as_ac_Lib=yes" else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 eval "$as_ac_Lib=no" fi -rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -ac_res=`eval 'as_val=${'$as_ac_Lib'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_Lib'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then +ac_res=`eval echo '${'$as_ac_Lib'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_Lib'}'` = yes; then LIBS="-l$blas $LIBS" @@ -14246,8 +13941,8 @@ fi - { $as_echo "$as_me:$LINENO: checking for HSL subroutines" >&5 -$as_echo_n "checking for HSL subroutines... " >&6; } + { echo "$as_me:$LINENO: checking for HSL subroutines" >&5 +echo $ECHO_N "checking for HSL subroutines... $ECHO_C" >&6; } hsl_subroutines="" if test -r contrib/hsl/source/ma27.f ; then hsl_subroutines="$hsl_subroutines MA27" @@ -14269,24 +13964,24 @@ _ACEOF fi if test "x$hsl_subroutines" != "x" ; then - { $as_echo "$as_me:$LINENO: result: $hsl_subroutines" >&5 -$as_echo "$hsl_subroutines" >&6; } + { echo "$as_me:$LINENO: result: $hsl_subroutines" >&5 +echo "${ECHO_T}$hsl_subroutines" >&6; } USE_CONTRIB_HSL=yes HSL_INCLUDE_DIR='-I$D/contrib/hsl/include' NEEDS_F77LIBS="yes" else - { $as_echo "$as_me:$LINENO: result: none found" >&5 -$as_echo "none found" >&6; } + { echo "$as_me:$LINENO: result: none found" >&5 +echo "${ECHO_T}none found" >&6; } fi if test "x$NEEDS_F77LIBS" != "x" ; then - { $as_echo "$as_me:$LINENO: result: Adding FORTRAN libraries $F77LIBS" >&5 -$as_echo "Adding FORTRAN libraries $F77LIBS" >&6; } + { echo "$as_me:$LINENO: result: Adding FORTRAN libraries $F77LIBS" >&5 +echo "${ECHO_T}Adding FORTRAN libraries $F77LIBS" >&6; } LIBS="$LIBS $F77LIBS" LDFLAGS="$F77FLAGS $LDFLAGS" fi @@ -14301,11 +13996,11 @@ fi if test "${with_zlib+set}" = set; then withval=$with_zlib; if test "x$withval" != "xyes" ; then - as_ac_Lib=`$as_echo "ac_cv_lib_$withval''_crc32" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for crc32 in -l$withval" >&5 -$as_echo_n "checking for crc32 in -l$withval... " >&6; } + as_ac_Lib=`echo "ac_cv_lib_$withval''_crc32" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for crc32 in -l$withval" >&5 +echo $ECHO_N "checking for crc32 in -l$withval... $ECHO_C" >&6; } if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-l$withval $LIBS" @@ -14337,41 +14032,34 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then eval "$as_ac_Lib=yes" else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 eval "$as_ac_Lib=no" fi -rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -ac_res=`eval 'as_val=${'$as_ac_Lib'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_Lib'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then +ac_res=`eval echo '${'$as_ac_Lib'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_Lib'}'` = yes; then LIBS="-l$withval $LIBS" @@ -14384,10 +14072,10 @@ fi else -{ $as_echo "$as_me:$LINENO: checking for crc32 in -lz" >&5 -$as_echo_n "checking for crc32 in -lz... " >&6; } +{ echo "$as_me:$LINENO: checking for crc32 in -lz" >&5 +echo $ECHO_N "checking for crc32 in -lz... $ECHO_C" >&6; } if test "${ac_cv_lib_z_crc32+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lz $LIBS" @@ -14419,37 +14107,33 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_z_crc32=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_lib_z_crc32=no fi -rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_z_crc32" >&5 -$as_echo "$ac_cv_lib_z_crc32" >&6; } -if test "x$ac_cv_lib_z_crc32" = x""yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_lib_z_crc32" >&5 +echo "${ECHO_T}$ac_cv_lib_z_crc32" >&6; } +if test $ac_cv_lib_z_crc32 = yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBZ 1 _ACEOF @@ -14466,15 +14150,15 @@ fi for i in $TECHOME $TEC100HOME $TEC90HOME $TEC80HOME ; do - as_ac_File=`$as_echo "ac_cv_file_$i/lib/tecio.a" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $i/lib/tecio.a" >&5 -$as_echo_n "checking for $i/lib/tecio.a... " >&6; } + as_ac_File=`echo "ac_cv_file_$i/lib/tecio.a" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for $i/lib/tecio.a" >&5 +echo $ECHO_N "checking for $i/lib/tecio.a... $ECHO_C" >&6; } if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && - { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 -$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} { (exit 1); exit 1; }; } if test -r "$i/lib/tecio.a"; then eval "$as_ac_File=yes" @@ -14482,25 +14166,22 @@ else eval "$as_ac_File=no" fi fi -ac_res=`eval 'as_val=${'$as_ac_File'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_File'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then +ac_res=`eval echo '${'$as_ac_File'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_File'}'` = yes; then TECPLOT_LIB="$i/lib/tecio.a" fi - as_ac_File=`$as_echo "ac_cv_file_$i/include/TECIO.h" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $i/include/TECIO.h" >&5 -$as_echo_n "checking for $i/include/TECIO.h... " >&6; } + as_ac_File=`echo "ac_cv_file_$i/include/TECIO.h" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for $i/include/TECIO.h" >&5 +echo $ECHO_N "checking for $i/include/TECIO.h... $ECHO_C" >&6; } if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && - { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 -$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} { (exit 1); exit 1; }; } if test -r "$i/include/TECIO.h"; then eval "$as_ac_File=yes" @@ -14508,13 +14189,10 @@ else eval "$as_ac_File=no" fi fi -ac_res=`eval 'as_val=${'$as_ac_File'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_File'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then +ac_res=`eval echo '${'$as_ac_File'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_File'}'` = yes; then TECPLOT_INCLUDE_DIR=-I$i/include else TECPLOT_LIB="" @@ -14602,17 +14280,17 @@ fi fi if test "${ac_cv_header_netcdfcpp_h+set}" = set; then - { $as_echo "$as_me:$LINENO: checking for netcdfcpp.h" >&5 -$as_echo_n "checking for netcdfcpp.h... " >&6; } + { echo "$as_me:$LINENO: checking for netcdfcpp.h" >&5 +echo $ECHO_N "checking for netcdfcpp.h... $ECHO_C" >&6; } if test "${ac_cv_header_netcdfcpp_h+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_netcdfcpp_h" >&5 -$as_echo "$ac_cv_header_netcdfcpp_h" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_header_netcdfcpp_h" >&5 +echo "${ECHO_T}$ac_cv_header_netcdfcpp_h" >&6; } else # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking netcdfcpp.h usability" >&5 -$as_echo_n "checking netcdfcpp.h usability... " >&6; } +{ echo "$as_me:$LINENO: checking netcdfcpp.h usability" >&5 +echo $ECHO_N "checking netcdfcpp.h usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -14628,33 +14306,32 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then ac_header_compiler=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_header_compiler=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -{ $as_echo "$as_me:$LINENO: checking netcdfcpp.h presence" >&5 -$as_echo_n "checking netcdfcpp.h presence... " >&6; } +{ echo "$as_me:$LINENO: checking netcdfcpp.h presence" >&5 +echo $ECHO_N "checking netcdfcpp.h presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -14668,52 +14345,51 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null && { test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || test ! -s conftest.err }; then ac_header_preproc=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in yes:no: ) - { $as_echo "$as_me:$LINENO: WARNING: netcdfcpp.h: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: netcdfcpp.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: netcdfcpp.h: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: netcdfcpp.h: proceeding with the compiler's result" >&2;} + { echo "$as_me:$LINENO: WARNING: netcdfcpp.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: netcdfcpp.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: netcdfcpp.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: netcdfcpp.h: proceeding with the compiler's result" >&2;} ac_header_preproc=yes ;; no:yes:* ) - { $as_echo "$as_me:$LINENO: WARNING: netcdfcpp.h: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: netcdfcpp.h: present but cannot be compiled" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: netcdfcpp.h: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: netcdfcpp.h: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: netcdfcpp.h: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: netcdfcpp.h: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: netcdfcpp.h: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: netcdfcpp.h: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: netcdfcpp.h: proceeding with the preprocessor's result" >&5 -$as_echo "$as_me: WARNING: netcdfcpp.h: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: netcdfcpp.h: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: netcdfcpp.h: in the future, the compiler will take precedence" >&2;} + { echo "$as_me:$LINENO: WARNING: netcdfcpp.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: netcdfcpp.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: netcdfcpp.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: netcdfcpp.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: netcdfcpp.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: netcdfcpp.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: netcdfcpp.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: netcdfcpp.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: netcdfcpp.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: netcdfcpp.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: netcdfcpp.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: netcdfcpp.h: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX ## -------------------------------- ## ## Report this to dealii@dealii.org ## @@ -14722,24 +14398,24 @@ _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac -{ $as_echo "$as_me:$LINENO: checking for netcdfcpp.h" >&5 -$as_echo_n "checking for netcdfcpp.h... " >&6; } +{ echo "$as_me:$LINENO: checking for netcdfcpp.h" >&5 +echo $ECHO_N "checking for netcdfcpp.h... $ECHO_C" >&6; } if test "${ac_cv_header_netcdfcpp_h+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_cv_header_netcdfcpp_h=$ac_header_preproc fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_netcdfcpp_h" >&5 -$as_echo "$ac_cv_header_netcdfcpp_h" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_header_netcdfcpp_h" >&5 +echo "${ECHO_T}$ac_cv_header_netcdfcpp_h" >&6; } fi - { $as_echo "$as_me:$LINENO: checking for nc_open in -lnetcdf" >&5 -$as_echo_n "checking for nc_open in -lnetcdf... " >&6; } + { echo "$as_me:$LINENO: checking for nc_open in -lnetcdf" >&5 +echo $ECHO_N "checking for nc_open in -lnetcdf... $ECHO_C" >&6; } if test "${ac_cv_lib_netcdf_nc_open+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lnetcdf $LIBS" @@ -14771,45 +14447,41 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_netcdf_nc_open=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_lib_netcdf_nc_open=no fi -rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_netcdf_nc_open" >&5 -$as_echo "$ac_cv_lib_netcdf_nc_open" >&6; } -if test "x$ac_cv_lib_netcdf_nc_open" = x""yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_lib_netcdf_nc_open" >&5 +echo "${ECHO_T}$ac_cv_lib_netcdf_nc_open" >&6; } +if test $ac_cv_lib_netcdf_nc_open = yes; then OLD_LIBS="$LIBS" LIBS="-lnetcdf_c++ -lnetcdf $LIBS" - { $as_echo "$as_me:$LINENO: checking for NcFile::NcFile in -lnetcdf_c++" >&5 -$as_echo_n "checking for NcFile::NcFile in -lnetcdf_c++... " >&6; } + { echo "$as_me:$LINENO: checking for NcFile::NcFile in -lnetcdf_c++" >&5 +echo $ECHO_N "checking for NcFile::NcFile in -lnetcdf_c++... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -14833,23 +14505,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } cat >>confdefs.h <<\_ACEOF #define HAVE_LIBNETCDF 1 @@ -14857,18 +14526,17 @@ _ACEOF else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } LIBS="$OLD_LIBS" fi -rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext @@ -14885,13 +14553,13 @@ if test "${with_metis+set}" = set; then withval=$with_metis; USE_CONTRIB_METIS=yes DEAL_II_METIS_DIR="$withval" - { $as_echo "$as_me:$LINENO: result: $DEAL_II_METIS_DIR" >&5 -$as_echo "$DEAL_II_METIS_DIR" >&6; } + { echo "$as_me:$LINENO: result: $DEAL_II_METIS_DIR" >&5 +echo "${ECHO_T}$DEAL_II_METIS_DIR" >&6; } if test ! -d $DEAL_II_METIS_DIR/Lib ; then - { { $as_echo "$as_me:$LINENO: error: Path to Metis specified with --with-metis does not + { { echo "$as_me:$LINENO: error: Path to Metis specified with --with-metis does not point to a complete Metis installation" >&5 -$as_echo "$as_me: error: Path to Metis specified with --with-metis does not +echo "$as_me: error: Path to Metis specified with --with-metis does not point to a complete Metis installation" >&2;} { (exit 1); exit 1; }; } fi @@ -14904,14 +14572,14 @@ else if test "x$METIS_DIR" != "x" ; then USE_CONTRIB_METIS=yes DEAL_II_METIS_DIR="$METIS_DIR" - { $as_echo "$as_me:$LINENO: result: $DEAL_II_METIS_DIR" >&5 -$as_echo "$DEAL_II_METIS_DIR" >&6; } + { echo "$as_me:$LINENO: result: $DEAL_II_METIS_DIR" >&5 +echo "${ECHO_T}$DEAL_II_METIS_DIR" >&6; } if test ! -d $DEAL_II_METIS_DIR/Lib ; then - { { $as_echo "$as_me:$LINENO: error: The path to Metis specified in the METIS_DIR + { { echo "$as_me:$LINENO: error: The path to Metis specified in the METIS_DIR environment variable does not point to a complete Metis installation" >&5 -$as_echo "$as_me: error: The path to Metis specified in the METIS_DIR +echo "$as_me: error: The path to Metis specified in the METIS_DIR environment variable does not point to a complete Metis installation" >&2;} { (exit 1); exit 1; }; } @@ -14942,13 +14610,13 @@ if test "${with_metis_libs+set}" = set; then withval=$with_metis_libs; USE_CONTRIB_METIS=yes DEAL_II_METIS_LIBDIR="$withval" - { $as_echo "$as_me:$LINENO: result: $DEAL_II_METIS_LIBDIR" >&5 -$as_echo "$DEAL_II_METIS_LIBDIR" >&6; } + { echo "$as_me:$LINENO: result: $DEAL_II_METIS_LIBDIR" >&5 +echo "${ECHO_T}$DEAL_II_METIS_LIBDIR" >&6; } if test ! -d $DEAL_II_METIS_LIBDIR ; then - { { $as_echo "$as_me:$LINENO: error: Path to Metis specified with --with-metis does not + { { echo "$as_me:$LINENO: error: Path to Metis specified with --with-metis does not point to a complete Metis installation" >&5 -$as_echo "$as_me: error: Path to Metis specified with --with-metis does not +echo "$as_me: error: Path to Metis specified with --with-metis does not point to a complete Metis installation" >&2;} { (exit 1); exit 1; }; } fi @@ -14958,14 +14626,14 @@ else if test "x$METIS_LIBDIR" != "x" ; then USE_CONTRIB_METIS=yes DEAL_II_METIS_LIBDIR="$METIS_LIBDIR" - { $as_echo "$as_me:$LINENO: result: $DEAL_II_METIS_LIBDIR" >&5 -$as_echo "$DEAL_II_METIS_LIBDIR" >&6; } + { echo "$as_me:$LINENO: result: $DEAL_II_METIS_LIBDIR" >&5 +echo "${ECHO_T}$DEAL_II_METIS_LIBDIR" >&6; } if test ! -d $DEAL_II_METIS_LIBDIR ; then - { { $as_echo "$as_me:$LINENO: error: The path to Metis specified in the METIS_DIR + { { echo "$as_me:$LINENO: error: The path to Metis specified in the METIS_DIR environment variable does not point to a complete Metis installation" >&5 -$as_echo "$as_me: error: The path to Metis specified in the METIS_DIR +echo "$as_me: error: The path to Metis specified in the METIS_DIR environment variable does not point to a complete Metis installation" >&2;} { (exit 1); exit 1; }; } @@ -14999,20 +14667,20 @@ _ACEOF # Check whether --with-umfpack was given. if test "${with_umfpack+set}" = set; then withval=$with_umfpack; - { $as_echo "$as_me:$LINENO: checking UMFPACK library" >&5 -$as_echo_n "checking UMFPACK library... " >&6; } + { echo "$as_me:$LINENO: checking UMFPACK library" >&5 +echo $ECHO_N "checking UMFPACK library... $ECHO_C" >&6; } USE_CONTRIB_UMFPACK='yes' if test "x$withval" = "xyes" ; then UMFPACK_DIR="`pwd`/contrib/umfpack" UMFPACK_INCLUDE_DIR="-I`pwd`/contrib/umfpack/UMFPACK/Include" - { $as_echo "$as_me:$LINENO: result: using included version" >&5 -$as_echo "using included version" >&6; } + { echo "$as_me:$LINENO: result: using included version" >&5 +echo "${ECHO_T}using included version" >&6; } DEAL_II_USE_INTERNAL_UMFPACK=yes else UMFPACK_DIR="$withval" UMFPACK_INCLUDE_DIR="-I$withval/Include" - { $as_echo "$as_me:$LINENO: result: trying version at $withval" >&5 -$as_echo "trying version at $withval" >&6; } + { echo "$as_me:$LINENO: result: trying version at $withval" >&5 +echo "${ECHO_T}trying version at $withval" >&6; } fi @@ -15058,10 +14726,10 @@ _ACEOF if test "x$DEAL_II_USE_INTERNAL_UMFPACK" != "xyes" ; then OLD_LDFLAGS="$LDFLAGS" LDFLAGS="-L${UMFPACK_DIR}/UMFPACK $LDFLAGS" - { $as_echo "$as_me:$LINENO: checking for umfpack_di_defaults in -lumfpack" >&5 -$as_echo_n "checking for umfpack_di_defaults in -lumfpack... " >&6; } + { echo "$as_me:$LINENO: checking for umfpack_di_defaults in -lumfpack" >&5 +echo $ECHO_N "checking for umfpack_di_defaults in -lumfpack... $ECHO_C" >&6; } if test "${ac_cv_lib_umfpack_umfpack_di_defaults+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lumfpack $LIBS" @@ -15093,37 +14761,33 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_umfpack_umfpack_di_defaults=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_lib_umfpack_umfpack_di_defaults=no fi -rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_umfpack_umfpack_di_defaults" >&5 -$as_echo "$ac_cv_lib_umfpack_umfpack_di_defaults" >&6; } -if test "x$ac_cv_lib_umfpack_umfpack_di_defaults" = x""yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_lib_umfpack_umfpack_di_defaults" >&5 +echo "${ECHO_T}$ac_cv_lib_umfpack_umfpack_di_defaults" >&6; } +if test $ac_cv_lib_umfpack_umfpack_di_defaults = yes; then LIBS="$LIBS -lumfpack" @@ -15135,10 +14799,10 @@ if test "x$ac_cv_lib_umfpack_umfpack_di_defaults" = x""yes; then else LDFLAGS="-L${UMFPACK_DIR}/lib $OLD_LDFLAGS" - { $as_echo "$as_me:$LINENO: checking for umfpack_di_defaults in -lumfpack" >&5 -$as_echo_n "checking for umfpack_di_defaults in -lumfpack... " >&6; } + { echo "$as_me:$LINENO: checking for umfpack_di_defaults in -lumfpack" >&5 +echo $ECHO_N "checking for umfpack_di_defaults in -lumfpack... $ECHO_C" >&6; } if test "${ac_cv_lib_umfpack_umfpack_di_defaults+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lumfpack $LIBS" @@ -15170,37 +14834,33 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_umfpack_umfpack_di_defaults=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_lib_umfpack_umfpack_di_defaults=no fi -rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_umfpack_umfpack_di_defaults" >&5 -$as_echo "$ac_cv_lib_umfpack_umfpack_di_defaults" >&6; } -if test "x$ac_cv_lib_umfpack_umfpack_di_defaults" = x""yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_lib_umfpack_umfpack_di_defaults" >&5 +echo "${ECHO_T}$ac_cv_lib_umfpack_umfpack_di_defaults" >&6; } +if test $ac_cv_lib_umfpack_umfpack_di_defaults = yes; then LIBS="$LIBS -lumfpack" @@ -15211,8 +14871,8 @@ if test "x$ac_cv_lib_umfpack_umfpack_di_defaults" = x""yes; then else - { { $as_echo "$as_me:$LINENO: error: installation of UMFPACK could not be determined" >&5 -$as_echo "$as_me: error: installation of UMFPACK could not be determined" >&2;} + { { echo "$as_me:$LINENO: error: installation of UMFPACK could not be determined" >&5 +echo "$as_me: error: installation of UMFPACK could not be determined" >&2;} { (exit 1); exit 1; }; } @@ -15225,10 +14885,10 @@ fi OLD_LDFLAGS="$LDFLAGS" LDFLAGS="-L${UMFPACK_DIR}/AMD/Lib $LDFLAGS" - { $as_echo "$as_me:$LINENO: checking for amd_info in -lamd" >&5 -$as_echo_n "checking for amd_info in -lamd... " >&6; } + { echo "$as_me:$LINENO: checking for amd_info in -lamd" >&5 +echo $ECHO_N "checking for amd_info in -lamd... $ECHO_C" >&6; } if test "${ac_cv_lib_amd_amd_info+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lamd $LIBS" @@ -15260,37 +14920,33 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_amd_amd_info=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_lib_amd_amd_info=no fi -rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_amd_amd_info" >&5 -$as_echo "$ac_cv_lib_amd_amd_info" >&6; } -if test "x$ac_cv_lib_amd_amd_info" = x""yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_lib_amd_amd_info" >&5 +echo "${ECHO_T}$ac_cv_lib_amd_amd_info" >&6; } +if test $ac_cv_lib_amd_amd_info = yes; then LIBS="$LIBS -lamd" @@ -15302,10 +14958,10 @@ if test "x$ac_cv_lib_amd_amd_info" = x""yes; then else LDFLAGS="-L${UMFPACK_DIR}/lib $OLD_LDFLAGS" - { $as_echo "$as_me:$LINENO: checking for amd_info in -lamd" >&5 -$as_echo_n "checking for amd_info in -lamd... " >&6; } + { echo "$as_me:$LINENO: checking for amd_info in -lamd" >&5 +echo $ECHO_N "checking for amd_info in -lamd... $ECHO_C" >&6; } if test "${ac_cv_lib_amd_amd_info+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lamd $LIBS" @@ -15337,37 +14993,33 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_amd_amd_info=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_lib_amd_amd_info=no fi -rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_amd_amd_info" >&5 -$as_echo "$ac_cv_lib_amd_amd_info" >&6; } -if test "x$ac_cv_lib_amd_amd_info" = x""yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_lib_amd_amd_info" >&5 +echo "${ECHO_T}$ac_cv_lib_amd_amd_info" >&6; } +if test $ac_cv_lib_amd_amd_info = yes; then LIBS="$LIBS -lamd" @@ -15378,8 +15030,8 @@ if test "x$ac_cv_lib_amd_amd_info" = x""yes; then else - { { $as_echo "$as_me:$LINENO: error: installation of AMD could not be determined" >&5 -$as_echo "$as_me: error: installation of AMD could not be determined" >&2;} + { { echo "$as_me:$LINENO: error: installation of AMD could not be determined" >&5 +echo "$as_me: error: installation of AMD could not be determined" >&2;} { (exit 1); exit 1; }; } @@ -15391,15 +15043,15 @@ fi fi - as_ac_File=`$as_echo "ac_cv_file_${UMFPACK_DIR}/UMFPACK/Include/umfpack.h" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for ${UMFPACK_DIR}/UMFPACK/Include/umfpack.h" >&5 -$as_echo_n "checking for ${UMFPACK_DIR}/UMFPACK/Include/umfpack.h... " >&6; } + as_ac_File=`echo "ac_cv_file_${UMFPACK_DIR}/UMFPACK/Include/umfpack.h" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for ${UMFPACK_DIR}/UMFPACK/Include/umfpack.h" >&5 +echo $ECHO_N "checking for ${UMFPACK_DIR}/UMFPACK/Include/umfpack.h... $ECHO_C" >&6; } if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && - { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 -$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} { (exit 1); exit 1; }; } if test -r "${UMFPACK_DIR}/UMFPACK/Include/umfpack.h"; then eval "$as_ac_File=yes" @@ -15407,27 +15059,24 @@ else eval "$as_ac_File=no" fi fi -ac_res=`eval 'as_val=${'$as_ac_File'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_File'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then +ac_res=`eval echo '${'$as_ac_File'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_File'}'` = yes; then UMFPACK_INCLUDE_DIR=-I${UMFPACK_DIR}/UMFPACK/Include else - as_ac_File=`$as_echo "ac_cv_file_${UMFPACK_DIR}/include/suitesparse/umfpack.h" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for ${UMFPACK_DIR}/include/suitesparse/umfpack.h" >&5 -$as_echo_n "checking for ${UMFPACK_DIR}/include/suitesparse/umfpack.h... " >&6; } + as_ac_File=`echo "ac_cv_file_${UMFPACK_DIR}/include/suitesparse/umfpack.h" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for ${UMFPACK_DIR}/include/suitesparse/umfpack.h" >&5 +echo $ECHO_N "checking for ${UMFPACK_DIR}/include/suitesparse/umfpack.h... $ECHO_C" >&6; } if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && - { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 -$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} { (exit 1); exit 1; }; } if test -r "${UMFPACK_DIR}/include/suitesparse/umfpack.h"; then eval "$as_ac_File=yes" @@ -15435,20 +15084,17 @@ else eval "$as_ac_File=no" fi fi -ac_res=`eval 'as_val=${'$as_ac_File'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_File'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then +ac_res=`eval echo '${'$as_ac_File'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_File'}'` = yes; then UMFPACK_INCLUDE_DIR=-I${UMFPACK_DIR}/include/suitesparse else - { { $as_echo "$as_me:$LINENO: error: installation of UMFPACK could not be determined" >&5 -$as_echo "$as_me: error: installation of UMFPACK could not be determined" >&2;} + { { echo "$as_me:$LINENO: error: installation of UMFPACK could not be determined" >&5 +echo "$as_me: error: installation of UMFPACK could not be determined" >&2;} { (exit 1); exit 1; }; } @@ -15459,15 +15105,15 @@ fi fi - as_ac_File=`$as_echo "ac_cv_file_${UMFPACK_DIR}/AMD/Include/amd.h" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for ${UMFPACK_DIR}/AMD/Include/amd.h" >&5 -$as_echo_n "checking for ${UMFPACK_DIR}/AMD/Include/amd.h... " >&6; } + as_ac_File=`echo "ac_cv_file_${UMFPACK_DIR}/AMD/Include/amd.h" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for ${UMFPACK_DIR}/AMD/Include/amd.h" >&5 +echo $ECHO_N "checking for ${UMFPACK_DIR}/AMD/Include/amd.h... $ECHO_C" >&6; } if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && - { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 -$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} { (exit 1); exit 1; }; } if test -r "${UMFPACK_DIR}/AMD/Include/amd.h"; then eval "$as_ac_File=yes" @@ -15475,27 +15121,24 @@ else eval "$as_ac_File=no" fi fi -ac_res=`eval 'as_val=${'$as_ac_File'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_File'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then +ac_res=`eval echo '${'$as_ac_File'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_File'}'` = yes; then UMFPACK_INCLUDE_DIR="${UMFPACK_INCLUDE_DIR} -I${UMFPACK_DIR}/AMD/Include" else - as_ac_File=`$as_echo "ac_cv_file_${UMFPACK_DIR}/include/suitesparse/umfpack.h" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for ${UMFPACK_DIR}/include/suitesparse/umfpack.h" >&5 -$as_echo_n "checking for ${UMFPACK_DIR}/include/suitesparse/umfpack.h... " >&6; } + as_ac_File=`echo "ac_cv_file_${UMFPACK_DIR}/include/suitesparse/umfpack.h" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for ${UMFPACK_DIR}/include/suitesparse/umfpack.h" >&5 +echo $ECHO_N "checking for ${UMFPACK_DIR}/include/suitesparse/umfpack.h... $ECHO_C" >&6; } if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && - { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 -$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} { (exit 1); exit 1; }; } if test -r "${UMFPACK_DIR}/include/suitesparse/umfpack.h"; then eval "$as_ac_File=yes" @@ -15503,20 +15146,17 @@ else eval "$as_ac_File=no" fi fi -ac_res=`eval 'as_val=${'$as_ac_File'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_File'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then +ac_res=`eval echo '${'$as_ac_File'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_File'}'` = yes; then UMFPACK_INCLUDE_DIR="${UMFPACK_INCLUDE_DIR} -I${UMFPACK_DIR}/include/suitesparse" else - { { $as_echo "$as_me:$LINENO: error: installation of UMFPACK could not be determined" >&5 -$as_echo "$as_me: error: installation of UMFPACK could not be determined" >&2;} + { { echo "$as_me:$LINENO: error: installation of UMFPACK could not be determined" >&5 +echo "$as_me: error: installation of UMFPACK could not be determined" >&2;} { (exit 1); exit 1; }; } @@ -15528,15 +15168,15 @@ fi if test "x$DEAL_II_USE_INTERNAL_UMFPACK" != "xyes" ; then - as_ac_File=`$as_echo "ac_cv_file_${UMFPACK_DIR}/UFconfig/UFconfig.h" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for ${UMFPACK_DIR}/UFconfig/UFconfig.h" >&5 -$as_echo_n "checking for ${UMFPACK_DIR}/UFconfig/UFconfig.h... " >&6; } + as_ac_File=`echo "ac_cv_file_${UMFPACK_DIR}/UFconfig/UFconfig.h" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for ${UMFPACK_DIR}/UFconfig/UFconfig.h" >&5 +echo $ECHO_N "checking for ${UMFPACK_DIR}/UFconfig/UFconfig.h... $ECHO_C" >&6; } if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && - { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 -$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} { (exit 1); exit 1; }; } if test -r "${UMFPACK_DIR}/UFconfig/UFconfig.h"; then eval "$as_ac_File=yes" @@ -15544,20 +15184,17 @@ else eval "$as_ac_File=no" fi fi -ac_res=`eval 'as_val=${'$as_ac_File'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_File'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then +ac_res=`eval echo '${'$as_ac_File'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_File'}'` = yes; then UMFPACK_INCLUDE_DIR="${UMFPACK_INCLUDE_DIR} -I${UMFPACK_DIR}/UFconfig" else - { { $as_echo "$as_me:$LINENO: error: not found" >&5 -$as_echo "$as_me: error: not found" >&2;} + { { echo "$as_me:$LINENO: error: not found" >&5 +echo "$as_me: error: not found" >&2;} { (exit 1); exit 1; }; } @@ -15575,17 +15212,17 @@ fi CXXFLAGS="-I$UMFPACK_INCDIR $CXXFLAGS" CPPFLAGS="-I$UMFPACK_INCDIR $CPPFLAGS" if test "${ac_cv_header_umfpack_h+set}" = set; then - { $as_echo "$as_me:$LINENO: checking for umfpack.h" >&5 -$as_echo_n "checking for umfpack.h... " >&6; } + { echo "$as_me:$LINENO: checking for umfpack.h" >&5 +echo $ECHO_N "checking for umfpack.h... $ECHO_C" >&6; } if test "${ac_cv_header_umfpack_h+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_umfpack_h" >&5 -$as_echo "$ac_cv_header_umfpack_h" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_header_umfpack_h" >&5 +echo "${ECHO_T}$ac_cv_header_umfpack_h" >&6; } else # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking umfpack.h usability" >&5 -$as_echo_n "checking umfpack.h usability... " >&6; } +{ echo "$as_me:$LINENO: checking umfpack.h usability" >&5 +echo $ECHO_N "checking umfpack.h usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -15601,33 +15238,32 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then ac_header_compiler=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_header_compiler=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -{ $as_echo "$as_me:$LINENO: checking umfpack.h presence" >&5 -$as_echo_n "checking umfpack.h presence... " >&6; } +{ echo "$as_me:$LINENO: checking umfpack.h presence" >&5 +echo $ECHO_N "checking umfpack.h presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -15641,52 +15277,51 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null && { test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || test ! -s conftest.err }; then ac_header_preproc=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in yes:no: ) - { $as_echo "$as_me:$LINENO: WARNING: umfpack.h: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: umfpack.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: umfpack.h: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: umfpack.h: proceeding with the compiler's result" >&2;} + { echo "$as_me:$LINENO: WARNING: umfpack.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: umfpack.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: umfpack.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: umfpack.h: proceeding with the compiler's result" >&2;} ac_header_preproc=yes ;; no:yes:* ) - { $as_echo "$as_me:$LINENO: WARNING: umfpack.h: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: umfpack.h: present but cannot be compiled" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: umfpack.h: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: umfpack.h: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: umfpack.h: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: umfpack.h: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: umfpack.h: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: umfpack.h: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: umfpack.h: proceeding with the preprocessor's result" >&5 -$as_echo "$as_me: WARNING: umfpack.h: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: umfpack.h: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: umfpack.h: in the future, the compiler will take precedence" >&2;} + { echo "$as_me:$LINENO: WARNING: umfpack.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: umfpack.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: umfpack.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: umfpack.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: umfpack.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: umfpack.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: umfpack.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: umfpack.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: umfpack.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: umfpack.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: umfpack.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: umfpack.h: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX ## -------------------------------- ## ## Report this to dealii@dealii.org ## @@ -15695,39 +15330,39 @@ _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac -{ $as_echo "$as_me:$LINENO: checking for umfpack.h" >&5 -$as_echo_n "checking for umfpack.h... " >&6; } +{ echo "$as_me:$LINENO: checking for umfpack.h" >&5 +echo $ECHO_N "checking for umfpack.h... $ECHO_C" >&6; } if test "${ac_cv_header_umfpack_h+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_cv_header_umfpack_h=$ac_header_preproc fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_umfpack_h" >&5 -$as_echo "$ac_cv_header_umfpack_h" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_header_umfpack_h" >&5 +echo "${ECHO_T}$ac_cv_header_umfpack_h" >&6; } fi -if test "x$ac_cv_header_umfpack_h" = x""yes; then +if test $ac_cv_header_umfpack_h = yes; then : else - { { $as_echo "$as_me:$LINENO: error: installation of UMFPACK could not be determined" >&5 -$as_echo "$as_me: error: installation of UMFPACK could not be determined" >&2;} + { { echo "$as_me:$LINENO: error: installation of UMFPACK could not be determined" >&5 +echo "$as_me: error: installation of UMFPACK could not be determined" >&2;} { (exit 1); exit 1; }; } fi if test "${ac_cv_header_amd_h+set}" = set; then - { $as_echo "$as_me:$LINENO: checking for amd.h" >&5 -$as_echo_n "checking for amd.h... " >&6; } + { echo "$as_me:$LINENO: checking for amd.h" >&5 +echo $ECHO_N "checking for amd.h... $ECHO_C" >&6; } if test "${ac_cv_header_amd_h+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_amd_h" >&5 -$as_echo "$ac_cv_header_amd_h" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_header_amd_h" >&5 +echo "${ECHO_T}$ac_cv_header_amd_h" >&6; } else # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking amd.h usability" >&5 -$as_echo_n "checking amd.h usability... " >&6; } +{ echo "$as_me:$LINENO: checking amd.h usability" >&5 +echo $ECHO_N "checking amd.h usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -15743,33 +15378,32 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then ac_header_compiler=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_header_compiler=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -{ $as_echo "$as_me:$LINENO: checking amd.h presence" >&5 -$as_echo_n "checking amd.h presence... " >&6; } +{ echo "$as_me:$LINENO: checking amd.h presence" >&5 +echo $ECHO_N "checking amd.h presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -15783,52 +15417,51 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null && { test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || test ! -s conftest.err }; then ac_header_preproc=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in yes:no: ) - { $as_echo "$as_me:$LINENO: WARNING: amd.h: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: amd.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: amd.h: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: amd.h: proceeding with the compiler's result" >&2;} + { echo "$as_me:$LINENO: WARNING: amd.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: amd.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: amd.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: amd.h: proceeding with the compiler's result" >&2;} ac_header_preproc=yes ;; no:yes:* ) - { $as_echo "$as_me:$LINENO: WARNING: amd.h: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: amd.h: present but cannot be compiled" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: amd.h: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: amd.h: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: amd.h: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: amd.h: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: amd.h: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: amd.h: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: amd.h: proceeding with the preprocessor's result" >&5 -$as_echo "$as_me: WARNING: amd.h: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: amd.h: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: amd.h: in the future, the compiler will take precedence" >&2;} + { echo "$as_me:$LINENO: WARNING: amd.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: amd.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: amd.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: amd.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: amd.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: amd.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: amd.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: amd.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: amd.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: amd.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: amd.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: amd.h: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX ## -------------------------------- ## ## Report this to dealii@dealii.org ## @@ -15837,38 +15470,38 @@ _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac -{ $as_echo "$as_me:$LINENO: checking for amd.h" >&5 -$as_echo_n "checking for amd.h... " >&6; } +{ echo "$as_me:$LINENO: checking for amd.h" >&5 +echo $ECHO_N "checking for amd.h... $ECHO_C" >&6; } if test "${ac_cv_header_amd_h+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_cv_header_amd_h=$ac_header_preproc fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_amd_h" >&5 -$as_echo "$ac_cv_header_amd_h" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_header_amd_h" >&5 +echo "${ECHO_T}$ac_cv_header_amd_h" >&6; } fi -if test "x$ac_cv_header_amd_h" = x""yes; then +if test $ac_cv_header_amd_h = yes; then : else - { { $as_echo "$as_me:$LINENO: error: installation of UMFPACK could not be determined" >&5 -$as_echo "$as_me: error: installation of UMFPACK could not be determined" >&2;} + { { echo "$as_me:$LINENO: error: installation of UMFPACK could not be determined" >&5 +echo "$as_me: error: installation of UMFPACK could not be determined" >&2;} { (exit 1); exit 1; }; } fi if test "${ac_cv_header_UFconfig_h+set}" = set; then - { $as_echo "$as_me:$LINENO: checking for UFconfig.h" >&5 -$as_echo_n "checking for UFconfig.h... " >&6; } + { echo "$as_me:$LINENO: checking for UFconfig.h" >&5 +echo $ECHO_N "checking for UFconfig.h... $ECHO_C" >&6; } if test "${ac_cv_header_UFconfig_h+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_UFconfig_h" >&5 -$as_echo "$ac_cv_header_UFconfig_h" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_header_UFconfig_h" >&5 +echo "${ECHO_T}$ac_cv_header_UFconfig_h" >&6; } else # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking UFconfig.h usability" >&5 -$as_echo_n "checking UFconfig.h usability... " >&6; } +{ echo "$as_me:$LINENO: checking UFconfig.h usability" >&5 +echo $ECHO_N "checking UFconfig.h usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -15884,33 +15517,32 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then ac_header_compiler=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_header_compiler=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -{ $as_echo "$as_me:$LINENO: checking UFconfig.h presence" >&5 -$as_echo_n "checking UFconfig.h presence... " >&6; } +{ echo "$as_me:$LINENO: checking UFconfig.h presence" >&5 +echo $ECHO_N "checking UFconfig.h presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -15924,52 +15556,51 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null && { test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || test ! -s conftest.err }; then ac_header_preproc=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in yes:no: ) - { $as_echo "$as_me:$LINENO: WARNING: UFconfig.h: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: UFconfig.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: UFconfig.h: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: UFconfig.h: proceeding with the compiler's result" >&2;} + { echo "$as_me:$LINENO: WARNING: UFconfig.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: UFconfig.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: UFconfig.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: UFconfig.h: proceeding with the compiler's result" >&2;} ac_header_preproc=yes ;; no:yes:* ) - { $as_echo "$as_me:$LINENO: WARNING: UFconfig.h: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: UFconfig.h: present but cannot be compiled" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: UFconfig.h: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: UFconfig.h: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: UFconfig.h: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: UFconfig.h: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: UFconfig.h: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: UFconfig.h: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: UFconfig.h: proceeding with the preprocessor's result" >&5 -$as_echo "$as_me: WARNING: UFconfig.h: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: UFconfig.h: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: UFconfig.h: in the future, the compiler will take precedence" >&2;} + { echo "$as_me:$LINENO: WARNING: UFconfig.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: UFconfig.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: UFconfig.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: UFconfig.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: UFconfig.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: UFconfig.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: UFconfig.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: UFconfig.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: UFconfig.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: UFconfig.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: UFconfig.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: UFconfig.h: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX ## -------------------------------- ## ## Report this to dealii@dealii.org ## @@ -15978,32 +15609,32 @@ _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac -{ $as_echo "$as_me:$LINENO: checking for UFconfig.h" >&5 -$as_echo_n "checking for UFconfig.h... " >&6; } +{ echo "$as_me:$LINENO: checking for UFconfig.h" >&5 +echo $ECHO_N "checking for UFconfig.h... $ECHO_C" >&6; } if test "${ac_cv_header_UFconfig_h+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_cv_header_UFconfig_h=$ac_header_preproc fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_UFconfig_h" >&5 -$as_echo "$ac_cv_header_UFconfig_h" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_header_UFconfig_h" >&5 +echo "${ECHO_T}$ac_cv_header_UFconfig_h" >&6; } fi -if test "x$ac_cv_header_UFconfig_h" = x""yes; then +if test $ac_cv_header_UFconfig_h = yes; then : else - { { $as_echo "$as_me:$LINENO: error: installation of UMFPACK could not be determined" >&5 -$as_echo "$as_me: error: installation of UMFPACK could not be determined" >&2;} + { { echo "$as_me:$LINENO: error: installation of UMFPACK could not be determined" >&5 +echo "$as_me: error: installation of UMFPACK could not be determined" >&2;} { (exit 1); exit 1; }; } fi if test "x$UMFPACK_LIBDIR" != "x" ; then - { $as_echo "$as_me:$LINENO: checking for amd_info in -lamd" >&5 -$as_echo_n "checking for amd_info in -lamd... " >&6; } + { echo "$as_me:$LINENO: checking for amd_info in -lamd" >&5 +echo $ECHO_N "checking for amd_info in -lamd... $ECHO_C" >&6; } if test "${ac_cv_lib_amd_amd_info+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lamd $LIBS" @@ -16035,37 +15666,33 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_amd_amd_info=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_lib_amd_amd_info=no fi -rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_amd_amd_info" >&5 -$as_echo "$ac_cv_lib_amd_amd_info" >&6; } -if test "x$ac_cv_lib_amd_amd_info" = x""yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_lib_amd_amd_info" >&5 +echo "${ECHO_T}$ac_cv_lib_amd_amd_info" >&6; } +if test $ac_cv_lib_amd_amd_info = yes; then LIBS="$LIBS -lamd" @@ -16075,16 +15702,16 @@ if test "x$ac_cv_lib_amd_amd_info" = x""yes; then fi else - { { $as_echo "$as_me:$LINENO: error: installation of AMD could not be determined" >&5 -$as_echo "$as_me: error: installation of AMD could not be determined" >&2;} + { { echo "$as_me:$LINENO: error: installation of AMD could not be determined" >&5 +echo "$as_me: error: installation of AMD could not be determined" >&2;} { (exit 1); exit 1; }; } fi - { $as_echo "$as_me:$LINENO: checking for umfpack_di_defaults in -lumfpack" >&5 -$as_echo_n "checking for umfpack_di_defaults in -lumfpack... " >&6; } + { echo "$as_me:$LINENO: checking for umfpack_di_defaults in -lumfpack" >&5 +echo $ECHO_N "checking for umfpack_di_defaults in -lumfpack... $ECHO_C" >&6; } if test "${ac_cv_lib_umfpack_umfpack_di_defaults+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lumfpack $LIBS" @@ -16116,37 +15743,33 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_umfpack_umfpack_di_defaults=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_lib_umfpack_umfpack_di_defaults=no fi -rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_umfpack_umfpack_di_defaults" >&5 -$as_echo "$ac_cv_lib_umfpack_umfpack_di_defaults" >&6; } -if test "x$ac_cv_lib_umfpack_umfpack_di_defaults" = x""yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_lib_umfpack_umfpack_di_defaults" >&5 +echo "${ECHO_T}$ac_cv_lib_umfpack_umfpack_di_defaults" >&6; } +if test $ac_cv_lib_umfpack_umfpack_di_defaults = yes; then LIBS="$LIBS -lumfpack" @@ -16156,17 +15779,17 @@ if test "x$ac_cv_lib_umfpack_umfpack_di_defaults" = x""yes; then fi else - { { $as_echo "$as_me:$LINENO: error: installation of UMFPACK could not be determined" >&5 -$as_echo "$as_me: error: installation of UMFPACK could not be determined" >&2;} + { { echo "$as_me:$LINENO: error: installation of UMFPACK could not be determined" >&5 +echo "$as_me: error: installation of UMFPACK could not be determined" >&2;} { (exit 1); exit 1; }; } fi else - { $as_echo "$as_me:$LINENO: checking for amd_info in -lamd" >&5 -$as_echo_n "checking for amd_info in -lamd... " >&6; } + { echo "$as_me:$LINENO: checking for amd_info in -lamd" >&5 +echo $ECHO_N "checking for amd_info in -lamd... $ECHO_C" >&6; } if test "${ac_cv_lib_amd_amd_info+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lamd $LIBS" @@ -16198,53 +15821,49 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_amd_amd_info=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_lib_amd_amd_info=no fi -rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_amd_amd_info" >&5 -$as_echo "$ac_cv_lib_amd_amd_info" >&6; } -if test "x$ac_cv_lib_amd_amd_info" = x""yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_lib_amd_amd_info" >&5 +echo "${ECHO_T}$ac_cv_lib_amd_amd_info" >&6; } +if test $ac_cv_lib_amd_amd_info = yes; then LIBS="$LIBS -lamd" else - { { $as_echo "$as_me:$LINENO: error: installation of AMD could not be determined" >&5 -$as_echo "$as_me: error: installation of AMD could not be determined" >&2;} + { { echo "$as_me:$LINENO: error: installation of AMD could not be determined" >&5 +echo "$as_me: error: installation of AMD could not be determined" >&2;} { (exit 1); exit 1; }; } fi - { $as_echo "$as_me:$LINENO: checking for umfpack_di_defaults in -lumfpack" >&5 -$as_echo_n "checking for umfpack_di_defaults in -lumfpack... " >&6; } + { echo "$as_me:$LINENO: checking for umfpack_di_defaults in -lumfpack" >&5 +echo $ECHO_N "checking for umfpack_di_defaults in -lumfpack... $ECHO_C" >&6; } if test "${ac_cv_lib_umfpack_umfpack_di_defaults+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lumfpack $LIBS" @@ -16276,45 +15895,41 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_umfpack_umfpack_di_defaults=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_lib_umfpack_umfpack_di_defaults=no fi -rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_umfpack_umfpack_di_defaults" >&5 -$as_echo "$ac_cv_lib_umfpack_umfpack_di_defaults" >&6; } -if test "x$ac_cv_lib_umfpack_umfpack_di_defaults" = x""yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_lib_umfpack_umfpack_di_defaults" >&5 +echo "${ECHO_T}$ac_cv_lib_umfpack_umfpack_di_defaults" >&6; } +if test $ac_cv_lib_umfpack_umfpack_di_defaults = yes; then LIBS="$LIBS -lumfpack" else - { { $as_echo "$as_me:$LINENO: error: installation of UMFPACK could not be determined" >&5 -$as_echo "$as_me: error: installation of UMFPACK could not be determined" >&2;} + { { echo "$as_me:$LINENO: error: installation of UMFPACK could not be determined" >&5 +echo "$as_me: error: installation of UMFPACK could not be determined" >&2;} { (exit 1); exit 1; }; } fi @@ -16333,11 +15948,11 @@ if test "${with_lapack+set}" = set; then withval=$with_lapack; if test "x$withval" != "xno" ; then if test "x$withval" != "xyes" ; then lapack="$withval"; else lapack="lapack"; fi - as_ac_Lib=`$as_echo "ac_cv_lib_$lapack''_dgbsv_" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for dgbsv_ in -l$lapack" >&5 -$as_echo_n "checking for dgbsv_ in -l$lapack... " >&6; } + as_ac_Lib=`echo "ac_cv_lib_$lapack''_dgbsv_" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for dgbsv_ in -l$lapack" >&5 +echo $ECHO_N "checking for dgbsv_ in -l$lapack... $ECHO_C" >&6; } if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-l$lapack $LIBS" @@ -16369,41 +15984,34 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then eval "$as_ac_Lib=yes" else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 eval "$as_ac_Lib=no" fi -rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -ac_res=`eval 'as_val=${'$as_ac_Lib'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_Lib'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then +ac_res=`eval echo '${'$as_ac_Lib'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_Lib'}'` = yes; then LIBS="-l$lapack $LIBS" @@ -16414,8 +16022,8 @@ _ACEOF else - { { $as_echo "$as_me:$LINENO: error: LAPACK library $lapack not found" >&5 -$as_echo "$as_me: error: LAPACK library $lapack not found" >&2;} + { { echo "$as_me:$LINENO: error: LAPACK library $lapack not found" >&5 +echo "$as_me: error: LAPACK library $lapack not found" >&2;} { (exit 1); exit 1; }; } fi @@ -16426,10 +16034,10 @@ fi if test "x$with_blas" != "x" -a "x$with_blas" != "xno" ; then - { $as_echo "$as_me:$LINENO: checking for daxpy_" >&5 -$as_echo_n "checking for daxpy_... " >&6; } + { echo "$as_me:$LINENO: checking for daxpy_" >&5 +echo $ECHO_N "checking for daxpy_... $ECHO_C" >&6; } if test "${ac_cv_func_daxpy_+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -16482,40 +16090,36 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_func_daxpy_=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_func_daxpy_=no fi -rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_daxpy_" >&5 -$as_echo "$ac_cv_func_daxpy_" >&6; } -if test "x$ac_cv_func_daxpy_" = x""yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_func_daxpy_" >&5 +echo "${ECHO_T}$ac_cv_func_daxpy_" >&6; } +if test $ac_cv_func_daxpy_ = yes; then : else - { { $as_echo "$as_me:$LINENO: error: BLAS library not installed correctly($with_blas)" >&5 -$as_echo "$as_me: error: BLAS library not installed correctly($with_blas)" >&2;} + { { echo "$as_me:$LINENO: error: BLAS library not installed correctly($with_blas)" >&5 +echo "$as_me: error: BLAS library not installed correctly($with_blas)" >&2;} { (exit 1); exit 1; }; } fi @@ -16531,11 +16135,11 @@ fi for ac_func in daxpy_ saxpy_ dgemv_ sgemv_ dgeev_ sgeev_ dgeevx_ sgeevx_ do -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 -$as_echo_n "checking for $ac_func... " >&6; } +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -16588,42 +16192,35 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then eval "$as_ac_var=yes" else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 eval "$as_ac_var=no" fi -rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi -ac_res=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF fi @@ -16639,11 +16236,11 @@ done for ac_func in dgesvd_ sgesvd_ dgemm_ sgemm_ dgetrf_ sgetrf_ dgetri_ sgetri_ do -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 -$as_echo_n "checking for $ac_func... " >&6; } +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -16696,42 +16293,35 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then eval "$as_ac_var=yes" else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 eval "$as_ac_var=no" fi -rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi -ac_res=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF fi @@ -16743,11 +16333,11 @@ done for ac_func in dgetrs_ sgetrs_ dstev_ sstev_ do -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 -$as_echo_n "checking for $ac_func... " >&6; } +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -16800,42 +16390,35 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then eval "$as_ac_var=yes" else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 eval "$as_ac_var=no" fi -rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi -ac_res=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF fi @@ -16849,10 +16432,10 @@ done -{ $as_echo "$as_me:$LINENO: result: " >&5 -$as_echo "" >&6; } -{ $as_echo "$as_me:$LINENO: result: ------------------ checking compiler flags ------------------" >&5 -$as_echo "------------------ checking compiler flags ------------------" >&6; } +{ echo "$as_me:$LINENO: result: " >&5 +echo "${ECHO_T}" >&6; } +{ echo "$as_me:$LINENO: result: ------------------ checking compiler flags ------------------" >&5 +echo "${ECHO_T}------------------ checking compiler flags ------------------" >&6; } @@ -16863,12 +16446,12 @@ else withcpu="" fi - { $as_echo "$as_me:$LINENO: checking for CPU to optimize for" >&5 -$as_echo_n "checking for CPU to optimize for... " >&6; } + { echo "$as_me:$LINENO: checking for CPU to optimize for" >&5 +echo $ECHO_N "checking for CPU to optimize for... $ECHO_C" >&6; } case "$withcpu" in PowerPC64) - { $as_echo "$as_me:$LINENO: result: PowerPC64" >&5 -$as_echo "PowerPC64" >&6; } + { echo "$as_me:$LINENO: result: PowerPC64" >&5 +echo "${ECHO_T}PowerPC64" >&6; } case "$GXX_VERSION" in gcc*) CXXFLAGSG="$CXXFLAGSG -maix64" @@ -16890,8 +16473,8 @@ $as_echo "PowerPC64" >&6; } esac ;; athlon* | pentium* | i386 | i486 | i586 | i686 | k6* | winchip* | opteron) - { $as_echo "$as_me:$LINENO: result: x86 derivate ($withcpu)" >&5 -$as_echo "x86 derivate ($withcpu)" >&6; } + { echo "$as_me:$LINENO: result: x86 derivate ($withcpu)" >&5 +echo "${ECHO_T}x86 derivate ($withcpu)" >&6; } case "$GXX_VERSION" in gcc*) CXXFLAGSO="$CXXFLAGSO -march=$withcpu" @@ -16901,15 +16484,15 @@ $as_echo "x86 derivate ($withcpu)" >&6; } esac ;; *) - { $as_echo "$as_me:$LINENO: result: none given or not recognized" >&5 -$as_echo "none given or not recognized" >&6; } + { echo "$as_me:$LINENO: result: none given or not recognized" >&5 +echo "${ECHO_T}none given or not recognized" >&6; } ;; esac - { $as_echo "$as_me:$LINENO: checking for consistency of CXXFLAGSG flags" >&5 -$as_echo_n "checking for consistency of CXXFLAGSG flags... " >&6; } + { echo "$as_me:$LINENO: checking for consistency of CXXFLAGSG flags" >&5 +echo $ECHO_N "checking for consistency of CXXFLAGSG flags... $ECHO_C" >&6; } ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -16938,29 +16521,28 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { { $as_echo "$as_me:$LINENO: error: invalid combination of flags!" >&5 -$as_echo "$as_me: error: invalid combination of flags!" >&2;} + { { echo "$as_me:$LINENO: error: invalid combination of flags!" >&5 +echo "$as_me: error: invalid combination of flags!" >&2;} { (exit 1); exit 1; }; } exit 1; @@ -16968,8 +16550,8 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - { $as_echo "$as_me:$LINENO: checking for consistency of CXXFLAGSO flags" >&5 -$as_echo_n "checking for consistency of CXXFLAGSO flags... " >&6; } + { echo "$as_me:$LINENO: checking for consistency of CXXFLAGSO flags" >&5 +echo $ECHO_N "checking for consistency of CXXFLAGSO flags... $ECHO_C" >&6; } CXXFLAGS="$CXXFLAGSO" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -16992,29 +16574,28 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { { $as_echo "$as_me:$LINENO: error: invalid combination of flags!" >&5 -$as_echo "$as_me: error: invalid combination of flags!" >&2;} + { { echo "$as_me:$LINENO: error: invalid combination of flags!" >&5 +echo "$as_me: error: invalid combination of flags!" >&2;} { (exit 1); exit 1; }; } exit 1; @@ -17029,10 +16610,10 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: " >&5 -$as_echo "" >&6; } -{ $as_echo "$as_me:$LINENO: result: ---------------- configuring other programs -----------------" >&5 -$as_echo "---------------- configuring other programs -----------------" >&6; } +{ echo "$as_me:$LINENO: result: " >&5 +echo "${ECHO_T}" >&6; } +{ echo "$as_me:$LINENO: result: ---------------- configuring other programs -----------------" >&5 +echo "${ECHO_T}---------------- configuring other programs -----------------" >&6; } @@ -17045,25 +16626,25 @@ fi if test "x$DOXYGEN" != "x" ; then - { $as_echo "$as_me:$LINENO: checking for specified doxygen path" >&5 -$as_echo_n "checking for specified doxygen path... " >&6; } + { echo "$as_me:$LINENO: checking for specified doxygen path" >&5 +echo $ECHO_N "checking for specified doxygen path... $ECHO_C" >&6; } if test -r $DOXYGEN ; then - { $as_echo "$as_me:$LINENO: result: $DOXYGEN" >&5 -$as_echo "$DOXYGEN" >&6; } + { echo "$as_me:$LINENO: result: $DOXYGEN" >&5 +echo "${ECHO_T}$DOXYGEN" >&6; } else - { $as_echo "$as_me:$LINENO: result: not found" >&5 -$as_echo "not found" >&6; } - { { $as_echo "$as_me:$LINENO: error: Invalid doxygen path $DOXYGEN" >&5 -$as_echo "$as_me: error: Invalid doxygen path $DOXYGEN" >&2;} + { echo "$as_me:$LINENO: result: not found" >&5 +echo "${ECHO_T}not found" >&6; } + { { echo "$as_me:$LINENO: error: Invalid doxygen path $DOXYGEN" >&5 +echo "$as_me: error: Invalid doxygen path $DOXYGEN" >&2;} { (exit 1); exit 1; }; } fi else # Extract the first word of "doxygen", so it can be a program name with args. set dummy doxygen; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_DOXYGEN+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $DOXYGEN in [\\/]* | ?:[\\/]*) @@ -17078,7 +16659,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_DOXYGEN="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -17090,11 +16671,11 @@ esac fi DOXYGEN=$ac_cv_path_DOXYGEN if test -n "$DOXYGEN"; then - { $as_echo "$as_me:$LINENO: result: $DOXYGEN" >&5 -$as_echo "$DOXYGEN" >&6; } + { echo "$as_me:$LINENO: result: $DOXYGEN" >&5 +echo "${ECHO_T}$DOXYGEN" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi @@ -17104,20 +16685,20 @@ fi fi if test "x$doxygen_not_found" != "xyes" ; then - { $as_echo "$as_me:$LINENO: checking doxygen version" >&5 -$as_echo_n "checking doxygen version... " >&6; } + { echo "$as_me:$LINENO: checking doxygen version" >&5 +echo $ECHO_N "checking doxygen version... $ECHO_C" >&6; } DOXYGEN_VERSION_STRING=`($DOXYGEN -v 2>&1) | grep "oxygen version"` case "$DOXYGEN_VERSION_STRING" in *1.3.* | *1.4.*) DOXYGEN_OPTIONS="options.136" - { $as_echo "$as_me:$LINENO: result: pre 1.5" >&5 -$as_echo "pre 1.5" >&6; } + { echo "$as_me:$LINENO: result: pre 1.5" >&5 +echo "${ECHO_T}pre 1.5" >&6; } ;; *) DOXYGEN_OPTIONS="options.dox" - { $as_echo "$as_me:$LINENO: result: 1.5.x or later" >&5 -$as_echo "1.5.x or later" >&6; } + { echo "$as_me:$LINENO: result: 1.5.x or later" >&5 +echo "${ECHO_T}1.5.x or later" >&6; } ;; esac fi @@ -17125,10 +16706,10 @@ $as_echo "1.5.x or later" >&6; } # Extract the first word of "dot", so it can be a program name with args. set dummy dot; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_DOT+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$DOT"; then ac_cv_prog_DOT="$DOT" # Let the user override the test. @@ -17141,7 +16722,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_DOT="dot" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -17152,11 +16733,11 @@ fi fi DOT=$ac_cv_prog_DOT if test -n "$DOT"; then - { $as_echo "$as_me:$LINENO: result: $DOT" >&5 -$as_echo "$DOT" >&6; } + { echo "$as_me:$LINENO: result: $DOT" >&5 +echo "${ECHO_T}$DOT" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi @@ -17173,10 +16754,10 @@ fi # Extract the first word of "perl", so it can be a program name with args. set dummy perl; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_PERL+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $PERL in [\\/]* | ?:[\\/]*) @@ -17191,7 +16772,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -17203,11 +16784,11 @@ esac fi PERL=$ac_cv_path_PERL if test -n "$PERL"; then - { $as_echo "$as_me:$LINENO: result: $PERL" >&5 -$as_echo "$PERL" >&6; } + { echo "$as_me:$LINENO: result: $PERL" >&5 +echo "${ECHO_T}$PERL" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi @@ -17217,8 +16798,6 @@ fi - - subdirs="$subdirs contrib tests" @@ -17226,10 +16805,10 @@ subdirs="$subdirs contrib tests" -{ $as_echo "$as_me:$LINENO: result: " >&5 -$as_echo "" >&6; } -{ $as_echo "$as_me:$LINENO: result: --------------------- generating output ---------------------" >&5 -$as_echo "--------------------- generating output ---------------------" >&6; } +{ echo "$as_me:$LINENO: result: " >&5 +echo "${ECHO_T}" >&6; } +{ echo "$as_me:$LINENO: result: --------------------- generating output ---------------------" >&5 +echo "${ECHO_T}--------------------- generating output ---------------------" >&6; } @@ -17273,7 +16852,7 @@ ac_ltlibobjs= for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue # 1. Remove the extension, and $U if already installed. ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' - ac_i=`$as_echo "$ac_i" | sed "$ac_script"` + ac_i=`echo "$ac_i" | sed "$ac_script"` # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR # will be set to the directory where LIBOBJS objects are built. ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext" @@ -17286,12 +16865,11 @@ LTLIBOBJS=$ac_ltlibobjs : ${CONFIG_STATUS=./config.status} -ac_write_fail=0 ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 -$as_echo "$as_me: creating $CONFIG_STATUS" >&6;} -cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 +echo "$as_me: creating $CONFIG_STATUS" >&6;} +cat >$CONFIG_STATUS <<_ACEOF #! $SHELL # Generated by $as_me. # Run this file to recreate the current configuration. @@ -17304,7 +16882,7 @@ ac_cs_silent=false SHELL=\${CONFIG_SHELL-$SHELL} _ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +cat >>$CONFIG_STATUS <<\_ACEOF ## --------------------- ## ## M4sh Initialization. ## ## --------------------- ## @@ -17314,7 +16892,7 @@ DUALCASE=1; export DUALCASE # for MKS sh if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: - # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which + # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST @@ -17336,45 +16914,17 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS as_cr_digits='0123456789' as_cr_alnum=$as_cr_Letters$as_cr_digits -as_nl=' -' -export as_nl -# Printing a long string crashes Solaris 7 /usr/bin/printf. -as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' -as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo -as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo -if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then - as_echo='printf %s\n' - as_echo_n='printf %s' -else - if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then - as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' - as_echo_n='/usr/ucb/echo -n' - else - as_echo_body='eval expr "X$1" : "X\\(.*\\)"' - as_echo_n_body='eval - arg=$1; - case $arg in - *"$as_nl"*) - expr "X$arg" : "X\\(.*\\)$as_nl"; - arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; - esac; - expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" - ' - export as_echo_n_body - as_echo_n='sh -c $as_echo_n_body as_echo' - fi - export as_echo_body - as_echo='sh -c $as_echo_body as_echo' -fi - # The user is always right. if test "${PATH_SEPARATOR+set}" != set; then - PATH_SEPARATOR=: - (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { - (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || - PATH_SEPARATOR=';' - } + echo "#! /bin/sh" >conf$$.sh + echo "exit 0" >>conf$$.sh + chmod +x conf$$.sh + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then + PATH_SEPARATOR=';' + else + PATH_SEPARATOR=: + fi + rm -f conf$$.sh fi # Support unset when possible. @@ -17390,6 +16940,8 @@ fi # there to prevent editors from complaining about space-tab. # (If _AS_PATH_WALK were called with IFS unset, it would disable word # splitting by setting IFS to empty value.) +as_nl=' +' IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. @@ -17412,7 +16964,7 @@ if test "x$as_myself" = x; then as_myself=$0 fi if test ! -f "$as_myself"; then - $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 { (exit 1); exit 1; } fi @@ -17425,10 +16977,17 @@ PS2='> ' PS4='+ ' # NLS nuisances. -LC_ALL=C -export LC_ALL -LANGUAGE=C -export LANGUAGE +for as_var in \ + LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ + LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ + LC_TELEPHONE LC_TIME +do + if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then + eval $as_var=C; export $as_var + else + ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var + fi +done # Required to use basename. if expr a : '\(a\)' >/dev/null 2>&1 && @@ -17450,7 +17009,7 @@ as_me=`$as_basename -- "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ X"$0" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X/"$0" | +echo X/"$0" | sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/ q @@ -17501,7 +17060,7 @@ $as_unset CDPATH s/-\n.*// ' >$as_me.lineno && chmod +x "$as_me.lineno" || - { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 + { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 { (exit 1); exit 1; }; } # Don't try to exec as it changes $[0], causing all sort of problems @@ -17529,6 +17088,7 @@ case `echo -n x` in *) ECHO_N='-n';; esac + if expr a : '\(a\)' >/dev/null 2>&1 && test "X`expr 00001 : '.*\(...\)'`" = X001; then as_expr=expr @@ -17541,22 +17101,19 @@ if test -d conf$$.dir; then rm -f conf$$.dir/conf$$.file else rm -f conf$$.dir - mkdir conf$$.dir 2>/dev/null -fi -if (echo >conf$$.file) 2>/dev/null; then - if ln -s conf$$.file conf$$ 2>/dev/null; then - as_ln_s='ln -s' - # ... but there are two gotchas: - # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. - # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. - ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' - elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln - else + mkdir conf$$.dir +fi +echo >conf$$.file +if ln -s conf$$.file conf$$ 2>/dev/null; then + as_ln_s='ln -s' + # ... but there are two gotchas: + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. + # In both cases, we have to default to `cp -p'. + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || as_ln_s='cp -p' - fi +elif ln conf$$.file conf$$ 2>/dev/null; then + as_ln_s=ln else as_ln_s='cp -p' fi @@ -17581,10 +17138,10 @@ else as_test_x=' eval sh -c '\'' if test -d "$1"; then - test -d "$1/."; + test -d "$1/."; else case $1 in - -*)set "./$1";; + -*)set "./$1";; esac; case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in ???[sx]*):;;*)false;;esac;fi @@ -17607,7 +17164,7 @@ exec 6>&1 # values after options handling. ac_log=" This file was extended by deal.II $as_me 6.2.pre, which was -generated by GNU Autoconf 2.63. Invocation command line was +generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -17620,39 +17177,29 @@ on `(hostname || uname -n) 2>/dev/null | sed 1q` _ACEOF -case $ac_config_files in *" -"*) set x $ac_config_files; shift; ac_config_files=$*;; -esac - -case $ac_config_headers in *" -"*) set x $ac_config_headers; shift; ac_config_headers=$*;; -esac - - -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +cat >>$CONFIG_STATUS <<_ACEOF # Files that config.status was made for. config_files="$ac_config_files" config_headers="$ac_config_headers" _ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +cat >>$CONFIG_STATUS <<\_ACEOF ac_cs_usage="\ \`$as_me' instantiates files from templates according to the current configuration. -Usage: $0 [OPTION]... [FILE]... +Usage: $0 [OPTIONS] [FILE]... -h, --help print this help, then exit -V, --version print version number and configuration settings, then exit - -q, --quiet, --silent - do not print progress messages + -q, --quiet do not print progress messages -d, --debug don't remove temporary files --recheck update $as_me by reconfiguring in the same conditions - --file=FILE[:TEMPLATE] - instantiate the configuration file FILE - --header=FILE[:TEMPLATE] - instantiate the configuration header FILE + --file=FILE[:TEMPLATE] + instantiate the configuration file FILE + --header=FILE[:TEMPLATE] + instantiate the configuration header FILE Configuration files: $config_files @@ -17663,23 +17210,23 @@ $config_headers Report bugs to ." _ACEOF -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ deal.II config.status 6.2.pre -configured by $0, generated by GNU Autoconf 2.63, - with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" +configured by $0, generated by GNU Autoconf 2.61, + with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" -Copyright (C) 2008 Free Software Foundation, Inc. +Copyright (C) 2006 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." ac_pwd='$ac_pwd' srcdir='$srcdir' -test -n "\$AWK" || AWK=awk _ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -# The default lists apply if the user does not specify any file. +cat >>$CONFIG_STATUS <<\_ACEOF +# If no file are specified by the user, then we need to provide default +# value. By we need to know if files were specified by the user. ac_need_defaults=: while test $# != 0 do @@ -17701,36 +17248,30 @@ do -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) ac_cs_recheck=: ;; --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) - $as_echo "$ac_cs_version"; exit ;; + echo "$ac_cs_version"; exit ;; --debug | --debu | --deb | --de | --d | -d ) debug=: ;; --file | --fil | --fi | --f ) $ac_shift - case $ac_optarg in - *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; - esac - CONFIG_FILES="$CONFIG_FILES '$ac_optarg'" + CONFIG_FILES="$CONFIG_FILES $ac_optarg" ac_need_defaults=false;; --header | --heade | --head | --hea ) $ac_shift - case $ac_optarg in - *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; - esac - CONFIG_HEADERS="$CONFIG_HEADERS '$ac_optarg'" + CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg" ac_need_defaults=false;; --he | --h) # Conflict between --help and --header - { $as_echo "$as_me: error: ambiguous option: $1 + { echo "$as_me: error: ambiguous option: $1 Try \`$0 --help' for more information." >&2 { (exit 1); exit 1; }; };; --help | --hel | -h ) - $as_echo "$ac_cs_usage"; exit ;; + echo "$ac_cs_usage"; exit ;; -q | -quiet | --quiet | --quie | --qui | --qu | --q \ | -silent | --silent | --silen | --sile | --sil | --si | --s) ac_cs_silent=: ;; # This is an error. - -*) { $as_echo "$as_me: error: unrecognized option: $1 + -*) { echo "$as_me: error: unrecognized option: $1 Try \`$0 --help' for more information." >&2 { (exit 1); exit 1; }; } ;; @@ -17749,32 +17290,30 @@ if $ac_cs_silent; then fi _ACEOF -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +cat >>$CONFIG_STATUS <<_ACEOF if \$ac_cs_recheck; then - set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion - shift - \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 - CONFIG_SHELL='$SHELL' + echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 + CONFIG_SHELL=$SHELL export CONFIG_SHELL - exec "\$@" + exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion fi _ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +cat >>$CONFIG_STATUS <<\_ACEOF exec 5>>config.log { echo sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX ## Running $as_me. ## _ASBOX - $as_echo "$ac_log" + echo "$ac_log" } >&5 _ACEOF -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +cat >>$CONFIG_STATUS <<_ACEOF _ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +cat >>$CONFIG_STATUS <<\_ACEOF # Handling of arguments. for ac_config_target in $ac_config_targets @@ -17783,8 +17322,8 @@ do "base/include/base/config.h") CONFIG_HEADERS="$CONFIG_HEADERS base/include/base/config.h" ;; "$process_files") CONFIG_FILES="$CONFIG_FILES $process_files" ;; - *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 -$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;} + *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 +echo "$as_me: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; esac done @@ -17824,144 +17363,247 @@ $debug || (umask 077 && mkdir "$tmp") } || { - $as_echo "$as_me: cannot create a temporary directory in ." >&2 + echo "$me: cannot create a temporary directory in ." >&2 { (exit 1); exit 1; } } -# Set up the scripts for CONFIG_FILES section. -# No need to generate them if there are no CONFIG_FILES. -# This happens for instance with `./config.status config.h'. +# +# Set up the sed scripts for CONFIG_FILES section. +# + +# No need to generate the scripts if there are no CONFIG_FILES. +# This happens for instance when ./config.status config.h if test -n "$CONFIG_FILES"; then +_ACEOF -ac_cr=' ' -ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' /dev/null` -if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then - ac_cs_awk_cr='\\r' -else - ac_cs_awk_cr=$ac_cr + + +ac_delim='%!_!# ' +for ac_last_try in false false false false false :; do + cat >conf$$subs.sed <<_ACEOF +SHELL!$SHELL$ac_delim +PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim +PACKAGE_NAME!$PACKAGE_NAME$ac_delim +PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim +PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim +PACKAGE_STRING!$PACKAGE_STRING$ac_delim +PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim +exec_prefix!$exec_prefix$ac_delim +prefix!$prefix$ac_delim +program_transform_name!$program_transform_name$ac_delim +bindir!$bindir$ac_delim +sbindir!$sbindir$ac_delim +libexecdir!$libexecdir$ac_delim +datarootdir!$datarootdir$ac_delim +datadir!$datadir$ac_delim +sysconfdir!$sysconfdir$ac_delim +sharedstatedir!$sharedstatedir$ac_delim +localstatedir!$localstatedir$ac_delim +includedir!$includedir$ac_delim +oldincludedir!$oldincludedir$ac_delim +docdir!$docdir$ac_delim +infodir!$infodir$ac_delim +htmldir!$htmldir$ac_delim +dvidir!$dvidir$ac_delim +pdfdir!$pdfdir$ac_delim +psdir!$psdir$ac_delim +libdir!$libdir$ac_delim +localedir!$localedir$ac_delim +mandir!$mandir$ac_delim +DEFS!$DEFS$ac_delim +ECHO_C!$ECHO_C$ac_delim +ECHO_N!$ECHO_N$ac_delim +ECHO_T!$ECHO_T$ac_delim +LIBS!$LIBS$ac_delim +build_alias!$build_alias$ac_delim +host_alias!$host_alias$ac_delim +target_alias!$target_alias$ac_delim +DEAL_II_MAJOR!$DEAL_II_MAJOR$ac_delim +DEAL_II_MINOR!$DEAL_II_MINOR$ac_delim +DEAL_II_PATH!$DEAL_II_PATH$ac_delim +DEAL2_DIR!$DEAL2_DIR$ac_delim +build!$build$ac_delim +build_cpu!$build_cpu$ac_delim +build_vendor!$build_vendor$ac_delim +build_os!$build_os$ac_delim +host!$host$ac_delim +host_cpu!$host_cpu$ac_delim +host_vendor!$host_vendor$ac_delim +host_os!$host_os$ac_delim +target!$target$ac_delim +target_cpu!$target_cpu$ac_delim +target_vendor!$target_vendor$ac_delim +target_os!$target_os$ac_delim +CC!$CC$ac_delim +CFLAGS!$CFLAGS$ac_delim +LDFLAGS!$LDFLAGS$ac_delim +CPPFLAGS!$CPPFLAGS$ac_delim +ac_ct_CC!$ac_ct_CC$ac_delim +EXEEXT!$EXEEXT$ac_delim +OBJEXT!$OBJEXT$ac_delim +CXX!$CXX$ac_delim +CXXFLAGS!$CXXFLAGS$ac_delim +ac_ct_CXX!$ac_ct_CXX$ac_delim +GXX_VERSION!$GXX_VERSION$ac_delim +GXX_VERSION_DETAILED!$GXX_VERSION_DETAILED$ac_delim +DEAL_II_COMPILER_SUPPORTS_MPI!$DEAL_II_COMPILER_SUPPORTS_MPI$ac_delim +CXXFLAGSG!$CXXFLAGSG$ac_delim +CXXFLAGSO!$CXXFLAGSO$ac_delim +CXXFLAGSPIC!$CXXFLAGSPIC$ac_delim +SHLIBLD!$SHLIBLD$ac_delim +SHLIBFLAGS!$SHLIBFLAGS$ac_delim +CC_VERSION!$CC_VERSION$ac_delim +CFLAGSPIC!$CFLAGSPIC$ac_delim +enablemultithreading!$enablemultithreading$ac_delim +withmultithreading!$withmultithreading$ac_delim +CXXCPP!$CXXCPP$ac_delim +GREP!$GREP$ac_delim +EGREP!$EGREP$ac_delim +BOOST_INCLUDE_DIR!$BOOST_INCLUDE_DIR$ac_delim +F77!$F77$ac_delim +F77_VERSION!$F77_VERSION$ac_delim +F77FLAGSO!$F77FLAGSO$ac_delim +F77FLAGSG!$F77FLAGSG$ac_delim +F77FLAGSPIC!$F77FLAGSPIC$ac_delim +F77LIBS!$F77LIBS$ac_delim +DEAL_II_LD_UNDERSTANDS_SONAME!$DEAL_II_LD_UNDERSTANDS_SONAME$ac_delim +DEAL_II_LD_UNDERSTANDS_DYLIB_INSTALL_NAME!$DEAL_II_LD_UNDERSTANDS_DYLIB_INSTALL_NAME$ac_delim +enableshared!$enableshared$ac_delim +static_lib_suffix!$static_lib_suffix$ac_delim +shared_lib_suffix!$shared_lib_suffix$ac_delim +AR!$AR$ac_delim +RANLIB!$RANLIB$ac_delim +enableparser!$enableparser$ac_delim +DEAL_II_DISABLE_PARSER!$DEAL_II_DISABLE_PARSER$ac_delim +DEAL_II_EXPAND_PETSC_VECTOR!$DEAL_II_EXPAND_PETSC_VECTOR$ac_delim +DEAL_II_EXPAND_PETSC_BLOCKVECTOR!$DEAL_II_EXPAND_PETSC_BLOCKVECTOR$ac_delim +USE_CONTRIB_PETSC!$USE_CONTRIB_PETSC$ac_delim +_ACEOF + + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then + break + elif $ac_last_try; then + { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} + { (exit 1); exit 1; }; } + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " + fi +done + +ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` +if test -n "$ac_eof"; then + ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` + ac_eof=`expr $ac_eof + 1` fi -echo 'BEGIN {' >"$tmp/subs1.awk" && +cat >>$CONFIG_STATUS <<_ACEOF +cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof +/@[a-zA-Z_][a-zA-Z_0-9]*@/!b +_ACEOF +sed ' +s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g +s/^/s,@/; s/!/@,|#_!!_#|/ +:n +t n +s/'"$ac_delim"'$/,g/; t +s/$/\\/; p +N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n +' >>$CONFIG_STATUS >$CONFIG_STATUS <<_ACEOF +CEOF$ac_eof _ACEOF -{ - echo "cat >conf$$subs.awk <<_ACEOF" && - echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && - echo "_ACEOF" -} >conf$$subs.sh || - { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} - { (exit 1); exit 1; }; } -ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'` ac_delim='%!_!# ' for ac_last_try in false false false false false :; do - . ./conf$$subs.sh || - { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} - { (exit 1); exit 1; }; } - - ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` - if test $ac_delim_n = $ac_delim_num; then + cat >conf$$subs.sed <<_ACEOF +DEAL_II_PETSC_DIR!$DEAL_II_PETSC_DIR$ac_delim +DEAL_II_PETSC_ARCH!$DEAL_II_PETSC_ARCH$ac_delim +DEAL_II_PETSC_VERSION_MAJOR!$DEAL_II_PETSC_VERSION_MAJOR$ac_delim +DEAL_II_PETSC_VERSION_MINOR!$DEAL_II_PETSC_VERSION_MINOR$ac_delim +DEAL_II_PETSC_VERSION_SUBMINOR!$DEAL_II_PETSC_VERSION_SUBMINOR$ac_delim +DEAL_II_PETSC_MPIUNI_LIB!$DEAL_II_PETSC_MPIUNI_LIB$ac_delim +DEAL_II_DEFINE_DEAL_II_USE_PETSC!$DEAL_II_DEFINE_DEAL_II_USE_PETSC$ac_delim +USE_CONTRIB_SLEPC!$USE_CONTRIB_SLEPC$ac_delim +DEAL_II_SLEPC_DIR!$DEAL_II_SLEPC_DIR$ac_delim +DEAL_II_SLEPC_ARCH!$DEAL_II_SLEPC_ARCH$ac_delim +DEAL_II_SLEPC_VERSION_MAJOR!$DEAL_II_SLEPC_VERSION_MAJOR$ac_delim +DEAL_II_SLEPC_VERSION_MINOR!$DEAL_II_SLEPC_VERSION_MINOR$ac_delim +DEAL_II_SLEPC_VERSION_SUBMINOR!$DEAL_II_SLEPC_VERSION_SUBMINOR$ac_delim +DEAL_II_DEFINE_DEAL_II_USE_SLEPC!$DEAL_II_DEFINE_DEAL_II_USE_SLEPC$ac_delim +DEAL_II_EXPAND_TRILINOS_VECTOR!$DEAL_II_EXPAND_TRILINOS_VECTOR$ac_delim +DEAL_II_EXPAND_TRILINOS_MPI_VECTOR!$DEAL_II_EXPAND_TRILINOS_MPI_VECTOR$ac_delim +DEAL_II_EXPAND_TRILINOS_BLOCKVECTOR!$DEAL_II_EXPAND_TRILINOS_BLOCKVECTOR$ac_delim +DEAL_II_EXPAND_TRILINOS_MPI_BLOCKVECTOR!$DEAL_II_EXPAND_TRILINOS_MPI_BLOCKVECTOR$ac_delim +DEAL_II_EXPAND_TRILINOS_SPARSITY_PATTERN!$DEAL_II_EXPAND_TRILINOS_SPARSITY_PATTERN$ac_delim +DEAL_II_EXPAND_TRILINOS_BLOCK_SPARSITY_PATTERN!$DEAL_II_EXPAND_TRILINOS_BLOCK_SPARSITY_PATTERN$ac_delim +USE_CONTRIB_TRILINOS!$USE_CONTRIB_TRILINOS$ac_delim +DEAL_II_TRILINOS_INCDIR!$DEAL_II_TRILINOS_INCDIR$ac_delim +DEAL_II_TRILINOS_LIBDIR!$DEAL_II_TRILINOS_LIBDIR$ac_delim +DEAL_II_TRILINOS_SHARED!$DEAL_II_TRILINOS_SHARED$ac_delim +DEAL_II_TRILINOS_STATIC!$DEAL_II_TRILINOS_STATIC$ac_delim +NEEDS_F77LIBS!$NEEDS_F77LIBS$ac_delim +HSL_INCLUDE_DIR!$HSL_INCLUDE_DIR$ac_delim +USE_CONTRIB_HSL!$USE_CONTRIB_HSL$ac_delim +TECPLOT_INCLUDE_DIR!$TECPLOT_INCLUDE_DIR$ac_delim +USE_CONTRIB_METIS!$USE_CONTRIB_METIS$ac_delim +DEAL_II_METIS_INCDIR!$DEAL_II_METIS_INCDIR$ac_delim +DEAL_II_METIS_LIBDIR!$DEAL_II_METIS_LIBDIR$ac_delim +UMFPACK_LIB!$UMFPACK_LIB$ac_delim +UMFPACK_INCLUDE_DIR!$UMFPACK_INCLUDE_DIR$ac_delim +USE_CONTRIB_UMFPACK!$USE_CONTRIB_UMFPACK$ac_delim +DOXYGEN!$DOXYGEN$ac_delim +DOT!$DOT$ac_delim +DOXYGEN_OPTIONS!$DOXYGEN_OPTIONS$ac_delim +DEAL_II_HAVE_DOT!$DEAL_II_HAVE_DOT$ac_delim +PERL!$PERL$ac_delim +subdirs!$subdirs$ac_delim +LDFLAGSPIC!$LDFLAGSPIC$ac_delim +LIBOBJS!$LIBOBJS$ac_delim +LTLIBOBJS!$LTLIBOBJS$ac_delim +_ACEOF + + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 44; then break elif $ac_last_try; then - { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} + { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} { (exit 1); exit 1; }; } else ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi done -rm -f conf$$subs.sh - -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -cat >>"\$tmp/subs1.awk" <<\\_ACAWK && -_ACEOF -sed -n ' -h -s/^/S["/; s/!.*/"]=/ -p -g -s/^[^!]*!// -:repl -t repl -s/'"$ac_delim"'$// -t delim -:nl -h -s/\(.\{148\}\).*/\1/ -t more1 -s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/ -p -n -b repl -:more1 -s/["\\]/\\&/g; s/^/"/; s/$/"\\/ -p -g -s/.\{148\}// -t nl -:delim -h -s/\(.\{148\}\).*/\1/ -t more2 -s/["\\]/\\&/g; s/^/"/; s/$/"/ -p -b -:more2 -s/["\\]/\\&/g; s/^/"/; s/$/"\\/ -p -g -s/.\{148\}// -t delim -' >$CONFIG_STATUS || ac_write_fail=1 -rm -f conf$$subs.awk -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -_ACAWK -cat >>"\$tmp/subs1.awk" <<_ACAWK && - for (key in S) S_is_set[key] = 1 - FS = "" - -} -{ - line = $ 0 - nfields = split(line, field, "@") - substed = 0 - len = length(field[1]) - for (i = 2; i < nfields; i++) { - key = field[i] - keylen = length(key) - if (S_is_set[key]) { - value = S[key] - line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3) - len += length(value) + length(field[++i]) - substed = 1 - } else - len += 1 + keylen - } - print line -} +ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` +if test -n "$ac_eof"; then + ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` + ac_eof=`expr $ac_eof + 1` +fi -_ACAWK +cat >>$CONFIG_STATUS <<_ACEOF +cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof +/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end _ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then - sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" -else - cat -fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ - || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5 -$as_echo "$as_me: error: could not setup config files machinery" >&2;} - { (exit 1); exit 1; }; } +sed ' +s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g +s/^/s,@/; s/!/@,|#_!!_#|/ +:n +t n +s/'"$ac_delim"'$/,g/; t +s/$/\\/; p +N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n +' >>$CONFIG_STATUS >$CONFIG_STATUS <<_ACEOF +:end +s/|#_!!_#|//g +CEOF$ac_eof _ACEOF + # VPATH may cause trouble with some makes, so we remove $(srcdir), # ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and # trailing colons and then remove the whole line if VPATH becomes empty @@ -17977,133 +17619,19 @@ s/^[^=]*=[ ]*$// }' fi -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +cat >>$CONFIG_STATUS <<\_ACEOF fi # test -n "$CONFIG_FILES" -# Set up the scripts for CONFIG_HEADERS section. -# No need to generate them if there are no CONFIG_HEADERS. -# This happens for instance with `./config.status Makefile'. -if test -n "$CONFIG_HEADERS"; then -cat >"$tmp/defines.awk" <<\_ACAWK || -BEGIN { -_ACEOF - -# Transform confdefs.h into an awk script `defines.awk', embedded as -# here-document in config.status, that substitutes the proper values into -# config.h.in to produce config.h. - -# Create a delimiter string that does not exist in confdefs.h, to ease -# handling of long lines. -ac_delim='%!_!# ' -for ac_last_try in false false :; do - ac_t=`sed -n "/$ac_delim/p" confdefs.h` - if test -z "$ac_t"; then - break - elif $ac_last_try; then - { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_HEADERS" >&5 -$as_echo "$as_me: error: could not make $CONFIG_HEADERS" >&2;} - { (exit 1); exit 1; }; } - else - ac_delim="$ac_delim!$ac_delim _$ac_delim!! " - fi -done - -# For the awk script, D is an array of macro values keyed by name, -# likewise P contains macro parameters if any. Preserve backslash -# newline sequences. -ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]* -sed -n ' -s/.\{148\}/&'"$ac_delim"'/g -t rset -:rset -s/^[ ]*#[ ]*define[ ][ ]*/ / -t def -d -:def -s/\\$// -t bsnl -s/["\\]/\\&/g -s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\ -D["\1"]=" \3"/p -s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2"/p -d -:bsnl -s/["\\]/\\&/g -s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\ -D["\1"]=" \3\\\\\\n"\\/p -t cont -s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p -t cont -d -:cont -n -s/.\{148\}/&'"$ac_delim"'/g -t clear -:clear -s/\\$// -t bsnlc -s/["\\]/\\&/g; s/^/"/; s/$/"/p -d -:bsnlc -s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p -b cont -' >$CONFIG_STATUS || ac_write_fail=1 - -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 - for (key in D) D_is_set[key] = 1 - FS = "" -} -/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ { - line = \$ 0 - split(line, arg, " ") - if (arg[1] == "#") { - defundef = arg[2] - mac1 = arg[3] - } else { - defundef = substr(arg[1], 2) - mac1 = arg[2] - } - split(mac1, mac2, "(") #) - macro = mac2[1] - prefix = substr(line, 1, index(line, defundef) - 1) - if (D_is_set[macro]) { - # Preserve the white space surrounding the "#". - print prefix "define", macro P[macro] D[macro] - next - } else { - # Replace #undef with comments. This is necessary, for example, - # in the case of _POSIX_SOURCE, which is predefined and required - # on some systems where configure will not decide to define it. - if (defundef == "undef") { - print "/*", prefix defundef, macro, "*/" - next - } - } -} -{ print } -_ACAWK -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 - { { $as_echo "$as_me:$LINENO: error: could not setup config headers machinery" >&5 -$as_echo "$as_me: error: could not setup config headers machinery" >&2;} - { (exit 1); exit 1; }; } -fi # test -n "$CONFIG_HEADERS" - - -eval set X " :F $CONFIG_FILES :H $CONFIG_HEADERS " -shift -for ac_tag +for ac_tag in :F $CONFIG_FILES :H $CONFIG_HEADERS do case $ac_tag in :[FHLC]) ac_mode=$ac_tag; continue;; esac case $ac_mode$ac_tag in :[FHL]*:*);; - :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5 -$as_echo "$as_me: error: invalid tag $ac_tag" >&2;} + :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5 +echo "$as_me: error: Invalid tag $ac_tag." >&2;} { (exit 1); exit 1; }; };; :[FH]-) ac_tag=-:-;; :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; @@ -18132,38 +17660,26 @@ $as_echo "$as_me: error: invalid tag $ac_tag" >&2;} [\\/$]*) false;; *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; esac || - { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5 -$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;} + { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5 +echo "$as_me: error: cannot find input file: $ac_f" >&2;} { (exit 1); exit 1; }; };; esac - case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac - ac_file_inputs="$ac_file_inputs '$ac_f'" + ac_file_inputs="$ac_file_inputs $ac_f" done # Let's still pretend it is `configure' which instantiates (i.e., don't # use $as_me), people would be surprised to read: # /* config.h. Generated by config.status. */ - configure_input='Generated from '` - $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g' - `' by configure.' + configure_input="Generated from "`IFS=: + echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure." if test x"$ac_file" != x-; then configure_input="$ac_file. $configure_input" - { $as_echo "$as_me:$LINENO: creating $ac_file" >&5 -$as_echo "$as_me: creating $ac_file" >&6;} + { echo "$as_me:$LINENO: creating $ac_file" >&5 +echo "$as_me: creating $ac_file" >&6;} fi - # Neutralize special characters interpreted by sed in replacement strings. - case $configure_input in #( - *\&* | *\|* | *\\* ) - ac_sed_conf_input=`$as_echo "$configure_input" | - sed 's/[\\\\&|]/\\\\&/g'`;; #( - *) ac_sed_conf_input=$configure_input;; - esac case $ac_tag in - *:-:* | *:-) cat >"$tmp/stdin" \ - || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 -$as_echo "$as_me: error: could not create $ac_file" >&2;} - { (exit 1); exit 1; }; } ;; + *:-:* | *:-) cat >"$tmp/stdin";; esac ;; esac @@ -18173,7 +17689,7 @@ $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$ac_file" : 'X\(//\)[^/]' \| \ X"$ac_file" : 'X\(//\)$' \| \ X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$ac_file" | +echo X"$ac_file" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -18199,7 +17715,7 @@ $as_echo X"$ac_file" | as_dirs= while :; do case $as_dir in #( - *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #( *) as_qdir=$as_dir;; esac as_dirs="'$as_qdir' $as_dirs" @@ -18208,7 +17724,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$as_dir" : 'X\(//\)[^/]' \| \ X"$as_dir" : 'X\(//\)$' \| \ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$as_dir" | +echo X"$as_dir" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -18229,17 +17745,17 @@ $as_echo X"$as_dir" | test -d "$as_dir" && break done test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 -$as_echo "$as_me: error: cannot create directory $as_dir" >&2;} + } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 +echo "$as_me: error: cannot create directory $as_dir" >&2;} { (exit 1); exit 1; }; }; } ac_builddir=. case "$ac_dir" in .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; *) - ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` + ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` # A ".." for each directory in $ac_dir_suffix. - ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` + ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` case $ac_top_builddir_sub in "") ac_top_builddir_sub=. ac_top_build_prefix= ;; *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; @@ -18275,13 +17791,12 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix _ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +cat >>$CONFIG_STATUS <<\_ACEOF # If the template does not know about datarootdir, expand it. # FIXME: This hack should be removed a few years after 2.60. ac_datarootdir_hack=; ac_datarootdir_seen= -ac_sed_dataroot=' -/datarootdir/ { +case `sed -n '/datarootdir/ { p q } @@ -18290,14 +17805,13 @@ ac_sed_dataroot=' /@infodir@/p /@localedir@/p /@mandir@/p -' -case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in +' $ac_file_inputs` in *datarootdir*) ac_datarootdir_seen=yes;; *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) - { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 -$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 +echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} _ACEOF -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +cat >>$CONFIG_STATUS <<_ACEOF ac_datarootdir_hack=' s&@datadir@&$datadir&g s&@docdir@&$docdir&g @@ -18311,16 +17825,15 @@ _ACEOF # Neutralize VPATH when `$srcdir' = `.'. # Shell code in configure.ac might set extrasub. # FIXME: do we really want to maintain this feature? -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -ac_sed_extra="$ac_vpsub +cat >>$CONFIG_STATUS <<_ACEOF + sed "$ac_vpsub $extrasub _ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +cat >>$CONFIG_STATUS <<\_ACEOF :t /@[a-zA-Z_][a-zA-Z_0-9]*@/!b -s|@configure_input@|$ac_sed_conf_input|;t t +s&@configure_input@&$configure_input&;t t s&@top_builddir@&$ac_top_builddir_sub&;t t -s&@top_build_prefix@&$ac_top_build_prefix&;t t s&@srcdir@&$ac_srcdir&;t t s&@abs_srcdir@&$ac_abs_srcdir&;t t s&@top_srcdir@&$ac_top_srcdir&;t t @@ -18329,58 +17842,119 @@ s&@builddir@&$ac_builddir&;t t s&@abs_builddir@&$ac_abs_builddir&;t t s&@abs_top_builddir@&$ac_abs_top_builddir&;t t $ac_datarootdir_hack -" -eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ - || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 -$as_echo "$as_me: error: could not create $ac_file" >&2;} - { (exit 1); exit 1; }; } +" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" >$tmp/out test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && - { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir' + { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined." >&5 -$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' +echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined." >&2;} rm -f "$tmp/stdin" case $ac_file in - -) cat "$tmp/out" && rm -f "$tmp/out";; - *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; - esac \ - || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 -$as_echo "$as_me: error: could not create $ac_file" >&2;} - { (exit 1); exit 1; }; } + -) cat "$tmp/out"; rm -f "$tmp/out";; + *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;; + esac ;; :H) # # CONFIG_HEADER # +_ACEOF + +# Transform confdefs.h into a sed script `conftest.defines', that +# substitutes the proper values into config.h.in to produce config.h. +rm -f conftest.defines conftest.tail +# First, append a space to every undef/define line, to ease matching. +echo 's/$/ /' >conftest.defines +# Then, protect against being on the right side of a sed subst, or in +# an unquoted here document, in config.status. If some macros were +# called several times there might be several #defines for the same +# symbol, which is useless. But do not sort them, since the last +# AC_DEFINE must be honored. +ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]* +# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where +# NAME is the cpp macro being defined, VALUE is the value it is being given. +# PARAMS is the parameter list in the macro definition--in most cases, it's +# just an empty string. +ac_dA='s,^\\([ #]*\\)[^ ]*\\([ ]*' +ac_dB='\\)[ (].*,\\1define\\2' +ac_dC=' ' +ac_dD=' ,' + +uniq confdefs.h | + sed -n ' + t rset + :rset + s/^[ ]*#[ ]*define[ ][ ]*// + t ok + d + :ok + s/[\\&,]/\\&/g + s/^\('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p + s/^\('"$ac_word_re"'\)[ ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p + ' >>conftest.defines + +# Remove the space that was appended to ease matching. +# Then replace #undef with comments. This is necessary, for +# example, in the case of _POSIX_SOURCE, which is predefined and required +# on some systems where configure will not decide to define it. +# (The regexp can be short, since the line contains either #define or #undef.) +echo 's/ $// +s,^[ #]*u.*,/* & */,' >>conftest.defines + +# Break up conftest.defines: +ac_max_sed_lines=50 + +# First sed command is: sed -f defines.sed $ac_file_inputs >"$tmp/out1" +# Second one is: sed -f defines.sed "$tmp/out1" >"$tmp/out2" +# Third one will be: sed -f defines.sed "$tmp/out2" >"$tmp/out1" +# et cetera. +ac_in='$ac_file_inputs' +ac_out='"$tmp/out1"' +ac_nxt='"$tmp/out2"' + +while : +do + # Write a here document: + cat >>$CONFIG_STATUS <<_ACEOF + # First, check the format of the line: + cat >"\$tmp/defines.sed" <<\\CEOF +/^[ ]*#[ ]*undef[ ][ ]*$ac_word_re[ ]*\$/b def +/^[ ]*#[ ]*define[ ][ ]*$ac_word_re[( ]/b def +b +:def +_ACEOF + sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS + echo 'CEOF + sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS + ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in + sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail + grep . conftest.tail >/dev/null || break + rm -f conftest.defines + mv conftest.tail conftest.defines +done +rm -f conftest.defines conftest.tail + +echo "ac_result=$ac_in" >>$CONFIG_STATUS +cat >>$CONFIG_STATUS <<\_ACEOF if test x"$ac_file" != x-; then - { - $as_echo "/* $configure_input */" \ - && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" - } >"$tmp/config.h" \ - || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 -$as_echo "$as_me: error: could not create $ac_file" >&2;} - { (exit 1); exit 1; }; } - if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then - { $as_echo "$as_me:$LINENO: $ac_file is unchanged" >&5 -$as_echo "$as_me: $ac_file is unchanged" >&6;} + echo "/* $configure_input */" >"$tmp/config.h" + cat "$ac_result" >>"$tmp/config.h" + if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then + { echo "$as_me:$LINENO: $ac_file is unchanged" >&5 +echo "$as_me: $ac_file is unchanged" >&6;} else - rm -f "$ac_file" - mv "$tmp/config.h" "$ac_file" \ - || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 -$as_echo "$as_me: error: could not create $ac_file" >&2;} - { (exit 1); exit 1; }; } + rm -f $ac_file + mv "$tmp/config.h" $ac_file fi else - $as_echo "/* $configure_input */" \ - && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ - || { { $as_echo "$as_me:$LINENO: error: could not create -" >&5 -$as_echo "$as_me: error: could not create -" >&2;} - { (exit 1); exit 1; }; } + echo "/* $configure_input */" + cat "$ac_result" fi + rm -f "$tmp/out12" ;; @@ -18394,11 +17968,6 @@ _ACEOF chmod +x $CONFIG_STATUS ac_clean_files=$ac_clean_files_save -test $ac_write_fail = 0 || - { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5 -$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;} - { (exit 1); exit 1; }; } - # configure is writing to config.log, and then calls config.status. # config.status does its own redirection, appending to config.log. @@ -18426,8 +17995,7 @@ fi # if test "$no_recursion" != yes; then - # Remove --cache-file, --srcdir, and --disable-option-checking arguments - # so they do not pile up. + # Remove --cache-file and --srcdir arguments so they do not pile up. ac_sub_configure_args= ac_prev= eval "set x $ac_configure_args" @@ -18456,11 +18024,9 @@ if test "$no_recursion" != yes; then ac_prev=prefix ;; -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) ;; - --disable-option-checking) - ;; *) case $ac_arg in - *\'*) ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + *\'*) ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; esac ac_sub_configure_args="$ac_sub_configure_args '$ac_arg'" ;; esac @@ -18470,7 +18036,7 @@ if test "$no_recursion" != yes; then # in subdir configurations. ac_arg="--prefix=$prefix" case $ac_arg in - *\'*) ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + *\'*) ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; esac ac_sub_configure_args="'$ac_arg' $ac_sub_configure_args" @@ -18479,10 +18045,6 @@ if test "$no_recursion" != yes; then ac_sub_configure_args="--silent $ac_sub_configure_args" fi - # Always prepend --disable-option-checking to silence warnings, since - # different subdirs can have different --enable and --with options. - ac_sub_configure_args="--disable-option-checking $ac_sub_configure_args" - ac_popdir=`pwd` for ac_dir in : $subdirs; do test "x$ac_dir" = x: && continue @@ -18491,8 +18053,8 @@ if test "$no_recursion" != yes; then test -d "$srcdir/$ac_dir" || continue ac_msg="=== configuring in $ac_dir (`pwd`/$ac_dir)" - $as_echo "$as_me:$LINENO: $ac_msg" >&5 - $as_echo "$ac_msg" >&6 + echo "$as_me:$LINENO: $ac_msg" >&5 + echo "$ac_msg" >&6 { as_dir="$ac_dir" case $as_dir in #( -*) as_dir=./$as_dir;; @@ -18501,7 +18063,7 @@ if test "$no_recursion" != yes; then as_dirs= while :; do case $as_dir in #( - *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #( *) as_qdir=$as_dir;; esac as_dirs="'$as_qdir' $as_dirs" @@ -18510,7 +18072,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$as_dir" : 'X\(//\)[^/]' \| \ X"$as_dir" : 'X\(//\)$' \| \ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$as_dir" | +echo X"$as_dir" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -18531,17 +18093,17 @@ $as_echo X"$as_dir" | test -d "$as_dir" && break done test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 -$as_echo "$as_me: error: cannot create directory $as_dir" >&2;} + } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 +echo "$as_me: error: cannot create directory $as_dir" >&2;} { (exit 1); exit 1; }; }; } ac_builddir=. case "$ac_dir" in .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; *) - ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` + ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` # A ".." for each directory in $ac_dir_suffix. - ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` + ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` case $ac_top_builddir_sub in "") ac_top_builddir_sub=. ac_top_build_prefix= ;; *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; @@ -18580,8 +18142,8 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix # This should be Cygnus configure. ac_sub_configure=$ac_aux_dir/configure else - { $as_echo "$as_me:$LINENO: WARNING: no configuration information is in $ac_dir" >&5 -$as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2;} + { echo "$as_me:$LINENO: WARNING: no configuration information is in $ac_dir" >&5 +echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2;} ac_sub_configure= fi @@ -18594,23 +18156,19 @@ $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2;} ac_sub_cache_file=$ac_top_build_prefix$cache_file ;; esac - { $as_echo "$as_me:$LINENO: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&5 -$as_echo "$as_me: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&6;} + { echo "$as_me:$LINENO: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&5 +echo "$as_me: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&6;} # The eval makes quoting arguments work. eval "\$SHELL \"\$ac_sub_configure\" $ac_sub_configure_args \ --cache-file=\"\$ac_sub_cache_file\" --srcdir=\"\$ac_srcdir\"" || - { { $as_echo "$as_me:$LINENO: error: $ac_sub_configure failed for $ac_dir" >&5 -$as_echo "$as_me: error: $ac_sub_configure failed for $ac_dir" >&2;} + { { echo "$as_me:$LINENO: error: $ac_sub_configure failed for $ac_dir" >&5 +echo "$as_me: error: $ac_sub_configure failed for $ac_dir" >&2;} { (exit 1); exit 1; }; } fi cd "$ac_popdir" done fi -if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then - { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 -$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} -fi $PERL -pi -e 's/PACKAGE_NAME/DEAL_II_PACKAGE_NAME/g; diff --git a/deal.II/configure.in b/deal.II/configure.in index 08582b20fd..cd214d72ab 100644 --- a/deal.II/configure.in +++ b/deal.II/configure.in @@ -675,12 +675,12 @@ AH_BOTTOM( #include /** - * If the compiler supports the upcoming C++0x standard, allow us to refer - * to things in namespace std through namespace std_cxx0x (the namespace - * into which we import BOOST components if we don't have C++0x support). + * If the compiler supports the upcoming C++1x standard, allow us to refer + * to things in namespace std through namespace std_cxx1x (the namespace + * into which we import BOOST components if we don't have C++1x support). */ -#ifdef DEAL_II_CAN_USE_CXX0X -namespace std_cxx0x = std; +#ifdef DEAL_II_CAN_USE_CXX1X +namespace std_cxx1x = std; #endif #endif diff --git a/deal.II/deal.II/include/hp/fe_collection.h b/deal.II/deal.II/include/hp/fe_collection.h index 46fc51f960..f172d599b0 100644 --- a/deal.II/deal.II/include/hp/fe_collection.h +++ b/deal.II/deal.II/include/hp/fe_collection.h @@ -14,7 +14,7 @@ #define __deal2__fe_collection_h #include -#include +#include #include DEAL_II_NAMESPACE_OPEN @@ -215,7 +215,7 @@ namespace hp * Array of pointers to the finite * elements stored by this collection. */ - std::vector > > finite_elements; + std::vector > > finite_elements; }; diff --git a/deal.II/deal.II/include/hp/fe_values.h b/deal.II/deal.II/include/hp/fe_values.h index b09f2fc261..d4cc487e70 100644 --- a/deal.II/deal.II/include/hp/fe_values.h +++ b/deal.II/deal.II/include/hp/fe_values.h @@ -21,7 +21,7 @@ #include #include -#include +#include DEAL_II_NAMESPACE_OPEN @@ -163,7 +163,7 @@ namespace internal * as needed in * select_fe_values(). */ - Table<3,std_cxx0x::shared_ptr > fe_values_table; + Table<3,std_cxx1x::shared_ptr > fe_values_table; /** * Set of indices pointing at diff --git a/deal.II/deal.II/include/hp/mapping_collection.h b/deal.II/deal.II/include/hp/mapping_collection.h index 0b4769f6e8..0ef4dedd3c 100644 --- a/deal.II/deal.II/include/hp/mapping_collection.h +++ b/deal.II/deal.II/include/hp/mapping_collection.h @@ -19,7 +19,7 @@ #include #include -#include +#include DEAL_II_NAMESPACE_OPEN @@ -128,7 +128,7 @@ namespace hp * pointers to the different Mapping * objects. */ - std::vector > > mappings; + std::vector > > mappings; }; diff --git a/deal.II/deal.II/include/hp/q_collection.h b/deal.II/deal.II/include/hp/q_collection.h index 2b89c396e6..009aa6377b 100644 --- a/deal.II/deal.II/include/hp/q_collection.h +++ b/deal.II/deal.II/include/hp/q_collection.h @@ -21,7 +21,7 @@ #include #include -#include +#include DEAL_II_NAMESPACE_OPEN @@ -146,7 +146,7 @@ namespace hp * pointers to the different quadrature * objects. */ - std::vector > > quadratures; + std::vector > > quadratures; }; @@ -205,7 +205,7 @@ namespace hp QCollection::QCollection (const Quadrature &quadrature) { quadratures - .push_back (std_cxx0x::shared_ptr >(new Quadrature(quadrature))); + .push_back (std_cxx1x::shared_ptr >(new Quadrature(quadrature))); } @@ -248,7 +248,7 @@ namespace hp QCollection::push_back (const Quadrature &new_quadrature) { quadratures - .push_back (std_cxx0x::shared_ptr >(new Quadrature(new_quadrature))); + .push_back (std_cxx1x::shared_ptr >(new Quadrature(new_quadrature))); } } // namespace hp diff --git a/deal.II/deal.II/include/multigrid/mg_level_object.h b/deal.II/deal.II/include/multigrid/mg_level_object.h index 2110d061b8..1b97b476a8 100644 --- a/deal.II/deal.II/include/multigrid/mg_level_object.h +++ b/deal.II/deal.II/include/multigrid/mg_level_object.h @@ -16,7 +16,7 @@ #include #include -#include +#include DEAL_II_NAMESPACE_OPEN @@ -113,7 +113,7 @@ class MGLevelObject : public Subscriptor /** * Array of the objects to be held. */ - std::vector > objects; + std::vector > objects; }; /*@}*/ @@ -165,7 +165,7 @@ MGLevelObject::resize (const unsigned int new_minlevel, minlevel = new_minlevel; for (unsigned int i=0; i (new Object)); + objects.push_back(std_cxx1x::shared_ptr (new Object)); } @@ -173,7 +173,7 @@ template MGLevelObject & MGLevelObject::operator = (const double d) { - typename std::vector >::iterator v; + typename std::vector >::iterator v; for (v = objects.begin(); v != objects.end(); ++v) **v=d; return *this; @@ -184,7 +184,7 @@ template void MGLevelObject::clear () { - typename std::vector >::iterator v; + typename std::vector >::iterator v; for (v = objects.begin(); v != objects.end(); ++v) (*v)->clear(); } @@ -211,7 +211,7 @@ unsigned int MGLevelObject::memory_consumption () const { unsigned int result = sizeof(*this); - typedef typename std::vector >::const_iterator Iter; + typedef typename std::vector >::const_iterator Iter; const Iter end = objects.end(); for (Iter o=objects.begin(); o!=end; ++o) result += (*o)->memory_consumption(); diff --git a/deal.II/deal.II/include/multigrid/mg_transfer.h b/deal.II/deal.II/include/multigrid/mg_transfer.h index 8108c423a6..871d364603 100644 --- a/deal.II/deal.II/include/multigrid/mg_transfer.h +++ b/deal.II/deal.II/include/multigrid/mg_transfer.h @@ -32,7 +32,7 @@ #include -#include +#include DEAL_II_NAMESPACE_OPEN @@ -156,7 +156,7 @@ class MGTransferPrebuilt : public MGTransferBase * Sparsity patterns for transfer * matrices. */ - std::vector > prolongation_sparsities; + std::vector > prolongation_sparsities; /** * The actual prolongation matrix. @@ -166,7 +166,7 @@ class MGTransferPrebuilt : public MGTransferBase * while row indices belong to the * child cell, i.e. the fine level. */ - std::vector > > prolongation_matrices; + std::vector > > prolongation_matrices; /** * Mapping for the diff --git a/deal.II/deal.II/include/multigrid/mg_transfer.templates.h b/deal.II/deal.II/include/multigrid/mg_transfer.templates.h index ed103605a7..af0ef18dd6 100644 --- a/deal.II/deal.II/include/multigrid/mg_transfer.templates.h +++ b/deal.II/deal.II/include/multigrid/mg_transfer.templates.h @@ -95,8 +95,8 @@ MGTransferPrebuilt::memory_consumption () const unsigned int result = sizeof(*this); result += sizeof(unsigned int) * sizes.size(); #ifdef DEAL_PREFER_MATRIX_EZ - std::vector > >::const_iterator m; - const std::vector > >::const_iterator end = prolongation_matrices.end(); + std::vector > >::const_iterator m; + const std::vector > >::const_iterator end = prolongation_matrices.end(); for (m = prolongation_matrices.begin(); m != end ; ++m) result += *m->memory_consumption(); #else diff --git a/deal.II/deal.II/include/multigrid/mg_transfer_block.h b/deal.II/deal.II/include/multigrid/mg_transfer_block.h index 09f959cc73..bb15a59005 100644 --- a/deal.II/deal.II/include/multigrid/mg_transfer_block.h +++ b/deal.II/deal.II/include/multigrid/mg_transfer_block.h @@ -33,7 +33,7 @@ #include -#include +#include DEAL_II_NAMESPACE_OPEN @@ -133,7 +133,7 @@ class MGTransferBlockBase DeclException0(ExcMatricesNotBuilt); private: - std::vector > prolongation_sparsities; + std::vector > prolongation_sparsities; protected: @@ -145,7 +145,7 @@ class MGTransferBlockBase * while row indices belong to the * child cell, i.e. the fine level. */ - std::vector > > prolongation_matrices; + std::vector > > prolongation_matrices; /** * Mapping for the diff --git a/deal.II/deal.II/include/multigrid/mg_transfer_component.h b/deal.II/deal.II/include/multigrid/mg_transfer_component.h index 4376ad64e8..f1d24840d1 100644 --- a/deal.II/deal.II/include/multigrid/mg_transfer_component.h +++ b/deal.II/deal.II/include/multigrid/mg_transfer_component.h @@ -32,7 +32,7 @@ #include -#include +#include DEAL_II_NAMESPACE_OPEN @@ -149,7 +149,7 @@ class MGTransferComponentBase DeclException0(ExcMatricesNotBuilt); private: - std::vector > prolongation_sparsities; + std::vector > prolongation_sparsities; protected: @@ -161,7 +161,7 @@ class MGTransferComponentBase * while row indices belong to the * child cell, i.e. the fine level. */ - std::vector > > prolongation_matrices; + std::vector > > prolongation_matrices; /** * Unused now, but intended to diff --git a/deal.II/deal.II/include/numerics/data_out.h b/deal.II/deal.II/include/numerics/data_out.h index c66039677d..fbff012754 100644 --- a/deal.II/deal.II/include/numerics/data_out.h +++ b/deal.II/deal.II/include/numerics/data_out.h @@ -24,7 +24,7 @@ #include #include -#include +#include DEAL_II_NAMESPACE_OPEN @@ -1002,13 +1002,13 @@ class DataOut_DoFData : public DataOutInterface * List of data elements with vectors of * values for each degree of freedom. */ - std::vector > dof_data; + std::vector > dof_data; /** * List of data elements with vectors of * values for each cell. */ - std::vector > cell_data; + std::vector > cell_data; /** * This is a list of patches that is @@ -1044,7 +1044,7 @@ class DataOut_DoFData : public DataOutInterface * extensive documentation. */ virtual - std::vector > + std::vector > get_vector_data_ranges () const; /** diff --git a/deal.II/deal.II/include/numerics/matrices.h b/deal.II/deal.II/include/numerics/matrices.h index 9a1e465915..a19accf838 100644 --- a/deal.II/deal.II/include/numerics/matrices.h +++ b/deal.II/deal.II/include/numerics/matrices.h @@ -795,7 +795,7 @@ class MatrixCreator */ template static - void create_boundary_mass_matrix_1 (std_cxx0x::tuple &, + void create_boundary_mass_matrix_1 (std_cxx1x::tuple &, const DoFHandler &, const Quadrature & > commons, SparseMatrix &matrix, @@ -812,7 +812,7 @@ class MatrixCreator */ template static - void create_boundary_mass_matrix_1 (std_cxx0x::tuple &, + void create_boundary_mass_matrix_1 (std_cxx1x::tuple &, const hp::DoFHandler&, const hp::QCollection & > commons, SparseMatrix &matrix, diff --git a/deal.II/deal.II/source/dofs/dof_tools.cc b/deal.II/deal.II/source/dofs/dof_tools.cc index 974267dbbb..3cd9d351e0 100644 --- a/deal.II/deal.II/source/dofs/dof_tools.cc +++ b/deal.II/deal.II/source/dofs/dof_tools.cc @@ -1350,11 +1350,11 @@ namespace internal ensure_existence_of_master_dof_mask (const FiniteElement &fe1, const FiniteElement &fe2, const FullMatrix &face_interpolation_matrix, - std_cxx0x::shared_ptr > &master_dof_mask) + std_cxx1x::shared_ptr > &master_dof_mask) { if (master_dof_mask == 0) { - master_dof_mask = std_cxx0x::shared_ptr > + master_dof_mask = std_cxx1x::shared_ptr > (new std::vector (fe1.dofs_per_face)); select_master_dofs_for_face_restriction (fe1, fe2, @@ -1377,11 +1377,11 @@ namespace internal void ensure_existence_of_face_matrix (const FiniteElement &fe1, const FiniteElement &fe2, - std_cxx0x::shared_ptr > &matrix) + std_cxx1x::shared_ptr > &matrix) { if (matrix == 0) { - matrix = std_cxx0x::shared_ptr > + matrix = std_cxx1x::shared_ptr > (new FullMatrix (fe2.dofs_per_face, fe1.dofs_per_face)); fe1.get_face_interpolation_matrix (fe2, @@ -1400,11 +1400,11 @@ namespace internal ensure_existence_of_subface_matrix (const FiniteElement &fe1, const FiniteElement &fe2, const unsigned int subface, - std_cxx0x::shared_ptr > &matrix) + std_cxx1x::shared_ptr > &matrix) { if (matrix == 0) { - matrix = std_cxx0x::shared_ptr > + matrix = std_cxx1x::shared_ptr > (new FullMatrix (fe2.dofs_per_face, fe1.dofs_per_face)); fe1.get_subface_interpolation_matrix (fe2, @@ -1428,7 +1428,7 @@ namespace internal void ensure_existence_of_split_face_matrix (const FullMatrix &face_interpolation_matrix, const std::vector &master_dof_mask, - std_cxx0x::shared_ptr,FullMatrix > > &split_matrix) + std_cxx1x::shared_ptr,FullMatrix > > &split_matrix) { AssertDimension (master_dof_mask.size(), face_interpolation_matrix.m()); Assert (std::count (master_dof_mask.begin(), master_dof_mask.end(), true) == @@ -1438,7 +1438,7 @@ namespace internal if (split_matrix == 0) { split_matrix - = std_cxx0x::shared_ptr,FullMatrix > > + = std_cxx1x::shared_ptr,FullMatrix > > (new std::pair,FullMatrix >()); const unsigned int n_master_dofs = face_interpolation_matrix.n(); @@ -2211,10 +2211,10 @@ namespace internal // only once, namely the first // time they are needed, and // then just reuse them - Table<2,std_cxx0x::shared_ptr > > + Table<2,std_cxx1x::shared_ptr > > face_interpolation_matrices (n_finite_elements (dof_handler), n_finite_elements (dof_handler)); - Table<3,std_cxx0x::shared_ptr > > + Table<3,std_cxx1x::shared_ptr > > subface_interpolation_matrices (n_finite_elements (dof_handler), n_finite_elements (dof_handler), GeometryInfo::max_children_per_face); @@ -2228,7 +2228,7 @@ namespace internal // are derived from the face // interpolation matrix as // described in the @ref hp_paper "hp paper" - Table<2,std_cxx0x::shared_ptr,FullMatrix > > > + Table<2,std_cxx1x::shared_ptr,FullMatrix > > > split_face_interpolation_matrices (n_finite_elements (dof_handler), n_finite_elements (dof_handler)); @@ -2237,7 +2237,7 @@ namespace internal // which of the degrees of freedom on // the coarse side of a refined face // will act as master dofs. - Table<2,std_cxx0x::shared_ptr > > + Table<2,std_cxx1x::shared_ptr > > master_dof_masks (n_finite_elements (dof_handler), n_finite_elements (dof_handler)); diff --git a/deal.II/deal.II/source/fe/fe_tools.cc b/deal.II/deal.II/source/fe/fe_tools.cc index 8c741ca247..5df260a7ce 100644 --- a/deal.II/deal.II/source/fe/fe_tools.cc +++ b/deal.II/deal.II/source/fe/fe_tools.cc @@ -45,7 +45,7 @@ #include #include -#include +#include DEAL_II_NAMESPACE_OPEN @@ -60,7 +60,7 @@ namespace // apparent memory leaks to // programs like valgrind typedef - std_cxx0x::shared_ptr > + std_cxx1x::shared_ptr > FEFactoryPointer; // a function that returns the @@ -142,7 +142,7 @@ namespace // issues here static std::map > > + std_cxx1x::shared_ptr > > fe_name_map = get_default_fe_names (); } @@ -1071,7 +1071,7 @@ FETools::interpolate (const DH1 &dof1, // that memory is released again std::map *, std::map *, - std_cxx0x::shared_ptr > > > + std_cxx1x::shared_ptr > > > interpolation_matrices; typename DH1::active_cell_iterator cell1 = dof1.begin_active(), @@ -1119,7 +1119,7 @@ FETools::interpolate (const DH1 &dof1, // there if (interpolation_matrices[&cell1->get_fe()][&cell2->get_fe()] == 0) { - std_cxx0x::shared_ptr > + std_cxx1x::shared_ptr > interpolation_matrix (new FullMatrix (dofs_per_cell2, dofs_per_cell1)); interpolation_matrices[&cell1->get_fe()][&cell2->get_fe()] @@ -1236,7 +1236,7 @@ FETools::back_interpolate(const DH &dof1, // dof1 to the back_interpolation // matrices std::map *, - std_cxx0x::shared_ptr > > interpolation_matrices; + std_cxx1x::shared_ptr > > interpolation_matrices; for (; cell!=endc; ++cell) { @@ -1267,7 +1267,7 @@ FETools::back_interpolate(const DH &dof1, if (interpolation_matrices[&cell->get_fe()] != 0) { interpolation_matrices[&cell->get_fe()] = - std_cxx0x::shared_ptr > + std_cxx1x::shared_ptr > (new FullMatrix(dofs_per_cell1, dofs_per_cell1)); get_back_interpolation_matrix(dof1.get_fe(), fe2, *interpolation_matrices[&cell->get_fe()]); diff --git a/deal.II/deal.II/source/grid/tria.cc b/deal.II/deal.II/source/grid/tria.cc index 8ab7b2204a..414e493ce3 100644 --- a/deal.II/deal.II/source/grid/tria.cc +++ b/deal.II/deal.II/source/grid/tria.cc @@ -31,7 +31,7 @@ #include #include -#include +#include DEAL_II_NAMESPACE_OPEN @@ -1951,7 +1951,7 @@ namespace internal // this file std::map, std::pair::quad_iterator, - std_cxx0x::array::lines_per_face> >, + std_cxx1x::array::lines_per_face> >, QuadComparator> needed_quads; for (unsigned int cell=0; cell line_list[GeometryInfo::lines_per_cell], inverse_line_list[GeometryInfo::lines_per_cell]; unsigned int face_line_list[GeometryInfo::lines_per_face]; - std_cxx0x::array::lines_per_face> orientation; + std_cxx1x::array::lines_per_face> orientation; for (unsigned int line=0; line::lines_per_cell; ++line) { @@ -2103,7 +2103,7 @@ namespace internal quad = triangulation.begin_raw_quad(); typename std::map, std::pair::quad_iterator, - std_cxx0x::array::lines_per_face> >, + std_cxx1x::array::lines_per_face> >, QuadComparator> ::iterator q; for (q = needed_quads.begin(); quad!=triangulation.end_quad(); ++quad, ++q) diff --git a/deal.II/deal.II/source/hp/dof_handler.cc b/deal.II/deal.II/source/hp/dof_handler.cc index 290bedf3ff..3af05721cb 100644 --- a/deal.II/deal.II/source/hp/dof_handler.cc +++ b/deal.II/deal.II/source/hp/dof_handler.cc @@ -58,7 +58,7 @@ namespace internal void ensure_existence_of_dof_identities (const FiniteElement &fe1, const FiniteElement &fe2, - std_cxx0x::shared_ptr &identities) + std_cxx1x::shared_ptr &identities) { // see if we need to fill this // entry, or whether it already @@ -70,7 +70,7 @@ namespace internal case 0: { identities = - std_cxx0x::shared_ptr + std_cxx1x::shared_ptr (new DoFIdentities(fe1.hp_vertex_dof_identities(fe2))); break; } @@ -78,7 +78,7 @@ namespace internal case 1: { identities = - std_cxx0x::shared_ptr + std_cxx1x::shared_ptr (new DoFIdentities(fe1.hp_line_dof_identities(fe2))); break; } @@ -86,7 +86,7 @@ namespace internal case 2: { identities = - std_cxx0x::shared_ptr + std_cxx1x::shared_ptr (new DoFIdentities(fe1.hp_quad_dof_identities(fe2))); break; } @@ -2953,7 +2953,7 @@ namespace hp // vertices at all, I can't think // of a finite element that would // make that necessary... - Table<2,std_cxx0x::shared_ptr > + Table<2,std_cxx1x::shared_ptr > vertex_dof_identities (get_fe().size(), get_fe().size()); @@ -3105,7 +3105,7 @@ namespace hp // and then only deal with those that are // not identical of which we can handle // at most 2 - Table<2,std_cxx0x::shared_ptr > + Table<2,std_cxx1x::shared_ptr > line_dof_identities (finite_elements->size(), finite_elements->size()); @@ -3340,7 +3340,7 @@ namespace hp // for quads only in 4d and // higher, so this isn't a // particularly frequent case - Table<2,std_cxx0x::shared_ptr > + Table<2,std_cxx1x::shared_ptr > quad_dof_identities (finite_elements->size(), finite_elements->size()); diff --git a/deal.II/deal.II/source/hp/fe_collection.cc b/deal.II/deal.II/source/hp/fe_collection.cc index a0ecc88360..9d39a53064 100644 --- a/deal.II/deal.II/source/hp/fe_collection.cc +++ b/deal.II/deal.II/source/hp/fe_collection.cc @@ -67,7 +67,7 @@ namespace hp "same number of vector components!")); finite_elements - .push_back (std_cxx0x::shared_ptr >(new_fe.clone())); + .push_back (std_cxx1x::shared_ptr >(new_fe.clone())); } diff --git a/deal.II/deal.II/source/hp/fe_values.cc b/deal.II/deal.II/source/hp/fe_values.cc index 5715f34a36..7f5ef68c6f 100644 --- a/deal.II/deal.II/source/hp/fe_values.cc +++ b/deal.II/deal.II/source/hp/fe_values.cc @@ -93,7 +93,7 @@ namespace internal if (fe_values_table(present_fe_values_index) == 0) fe_values_table(present_fe_values_index) = - std_cxx0x::shared_ptr + std_cxx1x::shared_ptr (new FEValues ((*mapping_collection)[mapping_index], (*fe_collection)[fe_index], q_collection[q_index], diff --git a/deal.II/deal.II/source/hp/mapping_collection.cc b/deal.II/deal.II/source/hp/mapping_collection.cc index 010b7adef5..3a9955d308 100644 --- a/deal.II/deal.II/source/hp/mapping_collection.cc +++ b/deal.II/deal.II/source/hp/mapping_collection.cc @@ -31,7 +31,7 @@ namespace hp MappingCollection (const Mapping &mapping) { mappings - .push_back (std_cxx0x::shared_ptr >(mapping.clone())); + .push_back (std_cxx1x::shared_ptr >(mapping.clone())); } @@ -72,7 +72,7 @@ namespace hp MappingCollection::push_back (const Mapping &new_mapping) { mappings - .push_back (std_cxx0x::shared_ptr >(new_mapping.clone())); + .push_back (std_cxx1x::shared_ptr >(new_mapping.clone())); } //--------------------------------------------------------------------------- diff --git a/deal.II/deal.II/source/multigrid/mg_transfer_block.cc b/deal.II/deal.II/source/multigrid/mg_transfer_block.cc index b1eeab278e..4ac5aaa0d7 100644 --- a/deal.II/deal.II/source/multigrid/mg_transfer_block.cc +++ b/deal.II/deal.II/source/multigrid/mg_transfer_block.cc @@ -116,9 +116,9 @@ void MGTransferBlockBase::build_matrices ( for (unsigned int i=0; i (new BlockSparsityPattern)); + .push_back (std_cxx1x::shared_ptr (new BlockSparsityPattern)); prolongation_matrices - .push_back (std_cxx0x::shared_ptr > (new BlockSparseMatrix)); + .push_back (std_cxx1x::shared_ptr > (new BlockSparseMatrix)); } // two fields which will store the diff --git a/deal.II/deal.II/source/multigrid/mg_transfer_component.cc b/deal.II/deal.II/source/multigrid/mg_transfer_component.cc index bb33f0689d..7eadf5861b 100644 --- a/deal.II/deal.II/source/multigrid/mg_transfer_component.cc +++ b/deal.II/deal.II/source/multigrid/mg_transfer_component.cc @@ -153,9 +153,9 @@ void MGTransferComponentBase::build_matrices ( for (unsigned int i=0; i (new BlockSparsityPattern)); + .push_back (std_cxx1x::shared_ptr (new BlockSparsityPattern)); prolongation_matrices - .push_back (std_cxx0x::shared_ptr > (new BlockSparseMatrix)); + .push_back (std_cxx1x::shared_ptr > (new BlockSparseMatrix)); } // two fields which will store the diff --git a/deal.II/deal.II/source/multigrid/mg_transfer_prebuilt.cc b/deal.II/deal.II/source/multigrid/mg_transfer_prebuilt.cc index 5500767d1e..b7dde4fe4d 100644 --- a/deal.II/deal.II/source/multigrid/mg_transfer_prebuilt.cc +++ b/deal.II/deal.II/source/multigrid/mg_transfer_prebuilt.cc @@ -58,9 +58,9 @@ void MGTransferPrebuilt::build_matrices ( for (unsigned int i=0; i (new SparsityPattern)); + .push_back (std_cxx1x::shared_ptr (new SparsityPattern)); prolongation_matrices - .push_back (std_cxx0x::shared_ptr > (new SparseMatrix)); + .push_back (std_cxx1x::shared_ptr > (new SparseMatrix)); } // two fields which will store the diff --git a/deal.II/deal.II/source/numerics/data_out.cc b/deal.II/deal.II/source/numerics/data_out.cc index 438c9ab8d6..353f20cd39 100644 --- a/deal.II/deal.II/source/numerics/data_out.cc +++ b/deal.II/deal.II/source/numerics/data_out.cc @@ -385,9 +385,9 @@ add_data_vector (const VECTOR &vec, DataEntryBase * new_entry = new DataEntry(&vec, names, data_component_interpretation); if (actual_type == type_dof_data) - dof_data.push_back (std_cxx0x::shared_ptr(new_entry)); + dof_data.push_back (std_cxx1x::shared_ptr(new_entry)); else - cell_data.push_back (std_cxx0x::shared_ptr(new_entry)); + cell_data.push_back (std_cxx1x::shared_ptr(new_entry)); } @@ -416,7 +416,7 @@ add_data_vector (const VECTOR &vec, dofs->get_tria().n_active_cells())); DataEntryBase * new_entry = new DataEntry(&vec, &data_postprocessor); - dof_data.push_back (std_cxx0x::shared_ptr(new_entry)); + dof_data.push_back (std_cxx1x::shared_ptr(new_entry)); } @@ -481,7 +481,7 @@ get_dataset_names () const // collect the names of dof // and cell data typedef - typename std::vector >::const_iterator + typename std::vector >::const_iterator data_iterator; for (data_iterator d=dof_data.begin(); @@ -501,16 +501,16 @@ get_dataset_names () const template -std::vector > +std::vector > DataOut_DoFData::get_vector_data_ranges () const { - std::vector > + std::vector > ranges; // collect the ranges of dof // and cell data typedef - typename std::vector >::const_iterator + typename std::vector >::const_iterator data_iterator; unsigned int output_component = 0; @@ -556,7 +556,7 @@ DataOut_DoFData::get_vector_data_ranges () const // finally add a corresponding // range - std_cxx0x::tuple + std_cxx1x::tuple range (output_component, output_component+patch_space_dim-1, name); diff --git a/deal.II/deal.II/source/numerics/matrices.cc b/deal.II/deal.II/source/numerics/matrices.cc index 85902be5f1..38368e0167 100644 --- a/deal.II/deal.II/source/numerics/matrices.cc +++ b/deal.II/deal.II/source/numerics/matrices.cc @@ -1080,7 +1080,7 @@ MatrixCreator::create_boundary_mass_matrix (const Mapping &mappi // the matrix Threads::ThreadMutex mutex; - typedef std_cxx0x::tuple&, + typedef std_cxx1x::tuple&, const DoFHandler&, const Quadrature&> Commons; @@ -1111,7 +1111,7 @@ MatrixCreator::create_boundary_mass_matrix (const Mapping &mappi template <> void MatrixCreator:: -create_boundary_mass_matrix_1<2,3> (std_cxx0x::tuple &, +create_boundary_mass_matrix_1<2,3> (std_cxx1x::tuple &, const DoFHandler<2,3> &, const Quadrature<1> & > , SparseMatrix &, @@ -1132,7 +1132,7 @@ create_boundary_mass_matrix_1<2,3> (std_cxx0x::tuple &, template void MatrixCreator:: -create_boundary_mass_matrix_1 (std_cxx0x::tuple &, +create_boundary_mass_matrix_1 (std_cxx1x::tuple &, const DoFHandler &, const Quadrature & > commons, SparseMatrix &matrix, @@ -1147,9 +1147,9 @@ create_boundary_mass_matrix_1 (std_cxx0x::tuple &, // All assertions for this function // are in the calling function // before creating threads. - const Mapping& mapping = std_cxx0x::get<0>(commons); - const DoFHandler& dof = std_cxx0x::get<1>(commons); - const Quadrature& q = std_cxx0x::get<2>(commons); + const Mapping& mapping = std_cxx1x::get<0>(commons); + const DoFHandler& dof = std_cxx1x::get<1>(commons); + const Quadrature& q = std_cxx1x::get<2>(commons); const FiniteElement &fe = dof.get_fe(); const unsigned int n_components = fe.n_components(); @@ -1482,7 +1482,7 @@ MatrixCreator::create_boundary_mass_matrix (const hp::MappingCollection (dof.begin_active(), dof.end(), n_threads); - typedef std_cxx0x::tuple&, + typedef std_cxx1x::tuple&, const hp::DoFHandler&, const hp::QCollection&> Commons; @@ -1516,7 +1516,7 @@ MatrixCreator::create_boundary_mass_matrix (const hp::MappingCollection void MatrixCreator:: -create_boundary_mass_matrix_1 (std_cxx0x::tuple &, +create_boundary_mass_matrix_1 (std_cxx1x::tuple &, const hp::DoFHandler &, const hp::QCollection &> commons, SparseMatrix &matrix, @@ -1528,9 +1528,9 @@ create_boundary_mass_matrix_1 (std_cxx0x::tuple > range, Threads::ThreadMutex &mutex) { - const hp::MappingCollection& mapping = std_cxx0x::get<0>(commons); - const hp::DoFHandler& dof = std_cxx0x::get<1>(commons); - const hp::QCollection& q = std_cxx0x::get<2>(commons); + const hp::MappingCollection& mapping = std_cxx1x::get<0>(commons); + const hp::DoFHandler& dof = std_cxx1x::get<1>(commons); + const hp::QCollection& q = std_cxx1x::get<2>(commons); const hp::FECollection &fe_collection = dof.get_fe(); const unsigned int n_components = fe_collection.n_components(); const unsigned int n_function_components = boundary_functions.begin()->second->n_components; diff --git a/deal.II/doc/doxygen/headers/std_cxx0x.h b/deal.II/doc/doxygen/headers/std_cxx1x.h similarity index 91% rename from deal.II/doc/doxygen/headers/std_cxx0x.h rename to deal.II/doc/doxygen/headers/std_cxx1x.h index 97f19d33ce..8d19f70038 100644 --- a/deal.II/doc/doxygen/headers/std_cxx0x.h +++ b/deal.II/doc/doxygen/headers/std_cxx1x.h @@ -13,13 +13,13 @@ /** * A namespace that contains classes and functions that will be part - * of the next C++ standard (tentatively called C++0x) and that are + * of the next C++ standard (tentatively called C++1x) and that are * currently available via the BOOST library. The elements that * are available through the current namespace are either imported * from namespace std (if a compiler's library provides them) or from * namespace boost. */ -namespace std_cxx0x +namespace std_cxx1x { } diff --git a/deal.II/doc/news/6.1.0-vs-6.2.0.h b/deal.II/doc/news/6.1.0-vs-6.2.0.h index 02d7e15fcf..8bcfb3aeef 100644 --- a/deal.II/doc/news/6.1.0-vs-6.2.0.h +++ b/deal.II/doc/news/6.1.0-vs-6.2.0.h @@ -235,7 +235,7 @@ inconvenience this causes. Changed: Some parts of the library used to use classes and functions from the BOOST library. Since many of the components of BOOST have been voted into what will be the - next C++ standard, we now use a namespace std_cxx0x (coined on the + next C++ standard, we now use a namespace std_cxx1x (coined on the provisional name C++0x used for the next C++ standard) into which we import BOOST components as necessary. If a compiler supports C++0x, we can then later replace BOOST components by elements from namespace diff --git a/deal.II/examples/step-22/step-22.cc b/deal.II/examples/step-22/step-22.cc index d1092b3ff5..dcc21a0fbf 100644 --- a/deal.II/examples/step-22/step-22.cc +++ b/deal.II/examples/step-22/step-22.cc @@ -166,7 +166,7 @@ class StokesProblem // memory leak, and can never produce a // dangling pointer to an already // destroyed object: - std_cxx0x::shared_ptr::type> A_preconditioner; + std_cxx1x::shared_ptr::type> A_preconditioner; }; // @sect3{Boundary values and right hand side} @@ -961,7 +961,7 @@ void StokesProblem::assemble_system () std::cout << " Computing preconditioner..." << std::endl << std::flush; A_preconditioner - = std_cxx0x::shared_ptr::type>(new typename InnerPreconditioner::type()); + = std_cxx1x::shared_ptr::type>(new typename InnerPreconditioner::type()); A_preconditioner->initialize (system_matrix.block(0,0), typename InnerPreconditioner::type::AdditionalData()); diff --git a/deal.II/examples/step-31/step-31.cc b/deal.II/examples/step-31/step-31.cc index c557ef7d85..593bf5953e 100644 --- a/deal.II/examples/step-31/step-31.cc +++ b/deal.II/examples/step-31/step-31.cc @@ -644,8 +644,8 @@ class BoussinesqFlowProblem double old_time_step; unsigned int timestep_number; - std_cxx0x::shared_ptr Amg_preconditioner; - std_cxx0x::shared_ptr Mp_preconditioner; + std_cxx1x::shared_ptr Amg_preconditioner; + std_cxx1x::shared_ptr Mp_preconditioner; bool rebuild_stokes_matrix; bool rebuild_temperature_matrices; @@ -1478,7 +1478,7 @@ BoussinesqFlowProblem::build_stokes_preconditioner () assemble_stokes_preconditioner (); - Amg_preconditioner = std_cxx0x::shared_ptr + Amg_preconditioner = std_cxx1x::shared_ptr (new TrilinosWrappers::PreconditionAMG()); std::vector > constant_modes; @@ -1537,7 +1537,7 @@ BoussinesqFlowProblem::build_stokes_preconditioner () // preconditioner with relaxation factor // around 1.2, but IC is cheaper for our // example. We wrap the preconditioners - // into a std_cxx0x::shared_ptr + // into a std_cxx1x::shared_ptr // pointer, which makes it easier to // recreate the preconditioner next time // around since we do not have to care @@ -1550,7 +1550,7 @@ BoussinesqFlowProblem::build_stokes_preconditioner () Amg_preconditioner->initialize(stokes_preconditioner_matrix.block(0,0), amg_data); - Mp_preconditioner = std_cxx0x::shared_ptr + Mp_preconditioner = std_cxx1x::shared_ptr (new TrilinosWrappers::PreconditionIC()); Mp_preconditioner->initialize(stokes_preconditioner_matrix.block(1,1)); diff --git a/deal.II/examples/step-32/step-32.cc b/deal.II/examples/step-32/step-32.cc index a96de625ed..c847f154af 100644 --- a/deal.II/examples/step-32/step-32.cc +++ b/deal.II/examples/step-32/step-32.cc @@ -361,9 +361,9 @@ class BoussinesqFlowProblem double old_time_step; unsigned int timestep_number; - std_cxx0x::shared_ptr Amg_preconditioner; - std_cxx0x::shared_ptr Mp_preconditioner; - std_cxx0x::shared_ptr T_preconditioner; + std_cxx1x::shared_ptr Amg_preconditioner; + std_cxx1x::shared_ptr Mp_preconditioner; + std_cxx1x::shared_ptr T_preconditioner; bool rebuild_stokes_matrix; bool rebuild_stokes_preconditioner; @@ -842,7 +842,7 @@ BoussinesqFlowProblem::build_stokes_preconditioner () assemble_stokes_preconditioner (); - Amg_preconditioner = std_cxx0x::shared_ptr + Amg_preconditioner = std_cxx1x::shared_ptr (new TrilinosWrappers::PreconditionAMG()); std::vector > constant_modes; @@ -861,7 +861,7 @@ BoussinesqFlowProblem::build_stokes_preconditioner () Amg_preconditioner->initialize(stokes_preconditioner_matrix.block(0,0), amg_data); - Mp_preconditioner = std_cxx0x::shared_ptr + Mp_preconditioner = std_cxx1x::shared_ptr (new TrilinosWrappers::PreconditionIC()); Mp_preconditioner->initialize (stokes_preconditioner_matrix.block(1,1)); @@ -1109,7 +1109,7 @@ void BoussinesqFlowProblem::assemble_temperature_system (const double maxim if (rebuild_temperature_preconditioner == true) { - T_preconditioner = std_cxx0x::shared_ptr + T_preconditioner = std_cxx1x::shared_ptr (new TrilinosWrappers::PreconditionIC()); T_preconditioner->initialize (temperature_matrix); diff --git a/deal.II/examples/step-34/step-34.cc b/deal.II/examples/step-34/step-34.cc index f1c929589d..bb27f0d04a 100644 --- a/deal.II/examples/step-34/step-34.cc +++ b/deal.II/examples/step-34/step-34.cc @@ -435,7 +435,7 @@ class BEMProblem Functions::ParsedFunction wind; Functions::ParsedFunction exact_solution; - std_cxx0x::shared_ptr > quadrature; + std_cxx1x::shared_ptr > quadrature; unsigned int singular_quadrature_order; SolverControl solver_control; @@ -622,7 +622,7 @@ void BEMProblem::read_parameters (const std::string &filename) prm.enter_subsection("Quadrature rules"); { quadrature = - std_cxx0x::shared_ptr > + std_cxx1x::shared_ptr > (new QuadratureSelector (prm.get("Quadrature type"), prm.get_integer("Quadrature order"))); singular_quadrature_order = prm.get_integer("Singular quadrature order"); diff --git a/deal.II/lac/include/lac/filtered_matrix.h b/deal.II/lac/include/lac/filtered_matrix.h index 58fe000a26..069326161d 100644 --- a/deal.II/lac/include/lac/filtered_matrix.h +++ b/deal.II/lac/include/lac/filtered_matrix.h @@ -612,7 +612,7 @@ class FilteredMatrix : public Subscriptor * it using the SmartPointer * class. */ - std_cxx0x::shared_ptr > matrix; + std_cxx1x::shared_ptr > matrix; /** * Sorted list of pairs denoting @@ -812,7 +812,7 @@ inline void FilteredMatrix::initialize (const MATRIX &m, bool ecs) { - matrix = std_cxx0x::shared_ptr > ( + matrix = std_cxx1x::shared_ptr > ( new_pointer_matrix_base(m, VECTOR())); expect_constrained_source = ecs; diff --git a/deal.II/lac/include/lac/petsc_matrix_base.h b/deal.II/lac/include/lac/petsc_matrix_base.h index 9f04b43399..0a5589fb2c 100644 --- a/deal.II/lac/include/lac/petsc_matrix_base.h +++ b/deal.II/lac/include/lac/petsc_matrix_base.h @@ -22,7 +22,7 @@ #ifdef DEAL_II_USE_PETSC #include -#include +#include #include #include @@ -150,13 +150,13 @@ namespace PETScWrappers * accessor can access this data * if necessary. */ - std_cxx0x::shared_ptr > colnum_cache; + std_cxx1x::shared_ptr > colnum_cache; /** * Similar cache for the values * of this row. */ - std_cxx0x::shared_ptr > value_cache; + std_cxx1x::shared_ptr > value_cache; /** * Discard the old row caches diff --git a/deal.II/lac/include/lac/petsc_solver.h b/deal.II/lac/include/lac/petsc_solver.h index 742582aca5..380652cfe4 100644 --- a/deal.II/lac/include/lac/petsc_solver.h +++ b/deal.II/lac/include/lac/petsc_solver.h @@ -16,7 +16,7 @@ #include #include #include -#include +#include #ifdef DEAL_II_USE_PETSC @@ -225,7 +225,7 @@ namespace PETScWrappers * the main solver routine if * necessary. */ - std_cxx0x::shared_ptr solver_data; + std_cxx1x::shared_ptr solver_data; }; diff --git a/deal.II/lac/include/lac/trilinos_precondition.h b/deal.II/lac/include/lac/trilinos_precondition.h index 791f59ce66..26ab08b814 100755 --- a/deal.II/lac/include/lac/trilinos_precondition.h +++ b/deal.II/lac/include/lac/trilinos_precondition.h @@ -17,7 +17,7 @@ #include #include -#include +#include #ifdef DEAL_II_USE_TRILINOS @@ -1462,7 +1462,7 @@ namespace TrilinosWrappers * A copy of the deal.II matrix into * Trilinos format. */ - std_cxx0x::shared_ptr Matrix; + std_cxx1x::shared_ptr Matrix; }; } diff --git a/deal.II/lac/include/lac/trilinos_sparse_matrix.h b/deal.II/lac/include/lac/trilinos_sparse_matrix.h index 3873c70b4d..b370ad2d3e 100755 --- a/deal.II/lac/include/lac/trilinos_sparse_matrix.h +++ b/deal.II/lac/include/lac/trilinos_sparse_matrix.h @@ -20,7 +20,7 @@ #include #include -#include +#include #include #include #include @@ -164,13 +164,13 @@ namespace TrilinosWrappers * than one accessor can access * this data if necessary. */ - std_cxx0x::shared_ptr > colnum_cache; + std_cxx1x::shared_ptr > colnum_cache; /** * Similar cache for the values * of this row. */ - std_cxx0x::shared_ptr > value_cache; + std_cxx1x::shared_ptr > value_cache; /** * Discard the old row caches diff --git a/deal.II/lac/include/lac/trilinos_sparsity_pattern.h b/deal.II/lac/include/lac/trilinos_sparsity_pattern.h index 2b69c70ea8..f1c43cd3f6 100755 --- a/deal.II/lac/include/lac/trilinos_sparsity_pattern.h +++ b/deal.II/lac/include/lac/trilinos_sparsity_pattern.h @@ -18,7 +18,7 @@ #include #include -#include +#include #include #include #include @@ -149,7 +149,7 @@ namespace TrilinosWrappers * than one accessor can access * this data if necessary. */ - std_cxx0x::shared_ptr > colnum_cache; + std_cxx1x::shared_ptr > colnum_cache; /** * Discard the old row caches diff --git a/deal.II/lac/source/trilinos_precondition.cc b/deal.II/lac/source/trilinos_precondition.cc index 7db151a005..659a444cec 100755 --- a/deal.II/lac/source/trilinos_precondition.cc +++ b/deal.II/lac/source/trilinos_precondition.cc @@ -690,7 +690,7 @@ namespace TrilinosWrappers map.reset (new Epetra_Map(n_rows, 0, communicator)); Matrix.reset(); - Matrix = std_cxx0x::shared_ptr (new SparseMatrix()); + Matrix = std_cxx1x::shared_ptr (new SparseMatrix()); Matrix->reinit (*map, deal_ii_sparse_matrix, drop_tolerance); Matrix->compress(); -- 2.39.5