Mercurial > octave-nkf
changeset 4368:c45874c087c7
[project @ 2003-03-17 14:01:56 by jwe]
| author | jwe |
|---|---|
| date | Mon, 17 Mar 2003 14:01:56 +0000 |
| parents | aa04c532d69b |
| children | 3192d1c40195 |
| files | ChangeLog configure.in src/ChangeLog src/main.c src/octave.cc src/octave.h |
| diffstat | 6 files changed, 26 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Fri Mar 14 01:17:18 2003 +0000 +++ b/ChangeLog Mon Mar 17 14:01:56 2003 +0000 @@ -1,3 +1,8 @@ +2003-03-17 John W. Eaton <jwe@bevo.che.wisc.edu> + + * configure.in: Only complain for g++ earlier than 2.95. + Try harder to get version number only. + 2003-03-05 Paul Kienzle <pkienzle@users.sf.net> * aclocal.m4 (OCTAVE_DYNAMIC_AUTO_ARRAYS): New macro.
--- a/configure.in Fri Mar 14 01:17:18 2003 +0000 +++ b/configure.in Mon Mar 17 14:01:56 2003 +0000 @@ -22,7 +22,7 @@ ### 02111-1307, USA. AC_INIT -AC_REVISION($Revision: 1.421 $) +AC_REVISION($Revision: 1.422 $) AC_PREREQ(2.52) AC_CONFIG_SRCDIR([src/octave.cc]) AC_CONFIG_HEADER(config.h) @@ -171,10 +171,10 @@ ### Do special things for g++. gxx_version=`$CXX -v 2>&1 | grep "^.*g.. version" | \ - sed -e 's/^.*g.. version *//' -e 's/cygnus-//' -e 's/egcs-//'` + sed -e 's/^.*g.. version *//' -e 's/cygnus-//' -e 's/egcs-//' -e 's/ .*//'` case "$gxx_version" in - 1.* | 2.[[0123456789]].* | 3.0.*) + 1.* | 2.[[012345678]].*) AC_MSG_ERROR([g++ version $gxx_version will probably fail to compile Octave]) ;; esac
--- a/src/ChangeLog Fri Mar 14 01:17:18 2003 +0000 +++ b/src/ChangeLog Mon Mar 17 14:01:56 2003 +0000 @@ -1,3 +1,9 @@ +2003-03-09 Duncan Temple Lang <duncan@research.bell-labs.com> + + * octave.cc (octave_main): New arg, embedded. + * octave.h: Fix decl. + * main.c: Pass 0 for embedded here. + 2003-03-03 John W. Eaton <jwe@bevo.che.wisc.edu> * version.h (OCTAVE_VERSION): Now 2.1.46.
--- a/src/main.c Fri Mar 14 01:17:18 2003 +0000 +++ b/src/main.c Mon Mar 17 14:01:56 2003 +0000 @@ -32,7 +32,7 @@ int main (int argc, char **argv) { - return octave_main (argc, argv); + return octave_main (argc, argv, 0); } /*
--- a/src/octave.cc Fri Mar 14 01:17:18 2003 +0000 +++ b/src/octave.cc Mon Mar 17 14:01:56 2003 +0000 @@ -371,7 +371,7 @@ // You guessed it. int -octave_main (int argc, char **argv) +octave_main (int argc, char **argv, int embedded) { octave_env::set_program_name (argv[0]); @@ -400,7 +400,8 @@ initialize_pathsearch (); - install_signal_handlers (); + if (! embedded) + install_signal_handlers (); initialize_file_io (); @@ -587,11 +588,13 @@ // Is input coming from a terminal? If so, we are probably // interactive. - interactive = (isatty (fileno (stdin)) && isatty (fileno (stdout))); + interactive = (! embedded + && isatty (fileno (stdin)) && isatty (fileno (stdout))); intern_argv (argc, argv); - switch_to_buffer (create_buffer (get_input_from_stdin ())); + if (! embedded) + switch_to_buffer (create_buffer (get_input_from_stdin ())); } // Force input to be echoed if not really interactive, but the user @@ -609,6 +612,9 @@ if (! interactive) line_editing = false; + if (embedded) + return 1; + int retval = main_loop (fun_to_call); if (retval == 1 && ! error_state)