Aesthetic change (Part I): Added m4 helper AC_HELP_STRING to configure. Aclocal.m4...

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

diff --git a/deal.II/aclocal.m4 b/deal.II/aclocal.m4
index d117f18bfd242a76c8096612941ac6bb849bfdab..f4088b452f85bbffca0431c73a4ee8f67f91387f 100644 (file)
--- a/deal.II/aclocal.m4
+++ b/deal.II/aclocal.m4
@@ -2025,9 +2025,8 @@ dnl -------------------------------------------------------------
 AC_DEFUN(DEAL_II_CHECK_CPU_OPTIMIZATIONS, dnl
 [
   AC_ARG_WITH(cpu,
-  [  --with-cpu=cpu          Optimize specifically for the given CPU type,
-                         rather than just generating code for this processor
-                         family.],
+              [AS_HELP_STRING([--with-cpu=cpu],
+              [Optimize specifically for the given CPU type, rather than just generating code for this processor family.])],
       withcpu="$withval",
       withcpu="")
   AC_MSG_CHECKING(for CPU to optimize for)
@@ -2207,8 +2206,9 @@ dnl
 dnl -------------------------------------------------------------
 AC_DEFUN(DEAL_II_CHECK_MULTITHREADING, dnl
 [
-  AC_ARG_ENABLE(threads,
-    [  --enable-threads  Use multiple threads inside deal.II],
+  AC_ARG_WITH(threads,
+              [AS_HELP_STRING([--enable-threads],
+              [Use multiple threads inside deal.II])],
     [
       enablethreads="$enableval"
     ],
@@ -2453,9 +2453,9 @@ dnl
 dnl -------------------------------------------------------------
 AC_DEFUN(DEAL_II_CHECK_COMPAT_BLOCKER, dnl
 [
-  AC_ARG_ENABLE(compat-blocker,
-  [  --enable-compat-blocker=mapping
-                          Block functions that implicitely assume a Q1 mapping],
+  AC_ARG_WITH(compat-blocker,
+              [AS_HELP_STRING([--enable-compat-blocker=mapping],
+              [Block functions that implicitely assume a Q1 mapping])],
       enable_compat_blocker="$enableval",
       enable_compat_blocker="")
 
@@ -4589,12 +4589,10 @@ dnl Check for boost option and find pre-installed boost
 dnl -------------------------------------------------------------
 
 AC_DEFUN(DEAL_II_CHECK_BOOST, dnl
-[ AC_ARG_WITH(boost,
-   [  --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
-                          header files.],
+[ 
+  AC_ARG_WITH(boost,
+              [AS_HELP_STRING([--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 header files.])],
   DEAL_II_WITH_BOOST($withval))
 
   CPPFLAGS="$BOOST_INCLUDE_DIR $CPPFLAGS"
@@ -5466,8 +5464,8 @@ dnl -------------------------------------------------------------
 AC_DEFUN(DEAL_II_CHECK_DOXYGEN, dnl
 [
   AC_ARG_WITH(doxygen,
-  [  --with-doxygen=filename Use 'filename' for doxygen.
-  ],
+              [AS_HELP_STRING([--with-doxygen=filename],
+              [Use 'filename' for doxygen.])],
       DOXYGEN="$withval",
       DOXYGEN=)
 
@@ -5616,11 +5614,8 @@ dnl -------------------------------------------------------------
 AC_DEFUN(DEAL_II_CONFIGURE_NETCDF, dnl
 [
   AC_ARG_WITH(netcdf,
-  [  --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.],
+              [AS_HELP_STRING([--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.])],
      [
         DEAL_II_NETCDF_DIR="$withval"
      ],
@@ -5633,20 +5628,16 @@ AC_DEFUN(DEAL_II_CONFIGURE_NETCDF, dnl
         fi
      ])
 
-   AC_ARG_WITH(netcdf-include,
-   [  --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.],
+  AC_ARG_WITH(netcdf-include,
+              [AS_HELP_STRING([--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.])],
       [
         NETCDF_INCLUDE_DIR="$withval"
       ])
 
-   AC_ARG_WITH(netcdf-libs,
-   [  --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.],
+  AC_ARG_WITH(netcdf-libs,
+              [AS_HELP_STRING([--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.])],
       [
         NETCDF_LIBDIR="$withval"
       ])
@@ -5716,11 +5707,8 @@ AC_DEFUN(DEAL_II_CONFIGURE_PETSC, dnl
   AC_MSG_CHECKING(for PETSc library directory)
 
   AC_ARG_WITH(petsc,
-  [  --with-petsc=/path/to/petsc
-                          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.],
+              [AS_HELP_STRING([--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.])],
      [
         dnl Special case when someone does --with-petsc=no
         if test "x$withval" = "xno" ; then
@@ -5823,10 +5811,8 @@ AC_DEFUN(DEAL_II_CONFIGURE_PETSC_ARCH, dnl
   AC_MSG_CHECKING(for PETSc library architecture)
 
   AC_ARG_WITH(petsc-arch,
-  [  --with-petsc-arch=architecture
-                          Specify the architecture for your PETSc installation;
-                         use this if you want to override the PETSC_ARCH
-                         environment variable.],
+              [AS_HELP_STRING([--with-petsc-arch=architecture],
+              [Specify the architecture for your PETSc installation; use this if you want to override the PETSC_ARCH environment variable.])],
      [
         DEAL_II_PETSC_ARCH="$withval"
        AC_MSG_RESULT($DEAL_II_PETSC_ARCH)
@@ -6016,10 +6002,8 @@ AC_DEFUN(DEAL_II_CONFIGURE_SLEPC, dnl
   AC_MSG_CHECKING(for SLEPc include directory)
 
   AC_ARG_WITH(slepc,
-  [  --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.],
+              [AS_HELP_STRING([--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.])],
      [
         dnl Special case when someone does --with-slepc=no
         if test "x$withval" = "xno" ; then
@@ -6138,12 +6122,10 @@ dnl ------------------------------------------------------------
 AC_DEFUN(DEAL_II_CONFIGURE_TRILINOS, dnl
 [
  AC_MSG_CHECKING(for Trilinos directory)
- AC_ARG_WITH(trilinos,
-  [  --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.],
+
+  AC_ARG_WITH(trilinos,
+              [AS_HELP_STRING([--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.])],
      [
         dnl Special case when someone does --with-petsc=no
         if test "x$withval" = "xno" ; then
@@ -6189,11 +6171,10 @@ AC_DEFUN(DEAL_II_CONFIGURE_TRILINOS, dnl
      ])
 
   AC_MSG_CHECKING(for Trilinos header directory)
+
   AC_ARG_WITH(trilinos-include,
-  [  --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.],
+              [AS_HELP_STRING([--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.])],
      [
         dnl Special case when someone does --with-petsc=no
         if test "x$withval" = "xno" ; then
@@ -6238,11 +6219,10 @@ AC_DEFUN(DEAL_II_CONFIGURE_TRILINOS, dnl
      ])
 
   AC_MSG_CHECKING(for Trilinos library directory)
+
   AC_ARG_WITH(trilinos-libs,
-  [  --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.],
+              [AS_HELP_STRING([--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.])],
      [
         dnl Special case when someone does --with-petsc=no
         if test "x$withval" = "xno" ; then
@@ -6515,11 +6495,8 @@ AC_DEFUN(DEAL_II_CONFIGURE_METIS, dnl
   dnl First check for the Metis directory
 
   AC_ARG_WITH(metis,
-  [  --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.],
+              [AS_HELP_STRING([--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.])],
      [
        USE_CONTRIB_METIS=yes
         DEAL_II_METIS_DIR="$withval"
@@ -6554,19 +6531,15 @@ AC_DEFUN(DEAL_II_CONFIGURE_METIS, dnl
      ])
 
   AC_ARG_WITH(metis-include,
-  [  --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.],
+              [AS_HELP_STRING([--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.])],
      [
         AC_MSG_ERROR([The --with-metis-include directive is no longer supported])
      ])
 
   AC_ARG_WITH(metis-libs,
-  [  --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.],
+              [AS_HELP_STRING([--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.])],
      [
        USE_CONTRIB_METIS=yes
         DEAL_II_METIS_LIBDIR="$withval"
@@ -6620,12 +6593,8 @@ dnl --------------------------------------------------
 AC_DEFUN(DEAL_II_WITH_UMFPACK, dnl
 [
   AC_ARG_WITH(umfpack,
-  [  --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.],
+              [AS_HELP_STRING([--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.])],
      [
         AC_MSG_CHECKING(UMFPACK library)
         USE_CONTRIB_UMFPACK='yes'
@@ -6644,21 +6613,18 @@ AC_DEFUN(DEAL_II_WITH_UMFPACK, dnl
      ])
 
   acx_umfpack=no
+
   AC_ARG_WITH(umfpack-include,
-  [  --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.],
+              [AS_HELP_STRING([--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.])],
      [
        UMFPACK_INCDIR="$withval"
         acx_umfpack=yes
      ])
 
   AC_ARG_WITH(umfpack-libs,
-  [  --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.],
+              [AS_HELP_STRING([--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.])],
      [
        UMFPACK_LIBDIR="$withval"
         acx_umfpack=yes