[Rcpp-commits] r2603 - in pkg/RcppGSL: . inst/examples/RcppGSLExample src

[noreply at r-forge.r-project.org]

Author: edd
Date: 2010-11-29 22:57:08 +0100 (Mon, 29 Nov 2010)
New Revision: 2603

Modified:
   pkg/RcppGSL/configure
   pkg/RcppGSL/configure.in
   pkg/RcppGSL/inst/examples/RcppGSLExample/configure
   pkg/RcppGSL/inst/examples/RcppGSLExample/configure.in
   pkg/RcppGSL/src/Makevars.in
Log:
use gsl-config --libs, we need -lgslcblas to have a fall back when no other BLAS are around


Modified: pkg/RcppGSL/configure
===================================================================
--- pkg/RcppGSL/configure	2010-11-29 21:23:36 UTC (rev 2602)
+++ pkg/RcppGSL/configure	2010-11-29 21:57:08 UTC (rev 2603)
@@ -2543,7 +2543,7 @@
 if test "${GSL_CONFIG}" != ""; then
     # Use gsl-config for header and linker arguments
     GSL_CFLAGS=`${GSL_CONFIG} --cflags`
-    GSL_LIBS=`${GSL_CONFIG} --libs-without-cblas`
+    GSL_LIBS=`${GSL_CONFIG} --libs`
 else
     as_fn_error $? "gsl-config not found, is GSL installed?" "$LINENO" 5
 fi

Modified: pkg/RcppGSL/configure.in
===================================================================
--- pkg/RcppGSL/configure.in	2010-11-29 21:23:36 UTC (rev 2602)
+++ pkg/RcppGSL/configure.in	2010-11-29 21:57:08 UTC (rev 2603)
@@ -20,7 +20,7 @@
 if test "${GSL_CONFIG}" != ""; then
     # Use gsl-config for header and linker arguments
     GSL_CFLAGS=`${GSL_CONFIG} --cflags`
-    GSL_LIBS=`${GSL_CONFIG} --libs-without-cblas`
+    GSL_LIBS=`${GSL_CONFIG} --libs`
 else
     AC_MSG_ERROR([gsl-config not found, is GSL installed?])
 fi

Modified: pkg/RcppGSL/inst/examples/RcppGSLExample/configure
===================================================================
--- pkg/RcppGSL/inst/examples/RcppGSLExample/configure	2010-11-29 21:23:36 UTC (rev 2602)
+++ pkg/RcppGSL/inst/examples/RcppGSLExample/configure	2010-11-29 21:57:08 UTC (rev 2603)
@@ -1687,7 +1687,7 @@
 if test "${GSL_CONFIG}" != ""; then
     # Use gsl-config for header and linker arguments (without BLAS which we get from R)
     GSL_CFLAGS=`${GSL_CONFIG} --cflags`
-    GSL_LIBS=`${GSL_CONFIG} --libs-without-cblas`
+    GSL_LIBS=`${GSL_CONFIG} --libs`
 else
     as_fn_error $? "gsl-config not found, is GSL installed?" "$LINENO" 5
 fi

Modified: pkg/RcppGSL/inst/examples/RcppGSLExample/configure.in
===================================================================
--- pkg/RcppGSL/inst/examples/RcppGSLExample/configure.in	2010-11-29 21:23:36 UTC (rev 2602)
+++ pkg/RcppGSL/inst/examples/RcppGSLExample/configure.in	2010-11-29 21:57:08 UTC (rev 2603)
@@ -9,7 +9,7 @@
 if test "${GSL_CONFIG}" != ""; then
     # Use gsl-config for header and linker arguments (without BLAS which we get from R)
     GSL_CFLAGS=`${GSL_CONFIG} --cflags`
-    GSL_LIBS=`${GSL_CONFIG} --libs-without-cblas`
+    GSL_LIBS=`${GSL_CONFIG} --libs`
 else
     AC_MSG_ERROR([gsl-config not found, is GSL installed?])
 fi

Modified: pkg/RcppGSL/src/Makevars.in
===================================================================
--- pkg/RcppGSL/src/Makevars.in	2010-11-29 21:23:36 UTC (rev 2602)
+++ pkg/RcppGSL/src/Makevars.in	2010-11-29 21:57:08 UTC (rev 2603)
@@ -6,5 +6,5 @@
 
 # combine with standard arguments for R
 PKG_CPPFLAGS = -W $(GSL_CFLAGS) -I../inst/include
-PKG_LIBS = $(GSL_LIBS) $(RCPP_LDFLAGS)
+PKG_LIBS += $(GSL_LIBS) $(RCPP_LDFLAGS)