Mercurial > hg > octave-nkf
changeset 2512:fda09c1e787e
[project @ 1996-11-14 08:39:41 by jwe]
author | jwe |
---|---|
date | Thu, 14 Nov 1996 08:39:47 +0000 |
parents | 9b0dd36714eb |
children | 9ffb839e922b |
files | ChangeLog Makeconf.in configure.in doc/ChangeLog doc/interpreter/install.texi info/Makefile.in libcruft/ChangeLog libcruft/Makefile.in liboctave/ChangeLog liboctave/cmd-hist.cc scripts/ChangeLog src/ChangeLog src/defaults.cc src/defaults.h.in src/dirfns.cc src/octave.cc src/sighandlers.cc test/ChangeLog |
diffstat | 18 files changed, 119 insertions(+), 22 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,16 @@ +Thu Nov 14 00:07:31 1996 John W. Eaton <jwe@bevo.che.wisc.edu> + + * configure.in (RLD_FLAG): Surround case pattern in changequote. + + * Version 1.92. + Wed Nov 13 11:04:26 1996 John W. Eaton <jwe@bevo.che.wisc.edu> + * configure.in: Don't set or substitute LIBINFO. + (infofile): Set and substitute a default value. + + * Makeconf.in (do-subst-default-values): Substitute it here. + * configure.in: If running on an SCO system, define SCO, and force HAVE_ISINF and HAVE_ISNAN to be defined. Also check for ieeefp.h and nan.h.
--- a/Makeconf.in +++ b/Makeconf.in @@ -178,6 +178,9 @@ # Where to install and expect the info files describing Octave.. infodir = @infodir@ +# The fill path to the default info file. +infofile = @infofile@ + # ==================== Octave-specific directories ==================== # These variables hold the values Octave will actually use. They are @@ -347,6 +350,7 @@ -e "s;%OCTAVE_BINDIR%;\"${bindir}\";" \ -e "s;%OCTAVE_LIBDIR%;\"${libdir}\";" \ -e "s;%OCTAVE_INFODIR%;\"${infodir}\";" \ + -e "s;%OCTAVE_INFOFILE%;\"${infofile}\";" \ -e "s;%OCTAVE_FCNFILEDIR%;\"${fcnfiledir}\";" \ -e "s;%OCTAVE_LOCALFCNFILEDIR%;\"${localfcnfiledir}\";" \ -e "s;%OCTAVE_LOCALFCNFILEPATH%;\"${localfcnfilepath}\";" \
--- a/configure.in +++ b/configure.in @@ -21,7 +21,7 @@ ### Software Foundation, 59 Temple Place - Suite 330, Boston, MA ### 02111-1307, USA. -AC_REVISION($Revision: 1.232 $) +AC_REVISION($Revision: 1.233 $) AC_PREREQ(2.9) AC_INIT(src/octave.cc) AC_CONFIG_HEADER(config.h) @@ -46,6 +46,7 @@ man1dir='$(mandir)/man1' man1ext='.1' +infofile='$(infodir)/octave.info' octincludedir='$(includedir)/octave-$(version)' fcnfiledir='$(datadir)/octave/$(version)/m' localfcnfiledir='$(datadir)/octave/site/m' @@ -71,6 +72,7 @@ AC_MSG_RESULT([defining man1dir to be $man1dir]) AC_MSG_RESULT([defining man1ext to be $man1ext]) AC_MSG_RESULT([defining infodir to be $infodir]) +AC_MSG_RESULT([defining infofile to be $infofile]) AC_MSG_RESULT([defining fcnfiledir to be $fcnfiledir]) AC_MSG_RESULT([defining localfcnfiledir to be $localfcnfiledir]) AC_MSG_RESULT([defining localfcnfilepath to be $localfcnfilepath]) @@ -94,6 +96,7 @@ AC_SUBST(man1dir) AC_SUBST(man1ext) AC_SUBST(infodir) +AC_SUBST(infofile) AC_SUBST(fcnfiledir) AC_SUBST(localfcnfiledir) AC_SUBST(localfcnfilepath) @@ -139,18 +142,15 @@ INFO_DIR=info USE_GNU_INFO=true -LIBINFO=../info/libinfo.a AC_ARG_ENABLE(info, [ --enable-info use GNU info (default is yes)], [if test $enableval = no; then USE_GNU_INFO=false; - LIBINFO=""; INFO_DIR=""; fi], []) if $USE_GNU_INFO; then AC_DEFINE(USE_GNU_INFO, 1) fi -AC_SUBST(LIBINFO) AC_SUBST(INFO_DIR) dnl ### Allow the user disable support for plplot. @@ -379,7 +379,9 @@ FPICFLAG= RLD_FLAG='-Xlinker -rpath -Xlinker $(libdir)' ;; +changequote(,)dnl i[3456789]86-*-linux*) +changequote([,])dnl RLD_FLAG='-Xlinker -rpath -Xlinker $(libdir)' ;; rs6000-ibm-aix* | powerpc-ibm-aix*)
--- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,7 @@ +Thu Nov 14 00:07:25 1996 John W. Eaton <jwe@bevo.che.wisc.edu> + + * Version 1.92. + Thu Nov 7 12:43:19 1996 John W. Eaton <jwe@bevo.che.wisc.edu> * Version 1.91.
--- a/doc/interpreter/install.texi +++ b/doc/interpreter/install.texi @@ -174,6 +174,11 @@ system. Using GNU @code{sed} avoids the problem. @item +On some SCO systems, @code{info} fails to compile if +@code{HAVE_TERMIOS_H} is defined int @file{config.h}. Simply removing +the definition from @file{info/config.h} should allow it to compile. + +@item If @code{configure} finds @code{dlopen}, @code{dlsym}, @code{dlclose}, and @code{dlerror}, but not the header file @file{dlfcn.h}, you need to find the source for the header file and install it in the directory
--- a/info/Makefile.in +++ b/info/Makefile.in @@ -1,5 +1,5 @@ # Makefile for texinfo/info. -*- Indented-Text -*- -# $Id: Makefile.in,v 1.32 1996-11-14 01:15:33 jwe Exp $ +# $Id: Makefile.in,v 1.33 1996-11-14 08:39:43 jwe Exp $ # # Copyright (C) 1993,96 Free Software Foundation, Inc. @@ -78,7 +78,7 @@ infomap.h nodes.h search.h session.h \ signals.h termdep.h terminal.h tilde.h \ indices.h window.h footnotes.h dribble.h \ - variables.h gc.h clib.h + variables.h gc.h clib.h man.h OBJS = dir.o display.o doc.o echo_area.o filesys.o info-utils.o info.o \ infodoc.o infomap.o m-x.o nodes.o search.o session.o signals.o \
--- a/libcruft/ChangeLog +++ b/libcruft/ChangeLog @@ -1,3 +1,7 @@ +Thu Nov 14 00:07:00 1996 John W. Eaton <jwe@bevo.che.wisc.edu> + + * Version 1.92. + Fri Nov 8 09:55:40 1996 John W. Eaton <jwe@bevo.che.wisc.edu> * Makefile.in (libcruft.a): Delete target.
--- a/libcruft/Makefile.in +++ b/libcruft/Makefile.in @@ -46,7 +46,7 @@ MISC_OBJ := misc/machar.o misc/dostop.o misc/f77-extern.o misc/lo-error.o CRUFT_FSRC := $(foreach dir, $(SUBDIRS), $(wildcard $(srcdir)/$(dir)/*.f)) -gCRUFT_OBJ2 := $(patsubst $(srcdir)/%, %, $(CRUFT_FSRC)) +CRUFT_OBJ2 := $(patsubst $(srcdir)/%, %, $(CRUFT_FSRC)) CRUFT_OBJ1 := $(patsubst %.f, %.o, $(CRUFT_OBJ2)) CRUFT_OBJ := $(CRUFT_OBJ1) $(MISC_OBJ)
--- a/liboctave/ChangeLog +++ b/liboctave/ChangeLog @@ -1,5 +1,12 @@ +Thu Nov 14 00:06:53 1996 John W. Eaton <jwe@bevo.che.wisc.edu> + + * Version 1.92. + Wed Nov 13 11:19:22 1996 John W. Eaton <jwe@bevo.che.wisc.edu> + * cmd-hist.cc (command_history::add): Ignore empty input lines, or + lines that have only carriage return or newline. + * lo-ieee.cc (isnan, isinf): Provide functions for SCO. Tue Nov 12 11:11:21 1996 John W. Eaton <jwe@bevo.che.wisc.edu>
--- a/liboctave/cmd-hist.cc +++ b/liboctave/cmd-hist.cc @@ -119,6 +119,10 @@ { if (! ignoring_entries ()) { + if (s.empty () + || (s.length () == 1 && (s[0] == '\r' || s[0] == '\n'))) + return; + ::add_history (s.c_str ()); lines_this_session++; }
--- a/scripts/ChangeLog +++ b/scripts/ChangeLog @@ -1,3 +1,7 @@ +Thu Nov 14 00:06:34 1996 John W. Eaton <jwe@bevo.che.wisc.edu> + + * Version 1.92. + Thu Nov 7 12:43:12 1996 John W. Eaton <jwe@bevo.che.wisc.edu> * image/saveimage.m: When writing PostScript, name Octave as the
--- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,17 @@ +Thu Nov 14 00:06:19 1996 John W. Eaton <jwe@bevo.che.wisc.edu> + + * Version 1.92. + Wed Nov 13 11:13:22 1996 John W. Eaton <jwe@bevo.che.wisc.edu> + * sighandlers.cc (sys_siglist): [__EMX__]: Add definitions. + + * octave.cc (execute_startup_files): Allow init file name ot be + specified by an environment variable. + + * dirfns.cc (make_absolute): [__EMX__]: Path is already absolute + if it begins with any character followed by a colon. + * load-save.cc (read_mat_ascii_matrix, get_lines_and_columns, get_complete_line): New functions, for reading headless text files. (load_save_format): Add LS_MAT_ASCII, for headless text files.
--- a/src/defaults.cc +++ b/src/defaults.cc @@ -184,15 +184,11 @@ static void set_default_info_file (void) { + string std_info_file = subst_octave_home (OCTAVE_INFOFILE); + char *oct_info_file = getenv ("OCTAVE_INFO_FILE"); - if (oct_info_file) - Vinfo_file = string (oct_info_file); - else - { - Vinfo_file = Vinfo_dir; - Vinfo_file.append ("/octave.info"); - } + Vinfo_file = oct_info_file ? string (oct_info_file) : std_info_file; } static void
--- a/src/defaults.h.in +++ b/src/defaults.h.in @@ -54,6 +54,10 @@ #define OCTAVE_INFODIR %OCTAVE_INFODIR% #endif +#ifndef OCTAVE_INFOFILE +#define OCTAVE_INFOFILE %OCTAVE_INFOFILE% +#endif + #ifndef OCTAVE_FCNFILEDIR #define OCTAVE_FCNFILEDIR %OCTAVE_FCNFILEDIR% #endif
--- a/src/dirfns.cc +++ b/src/dirfns.cc @@ -180,6 +180,11 @@ string make_absolute (const string& s, const string& dot_path) { +#if defined (__EMX__) + if (s.length () > 1 && s[1] == ':') + return s; +#endif + if (dot_path.empty () || s[0] == '/' || s.empty ()) return s;
--- a/src/octave.cc +++ b/src/octave.cc @@ -270,16 +270,22 @@ if (read_init_files) { - // Try to execute commands from $HOME/.octaverc and - // ./.octaverc. + // Try to execute commands from $HOME/$OCTAVE_INITFILE and + // $OCTAVE_INITFILE. If $OCTAVE_INITFILE is not set, .octaverc + // is assumed. int home_rc_already_executed = 0; - string home_rc; + + char *initfile = getenv ("OCTAVE_INITFILE"); + + if (! initfile) + initfile = ".octaverc"; + + string home_rc = Vhome_directory + "/" + initfile; + string local_rc = string ("./") + initfile; if (! Vhome_directory.empty ()) { - home_rc = Vhome_directory; - home_rc.append ("/.octaverc"); parse_and_execute (home_rc, 0, verbose); // Names alone are not enough. @@ -288,7 +294,7 @@ if (fs_home_rc) { - file_stat fs_dot_rc ("./.octaverc"); + file_stat fs_dot_rc (local_rc); if (fs_dot_rc && fs_home_rc.ino () == fs_dot_rc.ino ()) home_rc_already_executed = 1; @@ -296,7 +302,7 @@ } if (! home_rc_already_executed) - parse_and_execute ("./.octaverc", 0, verbose); + parse_and_execute (local_rc, 0, verbose); } run_unwind_frame ("execute_startup_files");
--- a/src/sighandlers.cc +++ b/src/sighandlers.cc @@ -385,6 +385,30 @@ "HFT sound done", /* 30 SIGSOUND */ "HFT input ready", /* 31 SIGMSG */ #else /* not AIX */ +#ifdef __EMX__ + "bogus signal #0", /* 0 */ + "hangup", /* 1 SIGHUP */ + "interrupt (Ctrl-C)", /* 2 SIGINT (Ctrl-C) */ + "quit", /* 3 SIGQUIT */ + "illegal instruction", /* 4 SIGILL */ + "single step", /* 5 SIGTRAP */ + "abort", /* 6 SIGABRT */ + "EMT instruction", /* 7 SIGEMT */ + "floating point exception", /* 8 SIGFPE */ + "kill", /* 9 SIGKILL */ + "bus error", /* 10 SIGBUS */ + "segmentation violation", /* 11 SIGSEGV */ + "bad argument to system call", /* 12 SIGSYS */ + "broken pipe", /* 13 SIGPIPE */ + "alarm clock", /* 14 SIGALRM */ + "software termination signum", /* 15 SIGTERM */ + "user defined signal 1", /* 16 SIGUSR1 */ + "user defined signal 2", /* 17 SIGUSR2 */ + "death of a child", /* 18 SIGCHLD */ + "bogus signal #20", /* 19 */ + "bogus signal #21", /* 20 */ + "break (Ctrl-Break)", /* 21 SIGBREAK */ +#else /* not __EMX__ */ "bogus signal", /* 0 */ "hangup", /* 1 SIGHUP */ "interrupt", /* 2 SIGINT */ @@ -427,7 +451,8 @@ "Special Signal Used By CPR", /* 35 SIGTHAW */ #endif #endif /* sun */ -#endif /* not AIX */ +#endif /* __EMX__ */ +#endif /* AIX */ 0 }; #endif