Mercurial > hg > octave-max
changeset 4417:5cca7b5d6b34
[project @ 2003-05-25 02:40:35 by jwe]
| author | jwe |
|---|---|
| date | Sun, 25 May 2003 02:40:35 +0000 |
| parents | de2bc66c709f |
| children | c57f599bf7ea |
| files | ChangeLog configure.in src/ChangeLog src/ov-range.cc |
| diffstat | 4 files changed, 15 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2003-05-21 John W. Eaton <jwe@bevo.che.wisc.edu> + + * configure.in: In check for f_open in libf2c, only use + -L. -lconflib if we have created libconflib.a. + 2003-05-16 John W. Eaton <jwe@bevo.che.wisc.edu> * aclocal.m4 (OCTAVE_PROG_GPERF): Provide struct decl so -t option
--- a/configure.in +++ b/configure.in @@ -22,7 +22,7 @@ ### 02111-1307, USA. AC_INIT -AC_REVISION($Revision: 1.427 $) +AC_REVISION($Revision: 1.428 $) AC_PREREQ(2.52) AC_CONFIG_SRCDIR([src/octave.cc]) AC_CONFIG_HEADER(config.h) @@ -543,14 +543,16 @@ oct_conflib=libconflib.a oct_obj_ext=o + CONFLIB_ARG= if AC_TRY_EVAL(ac_compile); then $AR $ARFLAGS $oct_conflib conftest.$oct_obj_ext 1>&AS_MESSAGE_LOG_FD() if test -n "$RANLIB"; then $RANLIB $oct_conflib 1>&AS_MESSAGE_LOG_FD() fi + CONFLIB_ARG="-L. -lconflib" fi rm -f conftest* - AC_CHECK_LIB(f2c, f_open, FLIBS=-lf2c, FLIBS=, [-L. -lconflib]) + AC_CHECK_LIB(f2c, f_open, FLIBS=-lf2c, FLIBS=, $CONFLIB_ARG) rm -f $oct_conflib if test -z "$FLIBS"; then
--- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2003-05-24 John W. Eaton <jwe@bevo.che.wisc.edu> + + * ov-range.cc (octave_range::try_narrowing_conversion): Convert to + [](1x0) instead of [](0x0) if range is empty. + 2003-05-14 John W. Eaton <jwe@bevo.che.wisc.edu> * Makefile.in: Handle DESTDIR.