psblas3:

HAVE_LIBRSB is used in the d_matgen program (now F90); `make check` shall work either with or without rsb.

Make.inc.in

@@ -50,6 +50,7 @@ INSTALL_INCLUDEDIR=@INSTALL_INCLUDEDIR@
 INSTALL_DOCSDIR=@INSTALL_DOCSDIR@
 
 LIBDIR=@LIBDIR@
+RSB_LIBS=@RSB_LIBS@
 BASELIBNAME=@BASELIBNAME@
 PRECLIBNAME=@PRECLIBNAME@
 METHDLIBNAME=@METHDLIBNAME@

configure.ac

@@ -762,6 +762,7 @@ FDEFINES=$(PSBFDEFINES)
 
 AC_SUBST(PSBLASRULES)
 AC_SUBST(LIBDIR)
+AC_SUBST(RSB_LIBS)
 AC_SUBST(BASELIBNAME)
 AC_SUBST(PRECLIBNAME)
 AC_SUBST(METHDLIBNAME)

test/serial/Makefile

@@ -4,7 +4,7 @@ include ../../Make.inc
 #
 LIBDIR=../../lib/
 OPTDIR=../../opt
-PSBLAS_LIB= -L$(LIBDIR) -lpsb_base  -L$(OPTDIR)
+PSBLAS_LIB= -L$(LIBDIR) -lpsb_base -L$(OPTDIR) -lpsb_opt $(RSB_LIBS) 
 #-lpsb_util -lpsb_krylov -lpsb_prec -lpsb_base 
 LDLIBS=$(PSBLDLIBS)
 #

test/serial/d_matgen.F90

@@ -7,7 +7,9 @@ program d_matgen
   use psb_d_cxx_mat_mod
   use psb_d_cyy_mat_mod
   use psb_d_czz_mat_mod
+#ifdef HAVE_LIBRSB
   use psb_d_rsb_mat_mod
+#endif
   implicit none
 
   ! input parameters
@@ -33,8 +35,11 @@ program d_matgen
   integer            :: iter, itmax,itrace, istopc, irst
   integer(psb_long_int_k_) :: amatsize, precsize, descsize
   real(psb_dpk_)   :: err, eps
+#ifdef HAVE_LIBRSB
   type(psb_d_rsb_sparse_mat) :: arsb
+#endif
   type(psb_d_cyy_sparse_mat) :: acyy
+  type(psb_d_csr_sparse_mat) :: acsr
   type(psb_d_czz_sparse_mat) :: aczz
   type(psb_d_cxx_sparse_mat) :: acxx
   
@@ -44,9 +49,11 @@ program d_matgen
 
   info=psb_success_
 
-  info=psv_rsb_mat_init()
+#ifdef HAVE_LIBRSB
+  info=psb_rsb_matmod_init()
   if(info/=psb_success_)info=psb_err_from_subroutine_
   if(info/=psb_success_)goto 9999
+#endif
 
   call psb_init(ictxt)
   call psb_info(ictxt,iam,np)
@@ -73,7 +80,12 @@ program d_matgen
   !call create_matrix(idim,a,b,x,desc_a,ictxt,afmt,info,acyy)  
   !call create_matrix(idim,a,b,x,desc_a,ictxt,afmt,info,aczz)  
   !call create_matrix(idim,a,b,x,desc_a,ictxt,afmt,info,acxx)  
+#ifdef HAVE_LIBRSB
   call create_matrix(idim,a,b,x,desc_a,ictxt,afmt,info,arsb)  
+  !call psb_d_rsb_print(-1,arsb)! FIXME: is there a default for the integer arg ?
+#else
+  call create_matrix(idim,a,b,x,desc_a,ictxt,afmt,info,acsr)
+#endif
   call psb_barrier(ictxt)
   t2 = psb_wtime() - t1
   if(info /= psb_success_) then