From 4ffcac0ef2fbf67cd1fc018877bf33d97b44f026 Mon Sep 17 00:00:00 2001
From: Salvatore Filippone <salvatore.filippone@cranfield.ac.uk>
Date: Tue, 27 Mar 2007 15:08:10 +0000
Subject: [PATCH] Changes for SUN compilers.

---
 Makefile                                   |  3 ++-
 psb_dbldaggrmat.f90 => psb_dbldaggrmat.F90 | 10 ++++++++++
 psb_zbldaggrmat.f90 => psb_zbldaggrmat.F90 | 10 ++++++++++
 psb_zslud_impl.c                           |  6 ++++--
 4 files changed, 26 insertions(+), 3 deletions(-)
 rename psb_dbldaggrmat.f90 => psb_dbldaggrmat.F90 (99%)
 rename psb_zbldaggrmat.f90 => psb_zbldaggrmat.F90 (99%)

diff --git a/Makefile b/Makefile
index 26cc69ba..311eb535 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,8 @@ include $(PSBLASDIR)/Make.inc
 
 LIBDIR=$(PSBLASDIR)/lib
 HERE=.
-INCDIRS=-I. -I$(LIBDIR) 
+FINCLUDES=$(FMFLAG)$(LIBDIR) $(FMFLAG).
+
 
 MODOBJS= psb_prec_type.o  psb_prec_mod.o
 MPFOBJS=psb_dbldaggrmat.o psb_zbldaggrmat.o 
diff --git a/psb_dbldaggrmat.f90 b/psb_dbldaggrmat.F90
similarity index 99%
rename from psb_dbldaggrmat.f90
rename to psb_dbldaggrmat.F90
index 9e8c0816..6368962d 100644
--- a/psb_dbldaggrmat.f90
+++ b/psb_dbldaggrmat.F90
@@ -102,8 +102,13 @@ contains
   subroutine raw_aggregate(info)
     use psb_base_mod
     use psb_prec_type
+#ifdef MPI_MOD
     use mpi
+#endif
     implicit none
+#ifdef MPI_H
+    include 'mpif.h'
+#endif
 
     integer, intent(out)   :: info
     type(psb_dspmat_type)          :: b
@@ -322,8 +327,13 @@ contains
   subroutine smooth_aggregate(info)
     use psb_base_mod
     use psb_prec_type
+#ifdef MPI_MOD
     use mpi
+#endif
     implicit none 
+#ifdef MPI_H
+    include 'mpif.h'
+#endif
 
     integer, intent(out)   :: info
 
diff --git a/psb_zbldaggrmat.f90 b/psb_zbldaggrmat.F90
similarity index 99%
rename from psb_zbldaggrmat.f90
rename to psb_zbldaggrmat.F90
index ff500c46..f868713b 100644
--- a/psb_zbldaggrmat.f90
+++ b/psb_zbldaggrmat.F90
@@ -101,8 +101,13 @@ contains
   subroutine raw_aggregate(info)
     use psb_base_mod
     use psb_prec_type
+#ifdef MPI_MOD
     use mpi
+#endif
     implicit none
+#ifdef MPI_H
+    include 'mpif.h'
+#endif
 
     integer, intent(out)   :: info
     type(psb_zspmat_type)          :: b
@@ -321,8 +326,13 @@ contains
   subroutine smooth_aggregate(info)
     use psb_base_mod
     use psb_prec_type
+#ifdef MPI_MOD
     use mpi
+#endif
     implicit none 
+#ifdef MPI_H
+    include 'mpif.h'
+#endif
 
     integer, intent(out)   :: info
 
diff --git a/psb_zslud_impl.c b/psb_zslud_impl.c
index 1cf94f6c..328eb67a 100644
--- a/psb_zslud_impl.c
+++ b/psb_zslud_impl.c
@@ -132,11 +132,12 @@ typedef struct {
 
 void
 psb_zsludist_factor_(int *n, int *nl, int *nnzl, int *ffstr,
-		     doublecomplex *values, int *rowptr, int *colind,
 #ifdef Have_SLUDist_		 
+		     doublecomplex *values, int *rowptr, int *colind,
 		     fptr *f_factors, /* a handle containing the address
 					 pointing to the factored matrices */
 #else 
+		     void *values, int *rowptr, int *colind,
 		     void *f_factors,
 #endif
 		     int *nprow, int *npcol,    int *info)
@@ -239,11 +240,12 @@ psb_zsludist_factor_(int *n, int *nl, int *nnzl, int *ffstr,
 
 void
 psb_zsludist_solve_(int *itrans, int *n, int *nrhs, 
-		    doublecomplex *b, int *ldb,
 #ifdef Have_SLUDist_		 
+		    doublecomplex *b, int *ldb,
 		    fptr *f_factors, /* a handle containing the address
 					pointing to the factored matrices */
 #else 
+		    void *b, int *ldb,
 		    void *f_factors,
 #endif
 		    int *info)