]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Simplify a few things.
authorwolf <wolf@0785d39b-7218-0410-832d-ea1e28bc413d>
Tue, 7 Jun 2005 18:06:30 +0000 (18:06 +0000)
committerwolf <wolf@0785d39b-7218-0410-832d-ea1e28bc413d>
Tue, 7 Jun 2005 18:06:30 +0000 (18:06 +0000)
git-svn-id: https://svn.dealii.org/trunk@10846 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/aclocal.m4

index 72583446ba524298430d1f1a25574b39931668bf..f98bf9ce4a6fdce52417bae9f02809e35f86a4ca 100644 (file)
@@ -4477,48 +4477,36 @@ AC_DEFUN(DEAL_II_CONFIGURE_PETSC_ARCH, dnl
      [
         DEAL_II_PETSC_ARCH=$withval
        AC_MSG_RESULT($DEAL_II_PETSC_ARCH)
-
-        dnl Make sure that what was specified is actually correct
-        if test ! -d $DEAL_II_PETSC_DIR/lib/libg_c++/$DEAL_II_PETSC_ARCH \
-             ; then
-          dnl Check whether PETSc is installed but someone has simply
-         dnl forgotten to also compile for C++
-          if test -d $DEAL_II_PETSC_DIR/lib/libg/$DEAL_II_PETSC_ARCH \
-             ; then
-            AC_MSG_ERROR([PETSc has not been compiled for C++, but
-                          deal.II needs this])
-          else
-            AC_MSG_ERROR([PETSc has not been compiled for the architecture
-                          specified with --with-petsc-arch])
-          fi
-       fi
      ],
      [
         dnl Take something from the environment variables, if it is there
         if test "x$PETSC_ARCH" != "x" ; then
           DEAL_II_PETSC_ARCH="$PETSC_ARCH"
          AC_MSG_RESULT($DEAL_II_PETSC_ARCH)
-
-          dnl Make sure that what this is actually correct
-          if test ! -d $DEAL_II_PETSC_DIR/lib/libg_c++/$DEAL_II_PETSC_ARCH \
-             ; then
-            dnl Check whether PETSc is installed but someone has simply
-           dnl forgotten to also compile for C++
-            if test -d $DEAL_II_PETSC_DIR/lib/libg/$DEAL_II_PETSC_ARCH \
-               ; then
-              AC_MSG_ERROR([PETSc has not been compiled for C++, but
-                            deal.II needs this])
-            else
-              AC_MSG_ERROR([PETSc has not been compiled for the architecture
-                            specified with --with-petsc-arch])
-            fi
-          fi
         else
          AC_MSG_ERROR([If PETSc is used, you must specify the architecture
                         either through the PETSC_ARCH environment variable,
                         or through the --with-petsc-arch flag])
         fi
      ])
+
+
+  if test "x$PETSC_ARCH" != "x" ; then
+    dnl Make sure that what was specified is actually correct
+    if test ! -d $DEAL_II_PETSC_DIR/lib/libg_c++/$DEAL_II_PETSC_ARCH \
+         ; then
+      dnl Check whether PETSc is installed but someone has simply
+      dnl forgotten to also compile for C++
+      if test -d $DEAL_II_PETSC_DIR/lib/libg/$DEAL_II_PETSC_ARCH \
+         ; then
+        AC_MSG_ERROR([PETSc has not been compiled for C++, but
+                      deal.II needs this])
+      else
+        AC_MSG_ERROR([PETSc has not been compiled for the architecture
+                      specified with --with-petsc-arch])
+      fi
+    fi
+  fi
 ])
 
 

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.