Mercurial > octave-nkf
changeset 4157:ce74e9fa296b
[project @ 2002-11-08 01:40:31 by jwe]
| author | jwe |
|---|---|
| date | Fri, 08 Nov 2002 01:40:31 +0000 |
| parents | 7d85ceb0c570 |
| children | d837e6375cbc |
| files | ChangeLog acx_blas.m4 configure.in src/ChangeLog src/main.c src/octave.cc |
| diffstat | 6 files changed, 30 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Thu Nov 07 19:22:25 2002 +0000 +++ b/ChangeLog Fri Nov 08 01:40:31 2002 +0000 @@ -1,3 +1,10 @@ +2002-11-07 John W. Eaton <jwe@bevo.che.wisc.edu> + + * configure.in: Set FPICFLAG, Also set CXXPICFLAG, CPICFLAG, + FPICFLAG, and INCLUDE_LINK_DEPS for OS X. + + * acx_blas.m4 (LIBS): Also check for Apple vecLib framework. + 2002-11-06 John W. Eaton <jwe@bevo.che.wisc.edu> * configure.in (AH_BOTTOM): Define USE_EXCEPTIONS_FOR_INTERRUPTS.
--- a/acx_blas.m4 Thu Nov 07 19:22:25 2002 +0000 +++ b/acx_blas.m4 Fri Nov 08 01:40:31 2002 +0000 @@ -82,6 +82,17 @@ [], [-latlas])]) fi +# BLAS in Apple vecLib framework? (Mac OS X) +if test $acx_blas_ok = no; then + vlib_flags="-framework vecLib" + save_LIBS="$LIBS"; LIBS="$vlib_flags $LIBS" + AC_MSG_CHECKING([for $sgemm in $vlib_flags]) + AC_TRY_LINK_FUNC($sgemm, [acx_blas_ok=yes; BLAS_LIBS="$vlib_flags"], + [BLAS_LIBS=""]) + AC_MSG_RESULT($acx_blas_ok) + LIBS="$save_LIBS" +fi + # BLAS in PhiPACK libraries? (requires generic BLAS lib, too) if test $acx_blas_ok = no; then AC_CHECK_LIB(blas, $sgemm,
--- a/configure.in Thu Nov 07 19:22:25 2002 +0000 +++ b/configure.in Fri Nov 08 01:40:31 2002 +0000 @@ -22,7 +22,7 @@ ### 02111-1307, USA. AC_INIT -AC_REVISION($Revision: 1.385 $) +AC_REVISION($Revision: 1.386 $) AC_PREREQ(2.52) AC_CONFIG_SRCDIR([src/octave.cc]) AC_CONFIG_HEADER(config.h) @@ -652,6 +652,10 @@ ;; *-*-darwin*) SH_LDFLAGS='-bundle -bundle_loader $(bindir)/octave' + CXXPICFLAG= + CPICFLAG= + FPICFLAG= + INCLUDE_LINK_DEPS=true ;; *-*-cygwin* | *-*-mingw*) CXXPICFLAG=
--- a/src/ChangeLog Thu Nov 07 19:22:25 2002 +0000 +++ b/src/ChangeLog Fri Nov 08 01:40:31 2002 +0000 @@ -1,5 +1,7 @@ 2002-11-07 John W. Eaton <jwe@bevo.che.wisc.edu> + * main.c: Move decl for xerbla here from octave.cc. + * cutils.c (octave_vsnprintf): Use portable_snprintf to avoid having to cope with all kinds of buggy implementations.
--- a/src/main.c Thu Nov 07 19:22:25 2002 +0000 +++ b/src/main.c Fri Nov 08 01:40:31 2002 +0000 @@ -24,8 +24,13 @@ #include <config.h> #endif +#include "f77-fcn.h" + #include "octave.h" +// Kluge. +extern "C" void F77_FUNC (xerbla, XERBLA) (const char *, int); + int main (int argc, char **argv) {
--- a/src/octave.cc Thu Nov 07 19:22:25 2002 +0000 +++ b/src/octave.cc Fri Nov 08 01:40:31 2002 +0000 @@ -74,9 +74,6 @@ #include "variables.h" #include <version.h> -// Kluge. -extern "C" void F77_FUNC (xerbla, XERBLA) (const char *, int); - extern void install_builtins (void); #if !defined (HAVE_ATEXIT) && defined (HAVE_ON_EXIT)