Regenerate.

git-svn-id: https://svn.dealii.org/trunk@20690 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/deal.II/configure b/deal.II/configure
index 8f1ef339d1cef04f21b1314c18d8e9ee397c0c70..28b1b9668ac7999597b55917fda654419c2aa4e3 100755 (executable)
--- a/deal.II/configure
+++ b/deal.II/configure
@@ -784,12 +784,12 @@ SHELL'
 ac_subst_files=''
 ac_user_opts='
 enable_option_checking
-enable_threads
+with_threads
 with_boost
 enable_shared
 enable_parser
 enable_mgcompatibility
-enable_compat_blocker
+with_compat_blocker
 with_petsc
 with_petsc_arch
 with_slepc
@@ -1449,7 +1449,6 @@ 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-threads  Use multiple threads inside deal.II
   --enable-shared         Set compiler flags to generate shared libraries
   --enable-parser         While switched on by default, this option allows to
                           switch off support for the function parser in the
@@ -1458,43 +1457,45 @@ Optional Features:
                           Use preconditioner interface in MGSmootherRelaxation
                           instead of the new interface using the function
                           step. Defaults to disabled.
-  --enable-compat-blocker=mapping
-                          Block functions that implicitely assume a Q1 mapping
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+  --enable-threads        Use multiple threads inside deal.II
   --with-boost=/path/to/boost
                           Use an installed boost library instead of the
-                         contributed one. The optional argument points to the
-                         directory containing the boost subdirectory for
+                          contributed one. The optional argument points to the
+                          directory containing the boost subdirectory for
                           header files.
-  --with-petsc=/path/to/petsc
+  --enable-compat-blocker=mapping
+                          Block functions that implicitely assume a Q1 mapping
+  --with-petsc=path/to/slepc
                           Specify the path to the PETSc installation, of which
-                         the include and library directories are subdirs; use
-                         this if you want to override the PETSC_DIR environment
-                         variable.
+                          the include and library directories are subdirs; use
+                          this if you want to override the PETSC_DIR
+                          environment variable.
   --with-petsc-arch=architecture
-                          Specify the architecture for your PETSc installation;
-                         use this if you want to override the PETSC_ARCH
-                         environment variable.
-  --with-slepc=/path/to/slepc
-                          Specify the path to the SLEPc installation, for which
-                          the include directory is a subdir; use this if you
-                          want to override the SLEPC_DIR environment variable.
+                          Specify the architecture for your PETSc
+                          installation; use this if you want to override the
+                          PETSC_ARCH environment variable.
+  --with-slepc=path/to/slepc
+                          Specify the path to the SLEPc installation, for
+                          which the include directory is a subdir; use this if
+                          you want to override the SLEPC_DIR environment
+                          variable.
   --with-trilinos=/path/to/trilinos
                           Specify the path to the Trilinos installation, of
-                          which the include and lib directories are subdirs; use
-                          this if you want to override the TRILINOS_DIR
-                         environment variable.
+                          which the include and lib directories are subdirs;
+                          use this if you want to override the TRILINOS_DIR
+                          environment variable.
   --with-trilinos-include=/path/to/trilinos
-                          Specify the path to the Trilinos include; use this if
-                          you want to override the TRILINOS_INCDIR environment
-                          variable.
+                          Specify the path to the Trilinos include; use this
+                          if you want to override the TRILINOS_INCDIR
+                          environment variable.
   --with-trilinos-libs=/path/to/trilinos
                           Specify the path to the Trilinos libraries; use this
                           if you want to override the TRILINOS_LIBDIR
-                                 environment variable.
+                          environment variable.
   --with-blas=blaslib     Use the blas library blaslib. Make sure the path
                           to the libary is searched by ld, since it is
                          included by the argument -lblaslib. If no argument
@@ -1505,56 +1506,54 @@ Optional Packages:
                          default is -lz). Make sure the library is in the
                          search path of ld
   --with-netcdf=/path/to/netcdf
-                          Specify the path to the NetCDF installation, of which
-                          the include and library directories are subdirs; use
-                          this if you want to override the NETCDF_DIR
-                         environment variable.
+                          Specify the path to the NetCDF installation, of
+                          which the include and library directories are
+                          subdirs; use this if you want to override the
+                          NETCDF_DIR environment variable.
   --with-netcdf-include=/path/to/netcdf
-                          Specify the path to the NetCDF headers file; use this
-                          if you want to override the NETCDF_INCLUDE_DIR
-                         environment variable.
+                          Specify the path to the NetCDF headers file; use
+                          this if you want to override the NETCDF_INCLUDE_DIR
+                          environment variable.
   --with-netcdf-libs=/path/to/netcdf
-                          Specify the path to the NetCDF libraries; use this if
-                         you want to override the NETCDF_LIBDIR environment
-                         variable.
+                          Specify the path to the NetCDF libraries; use this
+                          if you want to override the NETCDF_LIBDIR
+                          environment variable.
   --with-metis=/path/to/metis
                           Specify the path to the Metis installation, of which
-                          the include and library directories are   subdirs; use
-                          this if you want to override the METIS_DIR environment
-                          variable.
+                          the include and library directories are subdirs; use
+                          this if you want to override the METIS_DIR
+                          environment variable.
   --with-metis-include=/path/to/metis
                           Specify the path to the METIS headers file; use this
                           if you want to override the METIS_INCLUDE_DIR
-                         environment variable.
+                          environment variable.
   --with-metis-libs=/path/to/metis
                           Specify the path to the METIS libraries; use this if
-                         you want to override the METIS_LIBDIR
-                         environment variable.
+                          you want to override the METIS_LIBDIR environment
+                          variable.
   --with-umfpack=umfpack-root-directory
                           Use installed UMFPack version.
-                         'umfpack-root-directory' should be the directory
-                         containing directories AMD and UMFPACK. The
-                         contributed UMFPack library is used if no argument is
-                         given. Default is not to use UMFPack.
+                          'umfpack-root-directory' should be the directory
+                          containing directories AMD and UMFPACK. The
+                          contributed UMFPack library is used if no argument
+                          is given. Default is not to use UMFPack.
   --with-umfpack-include=/path/to/UMFPACK
-                          Specify the path to the UMFPACK headers file; use this
-                          if you want to override the UMFPACK_INCDIR
-                         environment variable.
+                          Specify the path to the UMFPACK headers file; use
+                          this if you want to override the UMFPACK_INCDIR
+                          environment variable.
   --with-umfpack-libs=/path/to/UMFPACK
-                          Specify the path to the UMFPACK libraries; use this if
-                         you want to override the UMFPACK_LIBDIR environment
-                         variable.
+                          Specify the path to the UMFPACK libraries; use this
+                          if you want to override the UMFPACK_LIBDIR
+                          environment variable.
   --with-lapack=lapacklib Use the lapack library lapacklib. Make sure the
                          path to the libary is searched by ld, since it is
                          included by the argument -llapacklib. If no argument
                          is given, use -llapack. Default is not to use
                           -llapack.
-  --with-cpu=cpu          Optimize specifically for the given CPU type,
-                         rather than just generating code for this processor
-                         family.
+  --with-cpu=cpu          Optimize specifically for the given CPU type, rather
+                          than just generating code for this processor family.
   --with-doxygen=filename Use 'filename' for doxygen.
 
-
 Some influential environment variables:
   CC          C compiler command
   CFLAGS      C compiler flags
@@ -5751,9 +5750,10 @@ $as_echo "Unknown C compiler - using generic options" >&6; }
 
 
 
-  # Check whether --enable-threads was given.
-if test "${enable_threads+set}" = set; then
-  enableval=$enable_threads;
+
+# Check whether --with-threads was given.
+if test "${with_threads+set}" = set; then
+  withval=$with_threads;
       enablethreads="$enableval"
 
 else
@@ -11689,6 +11689,7 @@ fi
 BOOST_INCLUDE_DIR="-I$DEAL_II_PATH/contrib/boost/include"
 
 
+
 # Check whether --with-boost was given.
 if test "${with_boost+set}" = set; then
   withval=$with_boost;
@@ -13239,9 +13240,10 @@ fi
 
 
 
-  # Check whether --enable-compat-blocker was given.
-if test "${enable_compat_blocker+set}" = set; then
-  enableval=$enable_compat_blocker; enable_compat_blocker="$enableval"
+
+# Check whether --with-compat-blocker was given.
+if test "${with_compat_blocker+set}" = set; then
+  withval=$with_compat_blocker; enable_compat_blocker="$enableval"
 else
   enable_compat_blocker=""
 fi
@@ -13688,6 +13690,7 @@ $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; }
 
+
 # Check whether --with-trilinos was given.
 if test "${with_trilinos+set}" = set; then
   withval=$with_trilinos;
@@ -13747,6 +13750,7 @@ fi
   { $as_echo "$as_me:$LINENO: checking for Trilinos header directory" >&5
 $as_echo_n "checking for Trilinos header directory... " >&6; }
 
+
 # Check whether --with-trilinos-include was given.
 if test "${with_trilinos_include+set}" = set; then
   withval=$with_trilinos_include;
@@ -13802,6 +13806,7 @@ fi
   { $as_echo "$as_me:$LINENO: checking for Trilinos library directory" >&5
 $as_echo_n "checking for Trilinos library directory... " >&6; }
 
+
 # Check whether --with-trilinos-libs was given.
 if test "${with_trilinos_libs+set}" = set; then
   withval=$with_trilinos_libs;
@@ -15494,6 +15499,7 @@ fi
 
   acx_umfpack=no
 
+
 # Check whether --with-umfpack-include was given.
 if test "${with_umfpack_include+set}" = set; then
   withval=$with_umfpack_include;