]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Allow to disable use of PETSc with --with-mpi=no
authorWolfgang Bangerth <bangerth@math.tamu.edu>
Mon, 16 Jan 2006 23:06:40 +0000 (23:06 +0000)
committerWolfgang Bangerth <bangerth@math.tamu.edu>
Mon, 16 Jan 2006 23:06:40 +0000 (23:06 +0000)
git-svn-id: https://svn.dealii.org/trunk@12058 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/aclocal.m4
deal.II/configure
deal.II/doc/news/changes.html
deal.II/doc/readme.html

index 0dc0ebb82b5ddc8dee320bcb442d31f3393b2331..e5850ef69770a07655aa3744f930dd221ad2d664 100644 (file)
@@ -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
index 182b68012cb359e660b3655469fd65478adb5c58..d02b1b6c51920caab577b9fbeb15c0f2a58fe700 100755 (executable)
@@ -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;}
index 1b2a19d0a601cc1b241144312be448b5b925ed97..07ec11efcee889ac2f50b838331d5fea88a2742d 100644 (file)
@@ -104,6 +104,17 @@ inconvenience this causes.
 <h3>General</h3>
 
 <ol>
+  <li> <p>
+       Improved: If you do have a PETSc installation
+       and have set the <code>PETSC_DIR</code> and
+       <code>PETSC_ARCH</code> environment variables but do not wish
+       <acronym>deal.II</acronym> to be configured for PETSc use, you
+       should specify <code>--with-petsc=no</code> as a flag during
+       configuration. 
+       <br> 
+       (WB 2006/01/16)
+       </p>
+
   <li> <p>
        Improved: In all directories, including those for tutorial
        programs, we generate a file called <code>Makefile.dep</code>
index b6e232a8d6ed48ba0101fc35e191dd4707271e5f..b77416191abe65c94d7c72ad358cae65038bbb42 100644 (file)
       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 <code>--with-petsc=DIR</code> and
-      <code>--with-mpi-arch=ARCH</code> switches to <code>./configure</code>.
+      <code>--with-mpi-arch=ARCH</code> switches to
+      <code>./configure</code>. If you do have a PETSc installation
+      and have set the <code>PETSC_DIR</code> and
+      <code>PETSC_ARCH</code> environment variables but do not wish
+      <acronym>deal.II</acronym> to be configured for PETSc use, you
+      should specify <code>--with-petsc=no</code> as a flag during
+      configuration. 
       </p>
 
       <p>

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.