Mercurial > octave-nkf
changeset 11017:60141d49a38d
update ax_blas
| author | Jaroslav Hajek <highegg@gmail.com> |
|---|---|
| date | Fri, 24 Sep 2010 21:39:22 +0200 |
| parents | 0c752b657217 |
| children | 43c1f914e293 |
| files | ChangeLog m4/ax_blas.m4 |
| diffstat | 2 files changed, 12 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Thu Sep 23 14:55:53 2010 -0400 +++ b/ChangeLog Fri Sep 24 21:39:22 2010 +0200 @@ -1,3 +1,7 @@ +2010-09-24 Jaroslav Hajek <highegg@gmail.com> + + * m4/ax_blas.m4: Update. + 2010-09-23 John W. Eaton <jwe@octave.org> * octave-bug.in, octave-bug.cc.in: Delete
--- a/m4/ax_blas.m4 Thu Sep 23 14:55:53 2010 -0400 +++ b/m4/ax_blas.m4 Fri Sep 24 21:39:22 2010 +0200 @@ -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 8 +#serial 11 AU_ALIAS([ACX_BLAS], [AX_BLAS]) AC_DEFUN([AX_BLAS], [ @@ -101,7 +101,9 @@ # BLAS linked to by default? (happens on some supercomputers) if test $ax_blas_ok = no; then save_LIBS="$LIBS"; LIBS="$LIBS" - AC_CHECK_FUNC($sgemm, [ax_blas_ok=yes]) + AC_MSG_CHECKING([if $sgemm is being linked in already]) + AC_TRY_LINK_FUNC($sgemm, [ax_blas_ok=yes]) + AC_MSG_RESULT($ax_blas_ok) LIBS="$save_LIBS" fi @@ -134,7 +136,9 @@ # BLAS in Apple vecLib library? if test $ax_blas_ok = no; then save_LIBS="$LIBS"; LIBS="-framework vecLib $LIBS" - AC_CHECK_FUNC($sgemm, [ax_blas_ok=yes;BLAS_LIBS="-framework vecLib"]) + AC_MSG_CHECKING([for $sgemm in -framework vecLib]) + AC_TRY_LINK_FUNC($sgemm, [ax_blas_ok=yes;BLAS_LIBS="-framework vecLib"]) + AC_MSG_RESULT($ax_blas_ok) LIBS="$save_LIBS" fi @@ -153,7 +157,7 @@ if test "x$GCC" != xyes; then # only works with Sun CC AC_CHECK_LIB(sunmath, acosp, [AC_CHECK_LIB(sunperf, $sgemm, - [BLAS_LIBS="-xlic_lib=sunperf -lsunmath" + [BLAS_LIBS="-xlic_lib=sunperf -lsunmath" ax_blas_ok=yes],[],[-lsunmath])]) fi fi