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 de0e5cd067eb5f0eb801569211313f22b34fc7d4..2589e7eb201ab4c3f5e9ce23c1f84acb27c65aab 100644 (file)
--- 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 c2537970467178835f81c447be0294764df79b22..6c82ef56ea6e69c9ce28fd4ded57b357d2b65c56 100644 (file)
--- 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)