12345qiupeng
/
gtsam
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed autotools files for GSL inclusion so that they don't include the wrong BLAS implementation when ATLAS is enabled

release/4.3a0
Alex Cunningham 2010-01-31 18:26:18 +00:00
parent c266012dcd
commit 2889a25aeb
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cpp/Makefile.am
View File

@ -278,11 +278,11 @@ if GSL
AM_CXXFLAGS += -DGSL $(GSL_CFLAGS) AM_CXXFLAGS += -DGSL $(GSL_CFLAGS)
libgtsam_la_CPPFLAGS += -DGSL $(GSL_CFLAGS) libgtsam_la_CPPFLAGS += -DGSL $(GSL_CFLAGS)
if ATLAS if ATLAS
AM_LDFLAGS += $(GSL_LIBS) -lgsl -lcblas -latlas AM_LDFLAGS += $(GSL_LIBS_NO_CBLAS) -lcblas -latlas
libgtsam_la_LDFLAGS += $(GSL_LIBS) -lgsl -lcblas -latlas libgtsam_la_LDFLAGS += $(GSL_LIBS_NO_CBLAS) -lcblas -latlas
else else
AM_LDFLAGS += $(GSL_LIBS) -lgsl -lgslcblas AM_LDFLAGS += $(GSL_LIBS)
libgtsam_la_LDFLAGS += $(GSL_LIBS) -lgsl -lgslcblas libgtsam_la_LDFLAGS += $(GSL_LIBS)
endif endif
endif endif

2
m4/gsl.m4
View File

@ -29,6 +29,7 @@ AC_ARG_ENABLE(gsltest, [ --disable-gsltest Do not try to compile and run
else else
GSL_CFLAGS=`$GSL_CONFIG --cflags` GSL_CFLAGS=`$GSL_CONFIG --cflags`
GSL_LIBS=`$GSL_CONFIG --libs` GSL_LIBS=`$GSL_CONFIG --libs`
GSL_LIBS_NO_CBLAS=`$GSL_CONFIG --libs-without-cblas`
gsl_major_version=`$GSL_CONFIG --version | \ gsl_major_version=`$GSL_CONFIG --version | \
sed 's/^\([[0-9]]*\).*/\1/'` sed 's/^\([[0-9]]*\).*/\1/'`
@ -156,6 +157,7 @@ int main (void)
fi fi
AC_SUBST(GSL_CFLAGS) AC_SUBST(GSL_CFLAGS)
AC_SUBST(GSL_LIBS) AC_SUBST(GSL_LIBS)
AC_SUBST(GSL_LIBS_NO_CBLAS)
rm -f conf.gsltest rm -f conf.gsltest
]) ])