From f7b657076a071cc8b371bb3a1af3f4d0785f0de3 Mon Sep 17 00:00:00 2001
From: Salvatore Filippone <salvatore.filippone@cranfield.ac.uk>
Date: Fri, 25 Jan 2008 12:55:10 +0000
Subject: [PATCH] psblas: Refined compilation macros for handling various
 Fortran cases (see Changelog).

---
 base/modules/psb_penv_mod.F90 | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/base/modules/psb_penv_mod.F90 b/base/modules/psb_penv_mod.F90
index a904aafe..8c807011 100644
--- a/base/modules/psb_penv_mod.F90
+++ b/base/modules/psb_penv_mod.F90
@@ -171,7 +171,7 @@ module psb_penv_mod
 #endif
 
 
-#if defined(NETLIB_BLACS)
+#if defined(HAVE_KSENDID)
   interface 
     integer function krecvid(contxt,proc_to_comm,myrow)
       integer contxt,proc_to_comm,myrow
@@ -4957,11 +4957,10 @@ contains
   subroutine psb_set_coher(ictxt,isvch)
     integer :: ictxt, isvch
     ! Ensure global coherence for convergence checks.
-#ifdef NETLIB_BLACS
+#if !defined(HAVE_ESSL_BLACS)
     Call blacs_get(ictxt,16,isvch)
     Call blacs_set(ictxt,16,1)
-#endif
-#ifdef ESSL_BLACS
+#else
     ! Do nothing: ESSL does coherence by default,
     ! and does not handle req=16 
 #endif
@@ -4969,10 +4968,9 @@ contains
   subroutine psb_restore_coher(ictxt,isvch)
     integer :: ictxt, isvch
     ! Ensure global coherence for convergence checks.
-#ifdef NETLIB_BLACS
+#if !defined(HAVE_ESSL_BLACS)
     Call blacs_set(ictxt,16,isvch)
-#endif
-#ifdef ESSL_BLACS
+#else
     ! Do nothing: ESSL does coherence by default,
     ! and does not handle req=16 
 #endif
@@ -4995,7 +4993,7 @@ contains
 #endif    
   end subroutine psb_get_rank
   
-#if defined(ESSL_BLACS) || defined(SERIAL_MPI)
+#if (!defined(HAVE_KSENDID)) || defined(SERIAL_MPI)
   !
   ! Need these, as they are not in the ESSL implementation 
   ! of the BLACS.