From 8b577420c896873c46906d832fb29d7c2409b946 Mon Sep 17 00:00:00 2001
From: Michele Martone <michele.martone@ipp.mpg.de>
Date: Wed, 10 Nov 2010 16:41:33 +0000
Subject: [PATCH] psblas3:   --with-rsb              Specify Recursive Sparse
 BLAS library linkage info                           (that is, the output of
 librsb-config --static                           --ldflags, or a directory
 where the usual                           bin/include/lib subdirs with a
 regular RSB                           installation resides, or nothing to
 make the                           configure script invoke librsb-config)

---
 configure    | 21 ++++++++++++++-------
 configure.ac | 15 +++++++++------
 2 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/configure b/configure
index 7a6807f9..a61c3e02 100755
--- a/configure
+++ b/configure
@@ -1405,8 +1405,12 @@ Optional Packages:
                           prepend to [MODULE_PATH]
   --with-blas=<lib>       use BLAS library <lib>
   --with-lapack=<lib>     use LAPACK library <lib>
-  --with-rsb              Specify Recursive Sparse BLAS library linkage (or
-                          the output of librsb-config --static --ldflags)
+  --with-rsb              Specify Recursive Sparse BLAS library linkage info
+                          (that is, the output of librsb-config --static
+                          --ldflags, or a directory where the usual
+                          bin/include/lib subdirs with a regular RSB
+                          installation resides, or nothing to make the
+                          configure script invoke librsb-config)
   --with-metis=LIB        Specify -lMETISLIBNAME or the absolute library
                           filename.
 
@@ -8778,18 +8782,21 @@ fi
 # Check whether --with-rsb was given.
 if test "${with_rsb+set}" = set; then :
   withval=$with_rsb; if test x$withval = xno; then
-want_rsb_libs= ; else if test x$withval = xyes ; then want_rsb_libs=-lrsb ; else want_rsb_libs="$withval" ; fi ; FDEFINES="$psblas_cv_define_prepend-DHAVE_LIBRSB $FDEFINES" ; fi
+want_rsb_libs= ; else if test x$withval = xyes ; then want_rsb_libs=yes ; else want_rsb_libs="$withval" ; fi ; fi
 else
   want_rsb_libs=""
 fi
 
 if test x$want_rsb_libs != x ; then
 	if test x$want_rsb_libs = xyes ; then
-	want_rsb_libs="`librsb-config --static --ldflags`"
+		want_rsb_libs="`librsb-config --static --ldflags`"
 	else
-	# FIXME ! temporary for OpenMP
-	#want_rsb_libs="`/usr/local/bin/librsb-config --static --ldflags` -fopenmp $want_rsb_libs"
-	true
+		if test -d "$want_rsb_libs" ; then
+			want_rsb_libs="`$want_rsb_libs/bin/librsb-config --static --ldflags`"
+		else
+			true;
+			# we assume want_rsb_libs are linkage parameters
+		fi
 	fi
 fi
 RSB_LIBS="$want_rsb_libs"
diff --git a/configure.ac b/configure.ac
index 6023e17d..ff76888e 100755
--- a/configure.ac
+++ b/configure.ac
@@ -652,15 +652,18 @@ PAC_MAKE_IS_GNUMAKE
 # Note : also umfdi_local_search, ...
 #AC_CHECK_LIB(umf,umfpack_di_solve,psblas_cv_have_umfpack=yes,psblas_cv_have_umfpack=no,[amd])
 
-AC_ARG_WITH(rsb, AC_HELP_STRING([--with-rsb], [Specify Recursive Sparse BLAS library linkage (or the output of librsb-config  --static --ldflags)]), [if test x$withval = xno; then
-want_rsb_libs= ; else if test x$withval = xyes ; then want_rsb_libs=-lrsb ; else want_rsb_libs="$withval" ; fi ; FDEFINES="$psblas_cv_define_prepend-DHAVE_LIBRSB $FDEFINES" ; fi], [want_rsb_libs=""])
+AC_ARG_WITH(rsb, AC_HELP_STRING([--with-rsb], [Specify Recursive Sparse BLAS library linkage info (that is, the output of librsb-config  --static --ldflags, or a directory where the usual bin/include/lib subdirs with a regular RSB installation resides, or nothing to make the configure script invoke librsb-config)]), [if test x$withval = xno; then
+want_rsb_libs= ; else if test x$withval = xyes ; then want_rsb_libs=yes ; else want_rsb_libs="$withval" ; fi ; fi], [want_rsb_libs=""])
 if test x$want_rsb_libs != x ; then
 	if test x$want_rsb_libs = xyes ; then
-	want_rsb_libs="`librsb-config --static --ldflags`"
+		want_rsb_libs="`librsb-config --static --ldflags`"
 	else
-	# FIXME ! temporary for OpenMP
-	#want_rsb_libs="`/usr/local/bin/librsb-config --static --ldflags` -fopenmp $want_rsb_libs"
-	true
+		if test -d "$want_rsb_libs" ; then
+			want_rsb_libs="`$want_rsb_libs/bin/librsb-config --static --ldflags`"
+		else
+			true;
+			# we assume want_rsb_libs are linkage parameters
+		fi
 	fi
 fi
 RSB_LIBS="$want_rsb_libs"