From b8483b1b6cfb43c90c78fcbeaab3a1566c85782c Mon Sep 17 00:00:00 2001 From: Wolfgang Bangerth Date: Mon, 16 Jan 2006 23:06:40 +0000 Subject: [PATCH] Allow to disable use of PETSc with --with-mpi=no git-svn-id: https://svn.dealii.org/trunk@12058 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/aclocal.m4 | 24 +++++++++++++++--------- deal.II/configure | 29 ++++++++++++++++++----------- deal.II/doc/news/changes.html | 11 +++++++++++ deal.II/doc/readme.html | 8 +++++++- 4 files changed, 51 insertions(+), 21 deletions(-) diff --git a/deal.II/aclocal.m4 b/deal.II/aclocal.m4 index 0dc0ebb82b..e5850ef697 100644 --- a/deal.II/aclocal.m4 +++ b/deal.II/aclocal.m4 @@ -4663,16 +4663,22 @@ AC_DEFUN(DEAL_II_CONFIGURE_PETSC, dnl are subdirs; use this if you want to override the PETSC_DIR environment variable.], [ - USE_CONTRIB_PETSC=yes - DEAL_II_PETSC_DIR=$withval - AC_MSG_RESULT($DEAL_II_PETSC_DIR) + dnl Special case when someone does --with-petsc=no + if test "x$withval" = "xno" ; then + AC_MSG_RESULT([explicitly disabled]) + USE_CONTRIB_PETSC=no + else + USE_CONTRIB_PETSC=yes + DEAL_II_PETSC_DIR=$withval + AC_MSG_RESULT($DEAL_II_PETSC_DIR) - dnl Make sure that what was specified is actually correct - if test ! -d $DEAL_II_PETSC_DIR/include \ - -o ! -d $DEAL_II_PETSC_DIR/lib ; then - AC_MSG_ERROR([Path to PETSc specified with --with-petsc does not - point to a complete PETSc installation]) - fi + dnl Make sure that what was specified is actually correct + if test ! -d $DEAL_II_PETSC_DIR/include \ + -o ! -d $DEAL_II_PETSC_DIR/lib ; then + AC_MSG_ERROR([Path to PETSc specified with --with-petsc does not + point to a complete PETSc installation]) + fi + fi ], [ dnl Take something from the environment variables, if it is there diff --git a/deal.II/configure b/deal.II/configure index 182b68012c..d02b1b6c51 100755 --- a/deal.II/configure +++ b/deal.II/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision: 1.217 . +# From configure.in Revision: 1.218 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.59 for deal.II 5.3.pre. # @@ -9328,19 +9328,25 @@ echo $ECHO_N "checking for PETSc library directory... $ECHO_C" >&6 if test "${with_petsc+set}" = set; then withval="$with_petsc" - USE_CONTRIB_PETSC=yes - DEAL_II_PETSC_DIR=$withval - echo "$as_me:$LINENO: result: $DEAL_II_PETSC_DIR" >&5 + if test "x$withval" = "xno" ; then + 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 + 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 \ - -o ! -d $DEAL_II_PETSC_DIR/lib ; then - { { echo "$as_me:$LINENO: error: Path to PETSc specified with --with-petsc does not - point to a complete PETSc installation" >&5 + if test ! -d $DEAL_II_PETSC_DIR/include \ + -o ! -d $DEAL_II_PETSC_DIR/lib ; then + { { echo "$as_me:$LINENO: error: Path to PETSc specified with --with-petsc does not + point to a complete PETSc installation" >&5 echo "$as_me: error: Path to PETSc specified with --with-petsc does not - point to a complete PETSc installation" >&2;} + point to a complete PETSc installation" >&2;} { (exit 1); exit 1; }; } - fi + fi + fi else @@ -10711,7 +10717,7 @@ LDFLAGS="-L$DEAL_II_PATH/lib $LDFLAGS" - ac_config_files="$ac_config_files common/Make.global_options common/Makefile.template common/scripts/make_dependencies.pl Version doc/Makefile doc/doxygen/Makefile doc/doxygen/options.dox doc/doxygen/header.html" + ac_config_files="$ac_config_files common/Make.global_options common/Makefile.template common/scripts/make_dependencies.pl Version doc/Makefile doc/doxygen/Makefile doc/doxygen/options.dox doc/doxygen/header.html doc/doxygen/header.tex" test "x$prefix" = xNONE && prefix=$ac_default_prefix @@ -11191,6 +11197,7 @@ do "doc/doxygen/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/doxygen/Makefile" ;; "doc/doxygen/options.dox" ) CONFIG_FILES="$CONFIG_FILES doc/doxygen/options.dox" ;; "doc/doxygen/header.html" ) CONFIG_FILES="$CONFIG_FILES doc/doxygen/header.html" ;; + "doc/doxygen/header.tex" ) CONFIG_FILES="$CONFIG_FILES doc/doxygen/header.tex" ;; "base/include/base/config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS base/include/base/config.h" ;; *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} diff --git a/deal.II/doc/news/changes.html b/deal.II/doc/news/changes.html index 1b2a19d0a6..07ec11efce 100644 --- a/deal.II/doc/news/changes.html +++ b/deal.II/doc/news/changes.html @@ -104,6 +104,17 @@ inconvenience this causes.

General

    +
  1. + Improved: If you do have a PETSc installation + and have set the PETSC_DIR and + PETSC_ARCH environment variables but do not wish + deal.II to be configured for PETSc use, you + should specify --with-petsc=no as a flag during + configuration. +
    + (WB 2006/01/16) +

    +
  2. Improved: In all directories, including those for tutorial programs, we generate a file called Makefile.dep diff --git a/deal.II/doc/readme.html b/deal.II/doc/readme.html index b6e232a8d6..b77416191a 100644 --- a/deal.II/doc/readme.html +++ b/deal.II/doc/readme.html @@ -816,7 +816,13 @@ enable the wrapper classes (they are disabled by default, if PETSc is unavailable). However, you can override the values of these environment variablaes by using the --with-petsc=DIR and - --with-mpi-arch=ARCH switches to ./configure. + --with-mpi-arch=ARCH switches to + ./configure. If you do have a PETSc installation + and have set the PETSC_DIR and + PETSC_ARCH environment variables but do not wish + deal.II to be configured for PETSc use, you + should specify --with-petsc=no as a flag during + configuration.

    -- 2.39.5