From 89a67b0fb7ea58fd3c7feb93df89b43b43c9cf17 Mon Sep 17 00:00:00 2001 From: Kai Ni Date: Wed, 21 Apr 2010 04:15:14 +0000 Subject: [PATCH] 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 --- configure.ac | 23 ++++++++++++----------- m4/ax_blas.m4 | 4 ++-- myconfigure | 2 +- 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/configure.ac b/configure.ac index ec66fca68..a97603bba 100644 --- a/configure.ac +++ b/configure.ac @@ -25,17 +25,6 @@ AC_ARG_ENABLE([debug], 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 # 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 +# 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_LINUX], [test x$blas = xtrue && test x$ISMAC = xfalse]) diff --git a/m4/ax_blas.m4 b/m4/ax_blas.m4 index 65fec4081..c5e545e2d 100644 --- a/m4/ax_blas.m4 +++ b/m4/ax_blas.m4 @@ -1,5 +1,5 @@ # =========================================================================== -# http://www.nongnu.org/autoconf-archive/ax_blas.html +# http://www.gnu.org/software/autoconf-archive/ax_blas.html # =========================================================================== # # SYNOPSIS @@ -63,7 +63,7 @@ # modified version of the Autoconf Macro, you may extend this special # exception to the GPL to apply to your modified version as well. -#serial 7 +#serial 8 AU_ALIAS([ACX_BLAS], [AX_BLAS]) AC_DEFUN([AX_BLAS], [ diff --git a/myconfigure b/myconfigure index a6ae991a2..a532a1d06 100755 --- a/myconfigure +++ b/myconfigure @@ -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