Skip to content
Snippets Groups Projects
Commit 0717a9d1 authored by Rene Brun's avatar Rene Brun
Browse files

From Lorenzo:

patch to configure to fix some linking problem with GSL,
(add cblas library and use GSL version number)


git-svn-id: http://root.cern.ch/svn/root/trunk@20249 27541ba8-7e3a-0410-8455-c3a389f83636
parent 9e281f93
No related branches found
No related tags found
No related merge requests found
......@@ -234,6 +234,7 @@ BUILDMATHMORE := @buildmathmore@
GSLFLAGS := $(filter-out -I/usr/include, @gslflags@)
GSLLIBDIR := @gsllibdir@
GSLLIBS := @gsllibs@
GSLVERSION := @gslversion@
BUILDCINT7 := @buildcint7@
......
......@@ -3699,6 +3699,7 @@ if test ! "x$enable_mathmore" = "xno"; then
gslinc=$found_hdr
gslincdir=$found_dir
gslflags=-I$gslincdir
gslversion=$gsl_version
fi
fi
......@@ -3714,8 +3715,8 @@ if test ! "x$enable_mathmore" = "xno"; then
gsllibdir=$found_dir
# in case of shared libs (gsllibdir is not empty) need gslcblas
# assume libgslcblas is in same dir as libgsl
if test ! "x$gsllibdir" = "x"; then
check_library "libgslcblas gslcblas" "$enable_shared" "$gsllibdir0" \
#if test ! "x$gsllibdir" = "x"; then
check_library "libgslcblas gslcblasML gslcblas cblas" "$enable_shared" "$gsllibdir0" \
$GSL $GSL/lib $GSL/.libs /usr/local/lib /usr/lib /opt/gsl/lib \
$finkdir/lib
if test ! "x$found_lib" = "x"; then
......@@ -3725,7 +3726,7 @@ if test ! "x$enable_mathmore" = "xno"; then
#cblas not found
gsllibs=""
fi
fi
#fi
fi
fi
#
......@@ -3767,6 +3768,7 @@ if test ! "x$enable_mathmore" = "xno"; then
gslflags=`gsl-config --cflags`
gsllibs=`gsl-config --libs`
gsllibdir=""
gslversion=$gsl_version
fi
else
enable_mathmore="no"
......@@ -4314,6 +4316,7 @@ sed -e "s|@aclocaldir@|$aclocaldir|" \
-e "s|@gslflags@|$gslflags|" \
-e "s|@gsllibdir@|$gsllibdir|" \
-e "s|@gsllibs@|$gsllibs|" \
-e "s|@gslversion@|$gslversion|" \
-e "s|@builtinzlib@|$enable_builtin_zlib|" \
-e "s|@zlibincdir@|$zlibincdir|" \
-e "s|@zliblib@|$zliblib|" \
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment