From bcb4f37c074b4ff0cb647faa669ba4a579b202f5 Mon Sep 17 00:00:00 2001 From: Ralf Hartmann Date: Thu, 22 Sep 2005 14:19:14 +0000 Subject: [PATCH] Clean up doc of configure options. git-svn-id: https://svn.dealii.org/trunk@11503 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/aclocal.m4 | 39 +++++++++++++------------- deal.II/configure | 67 ++++++++++++++++++++++---------------------- deal.II/configure.in | 28 +++++++++--------- 3 files changed, 68 insertions(+), 66 deletions(-) diff --git a/deal.II/aclocal.m4 b/deal.II/aclocal.m4 index b00e8c37af..0394db4148 100644 --- a/deal.II/aclocal.m4 +++ b/deal.II/aclocal.m4 @@ -1411,7 +1411,7 @@ 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], + processor family.], withcpu=$withval, withcpu="") AC_MSG_CHECKING(for CPU to optimize for) @@ -1564,7 +1564,7 @@ dnl ------------------------------------------------------------- AC_DEFUN(DEAL_II_CHECK_MULTITHREADING, dnl [ AC_ARG_ENABLE(multithreading, - [ --enable-multithreading set compiler flags to allow for + [ --enable-multithreading set compiler flags to allow for multithreaded programs], enablemultithreading=$enableval, enablemultithreading=no) @@ -1698,8 +1698,8 @@ dnl ------------------------------------------------------------- AC_DEFUN(DEAL_II_CHECK_USE_MT, dnl [ AC_ARG_WITH(multithreading, - [ --with-multithreading=name If name==posix, or no name given, then use - POSIX threads], + [ --with-multithreading=name If name==posix, or no name given, then use + POSIX threads.], withmultithreading=$withval, withmultithreading=no) @@ -1842,7 +1842,7 @@ dnl ------------------------------------------------------------- AC_DEFUN(DEAL_II_CHECK_COMPAT_BLOCKER, dnl [ AC_ARG_ENABLE(compat-blocker, - [ --enable-compat-blocker=mapping block functions that implicitely + [ --enable-compat-blocker=mapping block functions that implicitely assume a Q1 mapping], enable_compat_blocker=$enableval, enable_compat_blocker="") @@ -4364,7 +4364,7 @@ dnl ------------------------------------------------------------- AC_DEFUN(DEAL_II_CHECK_DOXYGEN, dnl [ AC_ARG_WITH(doxygen, - [ --with-doxygen=filename use 'filename' for doxygen], + [ --with-doxygen=filename use 'filename' for doxygen], DOXYGEN=$withval, DOXYGEN=) @@ -4501,9 +4501,9 @@ 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], + 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 ], @@ -4556,10 +4556,10 @@ 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], + [ --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.], [ USE_CONTRIB_PETSC=yes DEAL_II_PETSC_DIR=$withval @@ -4632,9 +4632,8 @@ AC_DEFUN(DEAL_II_CONFIGURE_PETSC_ARCH, dnl 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], + 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) @@ -4730,10 +4729,10 @@ AC_DEFUN(DEAL_II_CONFIGURE_METIS, dnl AC_MSG_CHECKING(for Metis library 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], + [ --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 diff --git a/deal.II/configure b/deal.II/configure index 94c17b22eb..394098387a 100755 --- a/deal.II/configure +++ b/deal.II/configure @@ -817,53 +817,54 @@ if test -n "$ac_init_help"; then Optional Features: --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 + --enable-multithreading set compiler flags to allow for multithreaded programs --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 contrib directory. - --enable-compat-blocker=mapping block functions that implicitely + --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) - --with-multithreading=name If name==posix, or no name given, then use - POSIX threads - --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 + --with-multithreading=name If name==posix, or no name given, then use + POSIX threads. + --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. --with-petsc-arch=architecture Specify the architecture for your PETSc - installation; use this if you want to - override the PETSC_ARCH 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 is given, use -lblas. - Default is to use -lblas only if required by other libraries. + installation; use this if you want to override + the PETSC_ARCH 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 is given, use -lblas. Default is to use + -lblas only if required by other libraries. --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 - --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 - --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 - --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. + of which the include and library directories are + subdirs; use this if you want to override the + NETCDF_DIR 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. + --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. + --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-doxygen=filename use 'filename' for doxygen + processor family. + --with-doxygen=filename use 'filename' for doxygen Some influential environment variables: CC C compiler command diff --git a/deal.II/configure.in b/deal.II/configure.in index 0ac719d47d..31f9b86f80 100644 --- a/deal.II/configure.in +++ b/deal.II/configure.in @@ -412,10 +412,11 @@ dnl ------------------------------------------------------------- dnl Check for blas. AC_ARG_WITH(blas, - [ --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 is given, use -lblas. - Default is to use -lblas only if required by other libraries.], + [ --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 is given, use -lblas. Default is to use + -lblas only if required by other libraries.], DEAL_II_WITH_BLAS($withval)) DEAL_II_CONFIGURE_HSL @@ -448,11 +449,11 @@ AC_SUBST(DEAL_II_METIS_DIR) dnl Check for UMFPack. This is more an enable for the contributed version, dnl but it should become a real --with-umfpack later 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], + [ --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.], DEAL_II_WITH_UMFPACK($withval)) AC_SUBST(UMFPACK_LIB) AC_SUBST(UMFPACK_INCLUDE_DIR) @@ -460,10 +461,11 @@ AC_SUBST(USE_CONTRIB_UMFPACK) dnl Check for LAPACK AC_ARG_WITH(lapack, - [ --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-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.], DEAL_II_WITH_LAPACK($withval)) dnl ------------------------------------------------------------- -- 2.39.5