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

---
 Make/Make.inc.g95             | 3 ++-
 Make/Make.inc.gnu42           | 1 +
 Make/Make.inc.gnu42-serialmpi | 1 +
 Make/Make.inc.gnu43           | 3 ++-
 Make/Make.inc.ifort9          | 5 +++--
 Make/Make.inc.sp5             | 3 ++-
 Make/Make.inc.sun-6.2         | 4 ++--
 7 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/Make/Make.inc.g95 b/Make/Make.inc.g95
index 22bcc860..411033fb 100644
--- a/Make/Make.inc.g95
+++ b/Make/Make.inc.g95
@@ -54,7 +54,8 @@ PSBLDLIBS=$(BLACS) $(BLAS) $(METIS_LIB)
 
 #  Add -DLargeFptr for 64-bit addresses
 PSBCDEFINES=-DAdd_ 
-PSBFDEFINES=-DNETLIB_BLACS  $(MPI_FINC) -DHAVE_MOVE_ALLOC
+#
+PSBFDEFINES=-DHAVE_KSENDID  $(MPI_FINC) -DHAVE_MOVE_ALLOC
 # -DHAVE_METIS
 
 AR=ar -cur
diff --git a/Make/Make.inc.gnu42 b/Make/Make.inc.gnu42
index 9840450a..4678529e 100644
--- a/Make/Make.inc.gnu42
+++ b/Make/Make.inc.gnu42
@@ -58,6 +58,7 @@ PSBLDLIBS=$(BLACS) $(BLAS) $(METIS_LIB)
 
 #  Add -DLargeFptr for 64-bit addresses
 PSBCDEFINES=-DAdd_ 
+#
 PSBFDEFINES=-DNETLIB_BLACS  $(MPI_FINC) -DHAVE_MOVE_ALLOC
 # -DHAVE_METIS
 
diff --git a/Make/Make.inc.gnu42-serialmpi b/Make/Make.inc.gnu42-serialmpi
index 0bcffd14..ae45668f 100644
--- a/Make/Make.inc.gnu42-serialmpi
+++ b/Make/Make.inc.gnu42-serialmpi
@@ -57,6 +57,7 @@ PSBLDLIBS=$(BLACS) $(BLAS) $(METIS_LIB)
 
 #  Add -DLargeFptr for 64-bit addresses
 PSBCDEFINES=-DAdd_ 
+#
 PSBFDEFINES=-DHAVE_MOVE_ALLOC -DSERIAL_MPI  $(MPI_FINC)
 # -DHAVE_METIS
 
diff --git a/Make/Make.inc.gnu43 b/Make/Make.inc.gnu43
index 65a3a21b..b3f86912 100644
--- a/Make/Make.inc.gnu43
+++ b/Make/Make.inc.gnu43
@@ -58,7 +58,8 @@ PSBLDLIBS=$(BLACS) $(BLAS) $(METIS_LIB)
 
 #  Add -DLargeFptr for 64-bit addresses
 PSBCDEFINES=-DAdd_ 
-PSBFDEFINES=-DNETLIB_BLACS  $(MPI_FINC) -DHAVE_MOVE_ALLOC
+# 
+PSBFDEFINES=-DHAVE_KSENDID  $(MPI_FINC) -DHAVE_MOVE_ALLOC
 # -DHAVE_METIS
 
 AR=ar -cur
diff --git a/Make/Make.inc.ifort9 b/Make/Make.inc.ifort9
index 9cef618e..7c4598c1 100644
--- a/Make/Make.inc.ifort9
+++ b/Make/Make.inc.ifort9
@@ -58,9 +58,10 @@ BLACS=-lmpiblacs-ifort91 -L$(HOME)/LIB
 PSBLDLIBS=$(BLACS) $(BLAS) $(METIS_LIB)
 
 #  Add -DLargeFptr for 64-bit addresses
-#   Note: MOVE_ALLOC is only on Intel Fortran 9.1, NOT on 9.0
 PSBCDEFINES=-DAdd_ 
-PSBFDEFINES=-DNETLIB_BLACS  $(MPI_FINC) -DHAVE_MOVE_ALLOC
+#
+#   Note: MOVE_ALLOC is only on Intel Fortran 9.1, NOT on 9.0
+PSBFDEFINES=-DHAVE_KSENDID  $(MPI_FINC) -DHAVE_MOVE_ALLOC
 # -DHAVE_METIS
 
 AR=ar -cur
diff --git a/Make/Make.inc.sp5 b/Make/Make.inc.sp5
index dfdfcd41..40d054d9 100644
--- a/Make/Make.inc.sp5
+++ b/Make/Make.inc.sp5
@@ -56,7 +56,8 @@ PSBLDLIBS=$(BLACS) $(BLAS) $(METIS_LIB)
 
 #  Add -DLargeFptr for 64-bit addresses
 PSBCDEFINES=-DNoChange -DLargeFptr
-PSBFDEFINES=-WF,-DESSL_BLACS  $(MPI_FINC)
+#
+PSBFDEFINES=-WF,-DHAVE_ESSL_BLACS  $(MPI_FINC)
 # There's no MOVE_ALLOC yet in XLF 10.1.
 #-WF,-DHAVE_MOVE_ALLOC   -WF,-DHAVE_METIS
 
diff --git a/Make/Make.inc.sun-6.2 b/Make/Make.inc.sun-6.2
index 94c89367..c4bc111c 100644
--- a/Make/Make.inc.sun-6.2
+++ b/Make/Make.inc.sun-6.2
@@ -55,10 +55,10 @@ BLACS=$(HOME)/LIB/libblacs_MPI-SUN4SOL2-0.a $(HOME)/LIB/libblacsCinit_MPI-SUN4SO
 PSBLDLIBS=$(BLACS) $(BLAS) $(METIS_LIB)
 
 #  Add -DLargeFptr for 64-bit addresses
+PSBCDEFINES=-DAdd_ 
 #  SUN compiler does not have MOVE_ALLOC. 
+PSBFDEFINES=-DHAVE_KSENDID  $(MPI_FINC) 
 # -DHAVE_MOVE_ALLOC
-PSBCDEFINES=-DAdd_ 
-PSBFDEFINES=-DNETLIB_BLACS  $(MPI_FINC) 
 # -DHAVE_METIS
 
 AR=ar -cur