Mercurial > octave-nkf
changeset 7054:1c5b2b5b58ba
[project @ 2007-10-23 23:22:16 by jwe]
| author | jwe |
|---|---|
| date | Tue, 23 Oct 2007 23:22:17 +0000 |
| parents | 570a382ce556 |
| children | 3e4dab6a136c |
| files | ChangeLog configure.in scripts/ChangeLog scripts/plot/legend.m |
| diffstat | 4 files changed, 41 insertions(+), 19 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Tue Oct 23 23:17:36 2007 +0000 +++ b/ChangeLog Tue Oct 23 23:22:17 2007 +0000 @@ -1,3 +1,9 @@ +2007-10-23 John W. Eaton <jwe@octave.org> + + * configure.in: When checking for -lf2c, set F2CLIBS instad of + FLIBS, then set FLIBS to $F2CLIBS just before printing the summary. + Check for BLAS library calling convention compatibility. + 2007-10-17 John W. Eaton <jwe@octave.org> * configure.in: Delete checks for METIS.
--- a/configure.in Tue Oct 23 23:17:36 2007 +0000 +++ b/configure.in Tue Oct 23 23:22:17 2007 +0000 @@ -29,7 +29,7 @@ EXTERN_CXXFLAGS="$CXXFLAGS" AC_INIT -AC_REVISION($Revision: 1.583 $) +AC_REVISION($Revision: 1.584 $) AC_PREREQ(2.57) AC_CONFIG_SRCDIR([src/octave.cc]) AC_CONFIG_HEADER(config.h) @@ -795,17 +795,21 @@ CONFLIB_ARG="-MD" ;; esac - AC_CHECK_LIB(f2c, f_open, FLIBS=-lf2c, FLIBS=, $CONFLIB_ARG) + XLIBS="$LIBS" + LIBS="-lf2c $LIBS $CONFLIB_ARG" + AC_LINK_IFELSE([AC_LANG_CALL([int MAIN__ () { return 1; }], [f_open])], + [F2CLIBS=-lf2c], [F2CLIBS=]) + LIBS="$XLIBS" rm -f $oct_conflib - if test -z "$FLIBS"; then - AC_CHECK_LIB(F77, d_sin, FLIBS=-lF77, FLIBS=) - if test -n "$FLIBS"; then - AC_CHECK_LIB(I77, f_rew, FLIBS="$FLIBS -lI77", FLIBS=, -lF77) + if test -z "$F2CLIBS"; then + AC_CHECK_LIB(F77, d_sin, F2CLIBS=-lF77, FLIBS=) + if test -n "$F2CLIBS"; then + AC_CHECK_LIB(I77, f_rew, F2CLIBS="$F2CLIBS -lI77", F2CLIBS=, -lF77) fi fi - if test -z "$FLIBS"; then + if test -z "$F2CLIBS"; then warn_f2c_no_lib="I found f2c but not libf2c.a, or libF77.a and libI77.a" AC_MSG_WARN($warn_f2c_no_lib) fi @@ -857,16 +861,16 @@ dnl hence the big mess. AC_MSG_CHECKING([BLAS library calling convention compatibility]) -cat << EOF > conftest.$ac_fc_srcext +cat << EOF > conftest.f program foo - double complex zdotu, tmp, zx(10), zy(10), retval + double complex zdotu, zx(10), zy(10), retval integer n, incx, incy n = 10 incx = 1 incy = 1 do 10 i = 1, n - zx(i) = dcmplx (i, 0); - zy(i) = dcmplx (0, i); + zx(i) = dcmplx (i, 0) + zy(i) = dcmplx (0, i) 10 continue retval = zdotu (n, zx, incx, zy, incy) if (retval .eq. dcmplx (0, 385)) then @@ -878,22 +882,22 @@ end EOF XLIBS="$LIBS" -LIBS="$BLAS_LIBS $LIBS $FLIBS" if $have_fortran_compiler; then + LIBS="$BLAS_LIBS $FLIBS $LIBS" AC_LANG_PUSH(Fortran 77) - $ac_compile - $ac_link + (eval "$ac_compile"; eval "$ac_link") 2>conftest.er1 AC_LANG_POP(Fortran 77) elif $have_f2c; then + LIBS="$BLAS_LIBS $F2CLIBS $LIBS" AC_LANG_PUSH(C) - $(F2C) $(F2CFLAGS) < conftest.$ac_fc_srcext > conftest.$ac_ext - $ac_compile - $ac_link + octave_xlate="$F2C $F2CFLAGS < conftest.f > conftest.c" + (eval "$octave_xlate") + (eval "$ac_compile"; eval "$ac_link") 2>conftest.er1 AC_LANG_POP(C) fi LIBS="$XLIBS" -case "`conftest.$ac_exeext`" in - *success*) +case "`./conftest$ac_exeext`" in + *succeeded*) AC_MSG_RESULT(yes) ;; *) @@ -2052,6 +2056,12 @@ FORT="$F77 $FFLAGS" fi +if $have_fortran_compiler; then + true +elif $have_f2c; then + FLIBS="$F2CLIBS" +fi + AC_MSG_NOTICE([ Octave is now configured for $canonical_host_type
--- a/scripts/ChangeLog Tue Oct 23 23:17:36 2007 +0000 +++ b/scripts/ChangeLog Tue Oct 23 23:22:17 2007 +0000 @@ -1,3 +1,8 @@ +2007-10-23 Peter A. Gustafson <petegus@umich.edu> + + * plot/legend.m: Also extract location string from varargin (lost + when 2007-10-08 patch was applied). + 2007-10-23 David Bateman <dbateman@free.fr> * plot/xlim.m, plot/ylim.m, plot/zlim.m, plot/__axes_limits__.m,