From: young <young@0785d39b-7218-0410-832d-ea1e28bc413d>
Date: Tue, 13 Sep 2011 09:08:36 +0000 (+0000)
Subject: Fix weird bug detecting PETSc 3.2 version numbers
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=25da8e22391c2fac5230fb4da6dc7ad2c337bc8b;p=dealii-svn.git

Fix weird bug detecting PETSc 3.2 version numbers

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

diff --git a/deal.II/aclocal.m4 b/deal.II/aclocal.m4
index de0e5cd067..2589e7eb20 100644
--- a/deal.II/aclocal.m4
+++ b/deal.II/aclocal.m4
@@ -5829,7 +5829,7 @@ AC_DEFUN(DEAL_II_CHECK_PETSC_MPI_CONSISTENCY, dnl
   dnl
   dnl Like always, we have to cake care of version control!
     case "${DEAL_II_PETSC_VERSION_MAJOR}.${DEAL_II_PETSC_VERSION_MINOR}.${DEAL_II_PETSC_VERSION_SUBMINOR}" in
-      2.3*) dnl
+      2.3.*) dnl
         AC_TRY_COMPILE(
         [#include "$DEAL_II_PETSC_DIR/bmake/$DEAL_II_PETSC_ARCH/petscconf.h"
         ],
diff --git a/deal.II/common/Make.global_options.in b/deal.II/common/Make.global_options.in
index c253797046..6c82ef56ea 100644
--- a/deal.II/common/Make.global_options.in
+++ b/deal.II/common/Make.global_options.in
@@ -306,8 +306,10 @@ INCLUDE = -I$D/include \
 #
 # also, note that this only works for PETSc before 2.3 :-]
 ifeq ($(USE_CONTRIB_PETSC),yes)
-  ifeq ($(DEAL_II_PETSC_VERSION_MINOR),2)
-    include $(DEAL_II_PETSC_DIR)/bmake/$(DEAL_II_PETSC_ARCH)/packages
+  ifeq ($(DEAL_II_PETSC_VERSION_MAJOR),2)
+    ifeq ($(DEAL_II_PETSC_VERSION_MINOR),2)
+      include $(DEAL_II_PETSC_DIR)/bmake/$(DEAL_II_PETSC_ARCH)/packages
+    endif
   endif
   INCLUDE += -I$(include-path-petsc) -I$(include-path-petsc-bmake)\
              $(MPI_INCLUDE)