From 6de05829eb28bce14d235334443a0759879ac638 Mon Sep 17 00:00:00 2001
From: Michele Martone <michele.martone@ipp.mpg.de>
Date: Tue, 9 Nov 2010 13:56:56 +0000
Subject: [PATCH] psblas3: the configure script --with-rsb updated to accept
 linking arguments.

---
 configure    | 10 ++++++++--
 configure.ac |  9 +++++++--
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/configure b/configure
index 42095046..72340e62 100755
--- a/configure
+++ b/configure
@@ -1405,7 +1405,8 @@ 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
+  --with-rsb              Specify Recursive Sparse BLAS library linkage (or
+                          the output of librsb-config)
   --with-metis=LIB        Specify -lMETISLIBNAME or the absolute library
                           filename.
 
@@ -8783,8 +8784,13 @@ else
 fi
 
 if test x$want_rsb_libs != x ; then
+	if test x$want_rsb_libs = xyes ; then
+	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"
+	#want_rsb_libs="`/usr/local/bin/librsb-config --static --ldflags` -fopenmp $want_rsb_libs"
+	true
+	fi
 fi
 RSB_LIBS="$want_rsb_libs"
 LIBS="$RSB_LIBS ${LIBS}"
diff --git a/configure.ac b/configure.ac
index dd86fed9..3513d475 100755
--- a/configure.ac
+++ b/configure.ac
@@ -652,11 +652,16 @@ 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]), [if test x$withval = xno; then
+AC_ARG_WITH(rsb, AC_HELP_STRING([--with-rsb], [Specify Recursive Sparse BLAS library linkage (or the output of librsb-config)]), [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=""])
 if test x$want_rsb_libs != x ; then
+	if test x$want_rsb_libs = xyes ; then
+	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"
+	#want_rsb_libs="`/usr/local/bin/librsb-config --static --ldflags` -fopenmp $want_rsb_libs"
+	true
+	fi
 fi
 RSB_LIBS="$want_rsb_libs"
 LIBS="$RSB_LIBS ${LIBS}"