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

update to latest ax_blas.m4; commented ax_blas out (mac is not influenced, but linux needs a new way to check); remove obsoleted --with-blas

release/4.3a0
Kai Ni 2010-04-21 04:15:14 +00:00
parent f7b36d151c
commit 89a67b0fb7
3 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
configure.ac
View File

@ -25,17 +25,6 @@ AC_ARG_ENABLE([debug],
AM_CONDITIONAL([DEBUG], [test x$debug = xtrue]) AM_CONDITIONAL([DEBUG], [test x$debug = xtrue])
# search for a blas implementation
AX_BLAS()
# enable BLAS with general purpose script
AC_ARG_ENABLE([blas],
[ --enable-blas Enable external BLAS library],
[case "${enableval}" in
yes) blas=true ;;
no) blas=false ;;
*) AC_MSG_ERROR([bad value ${enableval} for --enable-blas]) ;;
esac],[blas=false])
AC_CANONICAL_HOST AC_CANONICAL_HOST
# We need to determine what os we are on to determine if we need to do # We need to determine what os we are on to determine if we need to do
@ -50,6 +39,18 @@ case $host_os in
;; ;;
esac esac
# search for a blas implementation. Kai: this can not be easily turned off for Mac.
# AX_BLAS(true)
# enable BLAS with general purpose script
AC_ARG_ENABLE([blas],
[ --enable-blas Enable external BLAS library],
[case "${enableval}" in
yes) blas=true ;;
no) blas=false ;;
*) AC_MSG_ERROR([bad value ${enableval} for --enable-blas]) ;;
esac],[blas=false])
AM_CONDITIONAL([USE_BLAS_MACOS], [test x$blas = xtrue && test x$ISMAC = xtrue]) AM_CONDITIONAL([USE_BLAS_MACOS], [test x$blas = xtrue && test x$ISMAC = xtrue])
AM_CONDITIONAL([USE_BLAS_LINUX], [test x$blas = xtrue && test x$ISMAC = xfalse]) AM_CONDITIONAL([USE_BLAS_LINUX], [test x$blas = xtrue && test x$ISMAC = xfalse])

4
m4/ax_blas.m4
View File

@ -1,5 +1,5 @@
# =========================================================================== # ===========================================================================
# http://www.nongnu.org/autoconf-archive/ax_blas.html # http://www.gnu.org/software/autoconf-archive/ax_blas.html
# =========================================================================== # ===========================================================================
# #
# SYNOPSIS # SYNOPSIS
@ -63,7 +63,7 @@
# modified version of the Autoconf Macro, you may extend this special # modified version of the Autoconf Macro, you may extend this special
# exception to the GPL to apply to your modified version as well. # exception to the GPL to apply to your modified version as well.
#serial 7 #serial 8
AU_ALIAS([ACX_BLAS], [AX_BLAS]) AU_ALIAS([ACX_BLAS], [AX_BLAS])
AC_DEFUN([AX_BLAS], [ AC_DEFUN([AX_BLAS], [

2
myconfigure
View File

@ -1 +1 @@
./configure --prefix=$HOME --with-toolbox=$HOME/toolbox/ --with-boost=/opt/local/include/ --enable-blas --with-blas=atlas CXXFLAGS=" -g -O2 -march=core2 -DNDEBUG" --disable-static ./configure --prefix=$HOME --with-toolbox=$HOME/toolbox/ --with-boost=/opt/local/include/ --enable-blas CXXFLAGS=" -g -O2 -march=core2 -DNDEBUG" --disable-static