diff --git a/base/comm/internals/psi_cswapdata_a.F90 b/base/comm/internals/psi_cswapdata_a.F90
index 8b137397..844daa00 100644
--- a/base/comm/internals/psi_cswapdata_a.F90
+++ b/base/comm/internals/psi_cswapdata_a.F90
@@ -193,7 +193,7 @@ subroutine psi_cswapidxm(ctxt,icomm,flag,n,beta,y,idx, &
   logical, parameter :: usersend=.false.
 
   complex(psb_spk_), pointer, dimension(:) :: sndbuf, rcvbuf
-#if !defined(FLANG)
+#if !defined(PSB_CMP_FLANG)
   volatile :: sndbuf, rcvbuf
 #endif
   character(len=20)  :: name
@@ -680,7 +680,7 @@ subroutine psi_cswapidxv(ctxt,icomm,flag,beta,y,idx, &
   logical, parameter :: usersend=.false.
 
   complex(psb_spk_), pointer, dimension(:) :: sndbuf, rcvbuf
-#if !defined(FLANG)
+#if !defined(PSB_CMP_FLANG)
   volatile :: sndbuf, rcvbuf
 #endif
   character(len=20)  :: name
diff --git a/base/comm/internals/psi_cswaptran_a.F90 b/base/comm/internals/psi_cswaptran_a.F90
index 3fa61d94..e46a556d 100644
--- a/base/comm/internals/psi_cswaptran_a.F90
+++ b/base/comm/internals/psi_cswaptran_a.F90
@@ -197,7 +197,7 @@ subroutine psi_ctranidxm(ctxt,icomm,flag,n,beta,y,idx,&
   logical, parameter :: usersend=.false.
 
   complex(psb_spk_), pointer, dimension(:) :: sndbuf, rcvbuf
-#if !defined(FLANG)
+#if !defined(PSB_CMP_FLANG)
   volatile :: sndbuf, rcvbuf
 #endif
   character(len=20)  :: name
@@ -691,7 +691,7 @@ subroutine psi_ctranidxv(ctxt,icomm,flag,beta,y,idx,&
   logical, parameter :: usersend=.false.
 
   complex(psb_spk_), pointer, dimension(:) :: sndbuf, rcvbuf
-#if !defined(FLANG)
+#if !defined(PSB_CMP_FLANG)
   volatile :: sndbuf, rcvbuf
 #endif
   character(len=20)  :: name
diff --git a/base/comm/internals/psi_dswapdata_a.F90 b/base/comm/internals/psi_dswapdata_a.F90
index 6f1d4a10..d86025cf 100644
--- a/base/comm/internals/psi_dswapdata_a.F90
+++ b/base/comm/internals/psi_dswapdata_a.F90
@@ -193,7 +193,7 @@ subroutine psi_dswapidxm(ctxt,icomm,flag,n,beta,y,idx, &
   logical, parameter :: usersend=.false.
 
   real(psb_dpk_), pointer, dimension(:) :: sndbuf, rcvbuf
-#if !defined(FLANG)
+#if !defined(PSB_CMP_FLANG)
   volatile :: sndbuf, rcvbuf
 #endif
   character(len=20)  :: name
@@ -680,7 +680,7 @@ subroutine psi_dswapidxv(ctxt,icomm,flag,beta,y,idx, &
   logical, parameter :: usersend=.false.
 
   real(psb_dpk_), pointer, dimension(:) :: sndbuf, rcvbuf
-#if !defined(FLANG)
+#if !defined(PSB_CMP_FLANG)
   volatile :: sndbuf, rcvbuf
 #endif
   character(len=20)  :: name
diff --git a/base/comm/internals/psi_dswaptran_a.F90 b/base/comm/internals/psi_dswaptran_a.F90
index df04c391..e5966c2e 100644
--- a/base/comm/internals/psi_dswaptran_a.F90
+++ b/base/comm/internals/psi_dswaptran_a.F90
@@ -197,7 +197,7 @@ subroutine psi_dtranidxm(ctxt,icomm,flag,n,beta,y,idx,&
   logical, parameter :: usersend=.false.
 
   real(psb_dpk_), pointer, dimension(:) :: sndbuf, rcvbuf
-#if !defined(FLANG)
+#if !defined(PSB_CMP_FLANG)
   volatile :: sndbuf, rcvbuf
 #endif
   character(len=20)  :: name
@@ -691,7 +691,7 @@ subroutine psi_dtranidxv(ctxt,icomm,flag,beta,y,idx,&
   logical, parameter :: usersend=.false.
 
   real(psb_dpk_), pointer, dimension(:) :: sndbuf, rcvbuf
-#if !defined(FLANG)
+#if !defined(PSB_CMP_FLANG)
   volatile :: sndbuf, rcvbuf
 #endif
   character(len=20)  :: name
diff --git a/base/comm/internals/psi_eswapdata_a.F90 b/base/comm/internals/psi_eswapdata_a.F90
index 6e2d9557..d917b64c 100644
--- a/base/comm/internals/psi_eswapdata_a.F90
+++ b/base/comm/internals/psi_eswapdata_a.F90
@@ -193,7 +193,7 @@ subroutine psi_eswapidxm(ctxt,icomm,flag,n,beta,y,idx, &
   logical, parameter :: usersend=.false.
 
   integer(psb_epk_), pointer, dimension(:) :: sndbuf, rcvbuf
-#if !defined(FLANG)
+#if !defined(PSB_CMP_FLANG)
   volatile :: sndbuf, rcvbuf
 #endif
   character(len=20)  :: name
@@ -680,7 +680,7 @@ subroutine psi_eswapidxv(ctxt,icomm,flag,beta,y,idx, &
   logical, parameter :: usersend=.false.
 
   integer(psb_epk_), pointer, dimension(:) :: sndbuf, rcvbuf
-#if !defined(FLANG)
+#if !defined(PSB_CMP_FLANG)
   volatile :: sndbuf, rcvbuf
 #endif
   character(len=20)  :: name
diff --git a/base/comm/internals/psi_eswaptran_a.F90 b/base/comm/internals/psi_eswaptran_a.F90
index e105c88b..67a92569 100644
--- a/base/comm/internals/psi_eswaptran_a.F90
+++ b/base/comm/internals/psi_eswaptran_a.F90
@@ -197,7 +197,7 @@ subroutine psi_etranidxm(ctxt,icomm,flag,n,beta,y,idx,&
   logical, parameter :: usersend=.false.
 
   integer(psb_epk_), pointer, dimension(:) :: sndbuf, rcvbuf
-#if !defined(FLANG)
+#if !defined(PSB_CMP_FLANG)
   volatile :: sndbuf, rcvbuf
 #endif
   character(len=20)  :: name
@@ -691,7 +691,7 @@ subroutine psi_etranidxv(ctxt,icomm,flag,beta,y,idx,&
   logical, parameter :: usersend=.false.
 
   integer(psb_epk_), pointer, dimension(:) :: sndbuf, rcvbuf
-#if !defined(FLANG)
+#if !defined(PSB_CMP_FLANG)
   volatile :: sndbuf, rcvbuf
 #endif
   character(len=20)  :: name
diff --git a/base/comm/internals/psi_i2swapdata_a.F90 b/base/comm/internals/psi_i2swapdata_a.F90
index 4acdbc9e..3d82d5b1 100644
--- a/base/comm/internals/psi_i2swapdata_a.F90
+++ b/base/comm/internals/psi_i2swapdata_a.F90
@@ -193,7 +193,7 @@ subroutine psi_i2swapidxm(ctxt,icomm,flag,n,beta,y,idx, &
   logical, parameter :: usersend=.false.
 
   integer(psb_i2pk_), pointer, dimension(:) :: sndbuf, rcvbuf
-#if !defined(FLANG)
+#if !defined(PSB_CMP_FLANG)
   volatile :: sndbuf, rcvbuf
 #endif
   character(len=20)  :: name
@@ -680,7 +680,7 @@ subroutine psi_i2swapidxv(ctxt,icomm,flag,beta,y,idx, &
   logical, parameter :: usersend=.false.
 
   integer(psb_i2pk_), pointer, dimension(:) :: sndbuf, rcvbuf
-#if !defined(FLANG)
+#if !defined(PSB_CMP_FLANG)
   volatile :: sndbuf, rcvbuf
 #endif
   character(len=20)  :: name
diff --git a/base/comm/internals/psi_i2swaptran_a.F90 b/base/comm/internals/psi_i2swaptran_a.F90
index f879702c..925e8a0c 100644
--- a/base/comm/internals/psi_i2swaptran_a.F90
+++ b/base/comm/internals/psi_i2swaptran_a.F90
@@ -197,7 +197,7 @@ subroutine psi_i2tranidxm(ctxt,icomm,flag,n,beta,y,idx,&
   logical, parameter :: usersend=.false.
 
   integer(psb_i2pk_), pointer, dimension(:) :: sndbuf, rcvbuf
-#if !defined(FLANG)
+#if !defined(PSB_CMP_FLANG)
   volatile :: sndbuf, rcvbuf
 #endif
   character(len=20)  :: name
@@ -691,7 +691,7 @@ subroutine psi_i2tranidxv(ctxt,icomm,flag,beta,y,idx,&
   logical, parameter :: usersend=.false.
 
   integer(psb_i2pk_), pointer, dimension(:) :: sndbuf, rcvbuf
-#if !defined(FLANG)
+#if !defined(PSB_CMP_FLANG)
   volatile :: sndbuf, rcvbuf
 #endif
   character(len=20)  :: name
diff --git a/base/comm/internals/psi_mswapdata_a.F90 b/base/comm/internals/psi_mswapdata_a.F90
index 0a1a3a61..bda186b8 100644
--- a/base/comm/internals/psi_mswapdata_a.F90
+++ b/base/comm/internals/psi_mswapdata_a.F90
@@ -193,7 +193,7 @@ subroutine psi_mswapidxm(ctxt,icomm,flag,n,beta,y,idx, &
   logical, parameter :: usersend=.false.
 
   integer(psb_mpk_), pointer, dimension(:) :: sndbuf, rcvbuf
-#if !defined(FLANG)
+#if !defined(PSB_CMP_FLANG)
   volatile :: sndbuf, rcvbuf
 #endif
   character(len=20)  :: name
@@ -680,7 +680,7 @@ subroutine psi_mswapidxv(ctxt,icomm,flag,beta,y,idx, &
   logical, parameter :: usersend=.false.
 
   integer(psb_mpk_), pointer, dimension(:) :: sndbuf, rcvbuf
-#if !defined(FLANG)
+#if !defined(PSB_CMP_FLANG)
   volatile :: sndbuf, rcvbuf
 #endif
   character(len=20)  :: name
diff --git a/base/comm/internals/psi_mswaptran_a.F90 b/base/comm/internals/psi_mswaptran_a.F90
index 8d6e0b52..65e3e6c7 100644
--- a/base/comm/internals/psi_mswaptran_a.F90
+++ b/base/comm/internals/psi_mswaptran_a.F90
@@ -197,7 +197,7 @@ subroutine psi_mtranidxm(ctxt,icomm,flag,n,beta,y,idx,&
   logical, parameter :: usersend=.false.
 
   integer(psb_mpk_), pointer, dimension(:) :: sndbuf, rcvbuf
-#if !defined(FLANG)
+#if !defined(PSB_CMP_FLANG)
   volatile :: sndbuf, rcvbuf
 #endif
   character(len=20)  :: name
@@ -691,7 +691,7 @@ subroutine psi_mtranidxv(ctxt,icomm,flag,beta,y,idx,&
   logical, parameter :: usersend=.false.
 
   integer(psb_mpk_), pointer, dimension(:) :: sndbuf, rcvbuf
-#if !defined(FLANG)
+#if !defined(PSB_CMP_FLANG)
   volatile :: sndbuf, rcvbuf
 #endif
   character(len=20)  :: name
diff --git a/base/comm/internals/psi_sswapdata_a.F90 b/base/comm/internals/psi_sswapdata_a.F90
index 0f1f26da..ae456162 100644
--- a/base/comm/internals/psi_sswapdata_a.F90
+++ b/base/comm/internals/psi_sswapdata_a.F90
@@ -193,7 +193,7 @@ subroutine psi_sswapidxm(ctxt,icomm,flag,n,beta,y,idx, &
   logical, parameter :: usersend=.false.
 
   real(psb_spk_), pointer, dimension(:) :: sndbuf, rcvbuf
-#if !defined(FLANG)
+#if !defined(PSB_CMP_FLANG)
   volatile :: sndbuf, rcvbuf
 #endif
   character(len=20)  :: name
@@ -680,7 +680,7 @@ subroutine psi_sswapidxv(ctxt,icomm,flag,beta,y,idx, &
   logical, parameter :: usersend=.false.
 
   real(psb_spk_), pointer, dimension(:) :: sndbuf, rcvbuf
-#if !defined(FLANG)
+#if !defined(PSB_CMP_FLANG)
   volatile :: sndbuf, rcvbuf
 #endif
   character(len=20)  :: name
diff --git a/base/comm/internals/psi_sswaptran_a.F90 b/base/comm/internals/psi_sswaptran_a.F90
index 10e741dd..f4f9513e 100644
--- a/base/comm/internals/psi_sswaptran_a.F90
+++ b/base/comm/internals/psi_sswaptran_a.F90
@@ -197,7 +197,7 @@ subroutine psi_stranidxm(ctxt,icomm,flag,n,beta,y,idx,&
   logical, parameter :: usersend=.false.
 
   real(psb_spk_), pointer, dimension(:) :: sndbuf, rcvbuf
-#if !defined(FLANG)
+#if !defined(PSB_CMP_FLANG)
   volatile :: sndbuf, rcvbuf
 #endif
   character(len=20)  :: name
@@ -691,7 +691,7 @@ subroutine psi_stranidxv(ctxt,icomm,flag,beta,y,idx,&
   logical, parameter :: usersend=.false.
 
   real(psb_spk_), pointer, dimension(:) :: sndbuf, rcvbuf
-#if !defined(FLANG)
+#if !defined(PSB_CMP_FLANG)
   volatile :: sndbuf, rcvbuf
 #endif
   character(len=20)  :: name
diff --git a/base/comm/internals/psi_zswapdata_a.F90 b/base/comm/internals/psi_zswapdata_a.F90
index f37dc1c7..c0ac76f5 100644
--- a/base/comm/internals/psi_zswapdata_a.F90
+++ b/base/comm/internals/psi_zswapdata_a.F90
@@ -193,7 +193,7 @@ subroutine psi_zswapidxm(ctxt,icomm,flag,n,beta,y,idx, &
   logical, parameter :: usersend=.false.
 
   complex(psb_dpk_), pointer, dimension(:) :: sndbuf, rcvbuf
-#if !defined(FLANG)
+#if !defined(PSB_CMP_FLANG)
   volatile :: sndbuf, rcvbuf
 #endif
   character(len=20)  :: name
@@ -680,7 +680,7 @@ subroutine psi_zswapidxv(ctxt,icomm,flag,beta,y,idx, &
   logical, parameter :: usersend=.false.
 
   complex(psb_dpk_), pointer, dimension(:) :: sndbuf, rcvbuf
-#if !defined(FLANG)
+#if !defined(PSB_CMP_FLANG)
   volatile :: sndbuf, rcvbuf
 #endif
   character(len=20)  :: name
diff --git a/base/comm/internals/psi_zswaptran_a.F90 b/base/comm/internals/psi_zswaptran_a.F90
index 8b4e4268..804acb6b 100644
--- a/base/comm/internals/psi_zswaptran_a.F90
+++ b/base/comm/internals/psi_zswaptran_a.F90
@@ -197,7 +197,7 @@ subroutine psi_ztranidxm(ctxt,icomm,flag,n,beta,y,idx,&
   logical, parameter :: usersend=.false.
 
   complex(psb_dpk_), pointer, dimension(:) :: sndbuf, rcvbuf
-#if !defined(FLANG)
+#if !defined(PSB_CMP_FLANG)
   volatile :: sndbuf, rcvbuf
 #endif
   character(len=20)  :: name
@@ -691,7 +691,7 @@ subroutine psi_ztranidxv(ctxt,icomm,flag,beta,y,idx,&
   logical, parameter :: usersend=.false.
 
   complex(psb_dpk_), pointer, dimension(:) :: sndbuf, rcvbuf
-#if !defined(FLANG)
+#if !defined(PSB_CMP_FLANG)
   volatile :: sndbuf, rcvbuf
 #endif
   character(len=20)  :: name
diff --git a/base/serial/psb_cspspmm.F90 b/base/serial/psb_cspspmm.F90
index 1ceed43d..865c1922 100644
--- a/base/serial/psb_cspspmm.F90
+++ b/base/serial/psb_cspspmm.F90
@@ -37,10 +37,11 @@
 !
 subroutine psb_cspspmm(a,b,c,info)
   use psb_mat_mod
-!!$  use psb_c_csr_mat_mod
-!!$  use psb_c_csc_mat_mod
-  !use psb_c_serial_mod, psb_protect_name => psb_cspspmm, only : psb_symbmm, psb_numbmm  implicit none 
-  
+#if !defined(PSB_CMP_INTEL)
+  use psb_c_csr_mat_mod
+  use psb_c_csc_mat_mod
+  use psb_c_serial_mod, psb_protect_name => psb_cspspmm
+#endif  
   type(psb_cspmat_type), intent(in)    :: a,b
   type(psb_cspmat_type), intent(out)   :: c
   integer(psb_ipk_), intent(out)                  :: info
@@ -49,7 +50,8 @@ subroutine psb_cspspmm(a,b,c,info)
   integer(psb_ipk_) :: err_act
   character(len=*), parameter ::  name='psb_spspmm'
   logical :: done_spmm
-  
+
+#if defined(PSB_CMP_INTEL)  
   interface psb_symbmm
     subroutine psb_csymbmm(a,b,c,info)
       use psb_c_mat_mod, only : psb_cspmat_type
@@ -103,6 +105,8 @@ subroutine psb_cspspmm(a,b,c,info)
       integer(psb_ipk_), intent(out)          :: info
     end subroutine psb_ccscspspmm
   end interface
+#endif
+  
   call psb_erractionsave(err_act)
   info = psb_success_
 
@@ -173,9 +177,11 @@ end subroutine psb_cspspmm
 
 subroutine psb_lcspspmm(a,b,c,info)
   use psb_mat_mod
-!!$  use psb_c_csr_mat_mod
-!!$  use psb_c_csc_mat_mod
-  !use psb_c_serial_mod, psb_protect_name => psb_lcspspmm, only : psb_symbmm, psb_numbmm
+#if !defined(PSB_CMP_INTEL)
+  use psb_c_csr_mat_mod
+  use psb_c_csc_mat_mod
+  use psb_c_serial_mod, psb_protect_name => psb_lcspspmm
+#endif
   implicit none 
 
   type(psb_lcspmat_type), intent(in)    :: a,b
@@ -186,6 +192,7 @@ subroutine psb_lcspspmm(a,b,c,info)
   integer(psb_ipk_) :: err_act
   character(len=*), parameter ::  name='psb_spspmm'
   logical :: done_spmm
+#if defined(PSB_CMP_INTEL)
   interface psb_symbmm
     subroutine psb_lcsymbmm(a,b,c,info)
       use psb_c_mat_mod, only : psb_lcspmat_type
@@ -239,6 +246,8 @@ subroutine psb_lcspspmm(a,b,c,info)
       integer(psb_ipk_), intent(out)          :: info
     end subroutine psb_lccscspspmm
   end interface
+#endif
+
   call psb_erractionsave(err_act)
   info = psb_success_
 
diff --git a/base/serial/psb_dspspmm.F90 b/base/serial/psb_dspspmm.F90
index 216313e0..f7e37fe7 100644
--- a/base/serial/psb_dspspmm.F90
+++ b/base/serial/psb_dspspmm.F90
@@ -37,10 +37,11 @@
 !
 subroutine psb_dspspmm(a,b,c,info)
   use psb_mat_mod
-!!$  use psb_d_csr_mat_mod
-!!$  use psb_d_csc_mat_mod
-  !use psb_d_serial_mod, psb_protect_name => psb_dspspmm, only : psb_symbmm, psb_numbmm  implicit none 
-  
+#if !defined(PSB_CMP_INTEL)
+  use psb_d_csr_mat_mod
+  use psb_d_csc_mat_mod
+  use psb_d_serial_mod, psb_protect_name => psb_dspspmm
+#endif  
   type(psb_dspmat_type), intent(in)    :: a,b
   type(psb_dspmat_type), intent(out)   :: c
   integer(psb_ipk_), intent(out)                  :: info
@@ -49,7 +50,8 @@ subroutine psb_dspspmm(a,b,c,info)
   integer(psb_ipk_) :: err_act
   character(len=*), parameter ::  name='psb_spspmm'
   logical :: done_spmm
-  
+
+#if defined(PSB_CMP_INTEL)  
   interface psb_symbmm
     subroutine psb_dsymbmm(a,b,c,info)
       use psb_d_mat_mod, only : psb_dspmat_type
@@ -103,6 +105,8 @@ subroutine psb_dspspmm(a,b,c,info)
       integer(psb_ipk_), intent(out)          :: info
     end subroutine psb_dcscspspmm
   end interface
+#endif
+  
   call psb_erractionsave(err_act)
   info = psb_success_
 
@@ -173,9 +177,11 @@ end subroutine psb_dspspmm
 
 subroutine psb_ldspspmm(a,b,c,info)
   use psb_mat_mod
-!!$  use psb_d_csr_mat_mod
-!!$  use psb_d_csc_mat_mod
-  !use psb_d_serial_mod, psb_protect_name => psb_ldspspmm, only : psb_symbmm, psb_numbmm
+#if !defined(PSB_CMP_INTEL)
+  use psb_d_csr_mat_mod
+  use psb_d_csc_mat_mod
+  use psb_d_serial_mod, psb_protect_name => psb_ldspspmm
+#endif
   implicit none 
 
   type(psb_ldspmat_type), intent(in)    :: a,b
@@ -186,6 +192,7 @@ subroutine psb_ldspspmm(a,b,c,info)
   integer(psb_ipk_) :: err_act
   character(len=*), parameter ::  name='psb_spspmm'
   logical :: done_spmm
+#if defined(PSB_CMP_INTEL)
   interface psb_symbmm
     subroutine psb_ldsymbmm(a,b,c,info)
       use psb_d_mat_mod, only : psb_ldspmat_type
@@ -239,6 +246,8 @@ subroutine psb_ldspspmm(a,b,c,info)
       integer(psb_ipk_), intent(out)          :: info
     end subroutine psb_ldcscspspmm
   end interface
+#endif
+
   call psb_erractionsave(err_act)
   info = psb_success_
 
diff --git a/base/serial/psb_sspspmm.F90 b/base/serial/psb_sspspmm.F90
index 4dc5df40..4af56176 100644
--- a/base/serial/psb_sspspmm.F90
+++ b/base/serial/psb_sspspmm.F90
@@ -37,10 +37,11 @@
 !
 subroutine psb_sspspmm(a,b,c,info)
   use psb_mat_mod
-!!$  use psb_s_csr_mat_mod
-!!$  use psb_s_csc_mat_mod
-  !use psb_s_serial_mod, psb_protect_name => psb_sspspmm, only : psb_symbmm, psb_numbmm  implicit none 
-  
+#if !defined(PSB_CMP_INTEL)
+  use psb_s_csr_mat_mod
+  use psb_s_csc_mat_mod
+  use psb_s_serial_mod, psb_protect_name => psb_sspspmm
+#endif  
   type(psb_sspmat_type), intent(in)    :: a,b
   type(psb_sspmat_type), intent(out)   :: c
   integer(psb_ipk_), intent(out)                  :: info
@@ -49,7 +50,8 @@ subroutine psb_sspspmm(a,b,c,info)
   integer(psb_ipk_) :: err_act
   character(len=*), parameter ::  name='psb_spspmm'
   logical :: done_spmm
-  
+
+#if defined(PSB_CMP_INTEL)  
   interface psb_symbmm
     subroutine psb_ssymbmm(a,b,c,info)
       use psb_s_mat_mod, only : psb_sspmat_type
@@ -103,6 +105,8 @@ subroutine psb_sspspmm(a,b,c,info)
       integer(psb_ipk_), intent(out)          :: info
     end subroutine psb_scscspspmm
   end interface
+#endif
+  
   call psb_erractionsave(err_act)
   info = psb_success_
 
@@ -173,9 +177,11 @@ end subroutine psb_sspspmm
 
 subroutine psb_lsspspmm(a,b,c,info)
   use psb_mat_mod
-!!$  use psb_s_csr_mat_mod
-!!$  use psb_s_csc_mat_mod
-  !use psb_s_serial_mod, psb_protect_name => psb_lsspspmm, only : psb_symbmm, psb_numbmm
+#if !defined(PSB_CMP_INTEL)
+  use psb_s_csr_mat_mod
+  use psb_s_csc_mat_mod
+  use psb_s_serial_mod, psb_protect_name => psb_lsspspmm
+#endif
   implicit none 
 
   type(psb_lsspmat_type), intent(in)    :: a,b
@@ -186,6 +192,7 @@ subroutine psb_lsspspmm(a,b,c,info)
   integer(psb_ipk_) :: err_act
   character(len=*), parameter ::  name='psb_spspmm'
   logical :: done_spmm
+#if defined(PSB_CMP_INTEL)
   interface psb_symbmm
     subroutine psb_lssymbmm(a,b,c,info)
       use psb_s_mat_mod, only : psb_lsspmat_type
@@ -239,6 +246,8 @@ subroutine psb_lsspspmm(a,b,c,info)
       integer(psb_ipk_), intent(out)          :: info
     end subroutine psb_lscscspspmm
   end interface
+#endif
+
   call psb_erractionsave(err_act)
   info = psb_success_
 
diff --git a/base/serial/psb_zspspmm.F90 b/base/serial/psb_zspspmm.F90
index 831e4b9c..95d1e112 100644
--- a/base/serial/psb_zspspmm.F90
+++ b/base/serial/psb_zspspmm.F90
@@ -37,10 +37,11 @@
 !
 subroutine psb_zspspmm(a,b,c,info)
   use psb_mat_mod
-!!$  use psb_z_csr_mat_mod
-!!$  use psb_z_csc_mat_mod
-  !use psb_z_serial_mod, psb_protect_name => psb_zspspmm, only : psb_symbmm, psb_numbmm  implicit none 
-  
+#if !defined(PSB_CMP_INTEL)
+  use psb_z_csr_mat_mod
+  use psb_z_csc_mat_mod
+  use psb_z_serial_mod, psb_protect_name => psb_zspspmm
+#endif  
   type(psb_zspmat_type), intent(in)    :: a,b
   type(psb_zspmat_type), intent(out)   :: c
   integer(psb_ipk_), intent(out)                  :: info
@@ -49,7 +50,8 @@ subroutine psb_zspspmm(a,b,c,info)
   integer(psb_ipk_) :: err_act
   character(len=*), parameter ::  name='psb_spspmm'
   logical :: done_spmm
-  
+
+#if defined(PSB_CMP_INTEL)  
   interface psb_symbmm
     subroutine psb_zsymbmm(a,b,c,info)
       use psb_z_mat_mod, only : psb_zspmat_type
@@ -103,6 +105,8 @@ subroutine psb_zspspmm(a,b,c,info)
       integer(psb_ipk_), intent(out)          :: info
     end subroutine psb_zcscspspmm
   end interface
+#endif
+  
   call psb_erractionsave(err_act)
   info = psb_success_
 
@@ -173,9 +177,11 @@ end subroutine psb_zspspmm
 
 subroutine psb_lzspspmm(a,b,c,info)
   use psb_mat_mod
-!!$  use psb_z_csr_mat_mod
-!!$  use psb_z_csc_mat_mod
-  !use psb_z_serial_mod, psb_protect_name => psb_lzspspmm, only : psb_symbmm, psb_numbmm
+#if !defined(PSB_CMP_INTEL)
+  use psb_z_csr_mat_mod
+  use psb_z_csc_mat_mod
+  use psb_z_serial_mod, psb_protect_name => psb_lzspspmm
+#endif
   implicit none 
 
   type(psb_lzspmat_type), intent(in)    :: a,b
@@ -186,6 +192,7 @@ subroutine psb_lzspspmm(a,b,c,info)
   integer(psb_ipk_) :: err_act
   character(len=*), parameter ::  name='psb_spspmm'
   logical :: done_spmm
+#if defined(PSB_CMP_INTEL)
   interface psb_symbmm
     subroutine psb_lzsymbmm(a,b,c,info)
       use psb_z_mat_mod, only : psb_lzspmat_type
@@ -239,6 +246,8 @@ subroutine psb_lzspspmm(a,b,c,info)
       integer(psb_ipk_), intent(out)          :: info
     end subroutine psb_lzcscspspmm
   end interface
+#endif
+
   call psb_erractionsave(err_act)
   info = psb_success_
 
diff --git a/configure b/configure
index 0658f499..388ffae9 100755
--- a/configure
+++ b/configure
@@ -6989,7 +6989,7 @@ if test x"$psblas_cv_fc" == "x" ; then
 	# TODO : discover the exact conditions when the usage of -WF is needed.
 	psblas_cv_define_prepend="-WF,"
         if eval "$MPIFC -qversion 2>&1 | grep -e\"Version: 10\.\" 2>/dev/null"; then
-        	FDEFINES="$psblas_cv_define_prepend-DXLF_10 $FDEFINES";		  sed -e's/(0-9*).*/$1/p'
+        	FDEFINES="$psblas_cv_define_prepend-DPSB_CMP_XLF_10 $FDEFINES";		  sed -e's/(0-9*).*/$1/p'
         fi
 
  # Note : there could be problems with old xlf compiler versions ( <10.1 )
@@ -7005,7 +7005,7 @@ if test x"$psblas_cv_fc" == "x" ; then
    psblas_flang_version=`flang-new --version |grep flang| sed -e 's/^ *flang.* version *//gi'`;
    psblas_flang_shv=`flang-new --version |grep flang| sed -e 's/^ *flang.* version *//gi' | sed -e's/\./ /g' | awk '{print $1}'`;
    psblas_cv_define_prepend="";
-   FDEFINES="$psblas_cv_define_prepend-DFLANG $FDEFINES"
+   FDEFINES="$psblas_cv_define_prepend-DPSB_CMP_FLANG $FDEFINES"
    psblas_shvs=`echo $psblas_flang_shv|sed -e's/^0-9*//g'`;
    if test x"$psblas_shvs" != x""; then
      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Running  with LLVM $psblas_flang_version  ($psblas_flang_shv).  " >&5
@@ -7024,7 +7024,7 @@ printf "%s\n" "$as_me: Running  with LLVM $psblas_flang_version  ($psblas_flang_
    psblas_flang_shv=`flang --version |grep flang| sed -e 's/^ *flang.* version *//gi' | sed -e's/\./ /g' | awk '{print $1}'`;
    psblas_cv_fc="flang";
    psblas_cv_define_prepend="";
-   FDEFINES="$psblas_cv_define_prepend-DFLANG $FDEFINES"
+   FDEFINES="$psblas_cv_define_prepend-DPSB_CMP_FLANG $FDEFINES"
    psblas_shvs=`echo $psblas_flang_shv|sed -e's/^0-9*//g'`;
    if test x"$psblas_shvs" != x""; then
      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Running  with LLVM $psblas_flang_version  ($psblas_flang_shv).  " >&5
@@ -7037,7 +7037,7 @@ printf "%s\n" "$as_me: Running  with LLVM $psblas_flang_version  ($psblas_flang_
    fi
  elif eval "$MPIFC -V 2>&1 | grep Intel.*Fortran.*Compiler 2>/dev/null" ; then
    # Intel compiler identification
-
+   FDEFINES="$psblas_cv_define_prepend-DPSB_CMP_INTEL $FDEFINES"
    psblas_cv_fc="ifc";
  elif eval "$MPIFC -v  2>&1 | grep NAG 2>/dev/null" ; then
    psblas_cv_fc="nag";
diff --git a/configure.ac b/configure.ac
index 2f472dea..f3c78664 100644
--- a/configure.ac
+++ b/configure.ac
@@ -242,7 +242,7 @@ if test x"$psblas_cv_fc" == "x" ; then
 	# TODO : discover the exact conditions when the usage of -WF is needed.
 	psblas_cv_define_prepend="-WF,"
         if eval "$MPIFC -qversion 2>&1 | grep -e\"Version: 10\.\" 2>/dev/null"; then
-        	FDEFINES="$psblas_cv_define_prepend-DXLF_10 $FDEFINES";		  sed -e's/([0-9]*).*/$1/p'
+        	FDEFINES="$psblas_cv_define_prepend-DPSB_CMP_XLF_10 $FDEFINES";		  sed -e's/([0-9]*).*/$1/p'
         fi
 
  # Note : there could be problems with old xlf compiler versions ( <10.1 )
@@ -258,7 +258,7 @@ if test x"$psblas_cv_fc" == "x" ; then
    psblas_flang_version=`flang-new --version |grep flang| sed -e 's/^ *flang.* version *//gi'`;
    psblas_flang_shv=`flang-new --version |grep flang| sed -e 's/^ *flang.* version *//gi' | sed -e's/\./ /g' | awk '{print $1}'`;
    psblas_cv_define_prepend="";
-   FDEFINES="$psblas_cv_define_prepend-DFLANG $FDEFINES"
+   FDEFINES="$psblas_cv_define_prepend-DPSB_CMP_FLANG $FDEFINES"
    psblas_shvs=`echo $psblas_flang_shv|sed -e's/[^0-9]*//g'`;
    if test x"$psblas_shvs" != x""; then
      AC_MSG_NOTICE([[Running  with LLVM $psblas_flang_version  ($psblas_flang_shv).  ]])
@@ -276,7 +276,7 @@ if test x"$psblas_cv_fc" == "x" ; then
    psblas_flang_shv=`flang --version |grep flang| sed -e 's/^ *flang.* version *//gi' | sed -e's/\./ /g' | awk '{print $1}'`;
    psblas_cv_fc="flang";
    psblas_cv_define_prepend="";
-   FDEFINES="$psblas_cv_define_prepend-DFLANG $FDEFINES"
+   FDEFINES="$psblas_cv_define_prepend-DPSB_CMP_FLANG $FDEFINES"
    psblas_shvs=`echo $psblas_flang_shv|sed -e's/[^0-9]*//g'`;
    if test x"$psblas_shvs" != x""; then
      AC_MSG_NOTICE([[Running  with LLVM $psblas_flang_version  ($psblas_flang_shv).  ]])
@@ -288,7 +288,7 @@ if test x"$psblas_cv_fc" == "x" ; then
    fi  
  elif eval "$MPIFC -V 2>&1 | grep Intel.*Fortran.*Compiler 2>/dev/null" ; then
    # Intel compiler identification
-    
+   FDEFINES="$psblas_cv_define_prepend-DPSB_CMP_INTEL $FDEFINES"
    psblas_cv_fc="ifc";
  elif eval "$MPIFC -v  2>&1 | grep NAG 2>/dev/null" ; then
    psblas_cv_fc="nag";