Mercurial > octave-nkf
changeset 7061:005c785b8d81
[project @ 2007-10-24 19:00:12 by jwe]
| author | jwe |
|---|---|
| date | Wed, 24 Oct 2007 19:00:12 +0000 |
| parents | 033918b854a7 |
| children | 1eb94c1da37d |
| files | ChangeLog aclocal.m4 configure.in scripts/ChangeLog scripts/image/saveimage.m |
| diffstat | 5 files changed, 13 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed Oct 24 17:51:05 2007 +0000 +++ b/ChangeLog Wed Oct 24 19:00:12 2007 +0000 @@ -1,5 +1,7 @@ 2007-10-24 John W. Eaton <jwe@octave.org> + * configure.in, aclocal.m4: Avoid AC_TRY_EVAL. + * aclocal.m4 (OCTAVE_STRPTIME_BROKEN): New macro. * configure.in: Use it.
--- a/aclocal.m4 Wed Oct 24 17:51:05 2007 +0000 +++ b/aclocal.m4 Wed Oct 24 19:00:12 2007 +0000 @@ -659,7 +659,7 @@ cat > conftest.$ac_ext <<EOF bool FSmy_dld_fcn (void) { return false; } EOF - if AC_TRY_EVAL(ac_compile); then + if (eval "$ac_compile") 2>&AS_MESSAGE_LOG_FD; then if test "`${NM-nm} conftest.$ac_objext | grep _FSmy_dld_fcn`" != ""; then octave_cv_cxx_prepends_underscore=yes fi @@ -768,7 +768,7 @@ cat > conftest.$ac_ext <<EOF bool FSmy_dld_fcn (void) { return false; } EOF - if AC_TRY_EVAL(ac_compile); then + if (eval "$ac_compile") 2>&AS_MESSAGE_LOG_FD; then if test "`${NM-nm} conftest.$ac_objext | grep FSmy_dld_fcn__Fv`" != ""; then octave_cv_cxx_abi='gnu_v2' fi @@ -1040,7 +1040,7 @@ EOF octave_qhull_try="${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS conftest.c -o conftest -lqhull $LIBS" -if AC_TRY_EVAL(octave_qhull_try) && test -s conftest ; then +if (eval "$octave_qhull_try") 2>&AS_MESSAGE_LOG_FD && test -s conftest ; then octave_cv_lib_qhull_version=yes else octave_cv_lib_qhull_version=no
--- a/configure.in Wed Oct 24 17:51:05 2007 +0000 +++ b/configure.in Wed Oct 24 19:00:12 2007 +0000 @@ -29,7 +29,7 @@ EXTERN_CXXFLAGS="$CXXFLAGS" AC_INIT -AC_REVISION($Revision: 1.585 $) +AC_REVISION($Revision: 1.586 $) AC_PREREQ(2.57) AC_CONFIG_SRCDIR([src/octave.cc]) AC_CONFIG_HEADER(config.h) @@ -782,7 +782,7 @@ oct_obj_ext=o CONFLIB_ARG= - if AC_TRY_EVAL(ac_compile); then + if (eval "$ac_compile") 2>&AS_MESSAGE_LOG_FD; 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() @@ -885,14 +885,14 @@ if $have_fortran_compiler; then LIBS="$BLAS_LIBS $FLIBS $LIBS" AC_LANG_PUSH(Fortran 77) - (eval "$ac_compile"; eval "$ac_link") 2>conftest.er1 + (eval "$ac_compile"; eval "$ac_link") 2>&AS_MESSAGE_LOG_FD AC_LANG_POP(Fortran 77) elif $have_f2c; then LIBS="$BLAS_LIBS $F2CLIBS $LIBS" AC_LANG_PUSH(C) octave_xlate="$F2C $F2CFLAGS < conftest.f > conftest.c" (eval "$octave_xlate") - (eval "$ac_compile"; eval "$ac_link") 2>conftest.er1 + (eval "$ac_compile"; eval "$ac_link") 2>&AS_MESSAGE_LOG_FD AC_LANG_POP(C) fi LIBS="$XLIBS"
--- a/scripts/ChangeLog Wed Oct 24 17:51:05 2007 +0000 +++ b/scripts/ChangeLog Wed Oct 24 19:00:12 2007 +0000 @@ -1,5 +1,8 @@ 2007-10-24 John W. Eaton <jwe@octave.org> + * image/saveimage.m: Use functional form of save instead of eval. + Use -text instead of -ascii. + * plot/__go_draw_axes__.m: Handle visible = "off" for axes objects. 2007-10-23 Peter A. Gustafson <petegus@umich.edu>
--- a/scripts/image/saveimage.m Wed Oct 24 17:51:05 2007 +0000 +++ b/scripts/image/saveimage.m Wed Oct 24 19:00:12 2007 +0000 @@ -115,7 +115,7 @@ ## If we just want Octave image format, save and return. if (strcmp (img_form, "img")) - eval (strcat ("save -ascii ", filename, " map img")); + save ("-text", filename, "map", "img"); return; endif