Mercurial > hg > octave-max

changeset 3004:9a54159563de

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 1997-05-23 05:00:49 by jwe]
author jwe
date Fri, 23 May 1997 05:03:17 +0000
parents 9e01b476cf79
children fd2080b2800e
files ChangeLog configure.in liboctave/ChangeLog liboctave/cmd-edit.cc liboctave/cmd-edit.h octMakefile.in src/Makefile.in src/input.cc
diffstat 8 files changed, 58 insertions(+), 35 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,20 @@
+Thu May 22 16:48:34 1997  John W. Eaton  <jwe@bevo.che.wisc.edu>
+
+	* configure.in (AC_OUTPUT): Remove duplicate entry for emacs/Makefile.
+
+	* octMakefile.in (INSTALL_SUBDIRS): New macro.
+	(install): Use it.
+
+	* kpathsea: Update to new version (3.0).
+
+	* readline: Update to new version (2.1-beta2).
+
 Wed May 21 16:33:33 1997  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
 	* octMakefile.in (install, install-strip): Append version
 	information to octave-bug and mkoctfile.
+	(install, install-strip): Remove octave-bug and mkoctfile first.
+	Ensure link is made in include directory.
 
 	* configure.in (octlibdir): New variable.
 	* Makeconf.in: Substitute it here.	
--- 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.267 $)
+AC_REVISION($Revision: 1.268 $)
 AC_PREREQ(2.9)
 AC_INIT(src/octave.cc)
 AC_CONFIG_HEADER(config.h)
@@ -45,23 +45,17 @@
 OCTAVE_SET_DEFAULT(man1dir, '$(mandir)/man1')
 OCTAVE_SET_DEFAULT(man1ext, '.1')
 OCTAVE_SET_DEFAULT(infofile, '$(infodir)/octave.info')
-OCTAVE_SET_DEFAULT(octlibdir, '$(libdir)/octave-$(version)')
-OCTAVE_SET_DEFAULT(octincludedir, '$(includedir)/octave-$(version)/octave')
-OCTAVE_SET_DEFAULT(fcnfiledir, '$(datadir)/octave/$(version)/m')
+OCTAVE_SET_DEFAULT(octincludedir, '$(includedir)/octave')
+OCTAVE_SET_DEFAULT(fcnfiledir, '$(datadir)/octave/m')
 OCTAVE_SET_DEFAULT(localfcnfiledir, '$(datadir)/octave/site/m')
 OCTAVE_SET_DEFAULT(localfcnfilepath, '$(localfcnfiledir)//')
-OCTAVE_SET_DEFAULT(archlibdir,
-  '$(libexecdir)/octave/$(version)/exec/$(target_host_type)')
-OCTAVE_SET_DEFAULT(localarchlibdir,
-  '$(libexecdir)/octave/site/exec/$(target_host_type)')
-OCTAVE_SET_DEFAULT(octfiledir,
-  '$(libexecdir)/octave/$(version)/oct/$(target_host_type)')
-OCTAVE_SET_DEFAULT(localoctfiledir,
-  '$(libexecdir)/octave/site/oct/$(target_host_type)')
+OCTAVE_SET_DEFAULT(archlibdir, '$(libexecdir)/octave/exec/$(target_host_type)')
+OCTAVE_SET_DEFAULT(localarchlibdir, '$(libexecdir)/octave/site/exec/$(target_host_type)')
+OCTAVE_SET_DEFAULT(octfiledir, '$(libexecdir)/octave/oct/$(target_host_type)')
+OCTAVE_SET_DEFAULT(localoctfiledir, '$(libexecdir)/octave/site/oct/$(target_host_type)')
 OCTAVE_SET_DEFAULT(localoctfilepath, '$(localoctfiledir)//')
-OCTAVE_SET_DEFAULT(fcnfilepath,
-  '.:$(localoctfilepath):$(localfcnfilepath):$(octfiledir)//:$(fcnfiledir)//')
-OCTAVE_SET_DEFAULT(imagedir, '$(datadir)/octave/$(version)/imagelib')
+OCTAVE_SET_DEFAULT(fcnfilepath, '.:$(localoctfilepath):$(localfcnfilepath):$(octfiledir)//:$(fcnfiledir)//')
+OCTAVE_SET_DEFAULT(imagedir, '$(datadir)/octave/imagelib')
 OCTAVE_SET_DEFAULT(imagepath, '.:$(imagedir)//')
 
 ### Make configure args available for other uses.
@@ -160,7 +154,7 @@
 
 READLINE_DIR=readline
 USE_READLINE=true
-LIBREADLINE=-lreadline
+LIBREADLINE=../readline/libreadline.a
 AC_ARG_ENABLE(readline,
   [  --enable-readline       use readline library (default is yes)],
   [if test "$enableval" = no; then
@@ -1191,8 +1185,8 @@
 AC_OUTPUT(Makefile octMakefile Makeconf test/Makefile dlfcn/Makefile
   doc/Makefile doc/faq/Makefile doc/interpreter/Makefile
   doc/liboctave/Makefile doc/refcard/Makefile emacs/Makefile
-  emacs/Makefile examples/Makefile liboctave/Makefile
-  src/Makefile libcruft/Makefile libcruft/Makerules
+  examples/Makefile liboctave/Makefile src/Makefile
+  libcruft/Makefile libcruft/Makerules
   libcruft/blas/Makefile libcruft/balgen/Makefile
   libcruft/dassl/Makefile libcruft/eispack/Makefile
   libcruft/fftpack/Makefile libcruft/fsqp/Makefile
--- a/liboctave/ChangeLog
+++ b/liboctave/ChangeLog
@@ -1,3 +1,13 @@
+Thu May 22 16:20:43 1997  John W. Eaton  <jwe@bevo.che.wisc.edu>
+
+	* cmd-edit.h, cmd-edit.cc: Rename set_paren_string_delimiters to
+	set_basic_quote_characters, to match new version of readline.
+
+	* cmd-edit.cc (do_restore_terminal_state): Call readline function
+	for restoring terminal state through rl_deprep_term_function, now
+	declared in readline.h
+	(rl_deprep_terminal): Delete declaration.
+
 Wed May 21 16:30:25 1997  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
 	* Makefile.in (install-in): Use new mk-includedir-link macro.
--- a/liboctave/cmd-edit.cc
+++ b/liboctave/cmd-edit.cc
@@ -53,8 +53,6 @@
 
 // It would be nice if readline.h declared these, I think.
 
-extern "C" void rl_deprep_terminal (void);
-
 extern int rl_blink_matching_paren;
 
 extern int screenheight;
@@ -98,7 +96,7 @@
 
   void do_blink_matching_paren (bool flag);
 
-  void do_set_paren_string_delimiters (const string& s);
+  void do_set_basic_quote_characters (const string& s);
 
   void do_set_completion_append_character (char c);
 
@@ -242,7 +240,8 @@
 void
 gnu_readline::do_restore_terminal_state (void)
 {
-  rl_deprep_terminal ();
+  if (rl_deprep_term_function)
+    rl_deprep_term_function ();
 }
 
 void
@@ -252,7 +251,7 @@
 }
 
 void
-gnu_readline::do_set_paren_string_delimiters (const string& s)
+gnu_readline::do_set_basic_quote_characters (const string& s)
 {
   static char *ss = 0;
 
@@ -260,7 +259,7 @@
 
   ss = strsave (s.c_str ());
 
-  rl_paren_string_delimiters = ss;
+  rl_basic_quote_characters = ss;
 }
 
 void
@@ -589,10 +588,10 @@
 }
 
 void
-command_editor::set_paren_string_delimiters (const string& s)
+command_editor::set_basic_quote_characters (const string& s)
 {
   if (instance_ok ())
-    instance->do_set_paren_string_delimiters (s);
+    instance->do_set_basic_quote_characters (s);
 }
 
 void
--- a/liboctave/cmd-edit.h
+++ b/liboctave/cmd-edit.h
@@ -67,7 +67,7 @@
 
   static void blink_matching_paren (bool flag);
 
-  static void set_paren_string_delimiters (const string& s);
+  static void set_basic_quote_characters (const string& s);
 
   static void set_completion_append_character (char c);
 
@@ -138,7 +138,7 @@
 
   virtual void do_blink_matching_paren (bool) { }
 
-  virtual void do_set_paren_string_delimiters (const string&) { }
+  virtual void do_set_basic_quote_characters (const string&) { }
 
   virtual void do_set_completion_append_character (char) { }
 
--- a/octMakefile.in
+++ b/octMakefile.in
@@ -31,12 +31,16 @@
 	MAKEINFO.PATCH ChangeLog ChangeLog.[0-9]
 
 # Complete directory trees to distribute.
-DISTDIRS = glob kpathsea make # plplot
+DISTDIRS = glob kpathsea # plplot
 
 # Subdirectories in which to run `make all'.
 SUBDIRS = @INFO_DIR@ @PLPLOT_DIR@ @READLINE_DIR@ @DLFCN_DIR@ glob \
 	kpathsea libcruft liboctave src scripts doc examples
 
+
+# Subdirectories in which to run `make all'.
+INSTALL_SUBDIRS = @INFO_DIR@ libcruft liboctave src scripts doc examples
+
 # Subdirectories in which to run `make conf-dist'.
 CONF_DISTSUBDIRS = src
 
@@ -102,11 +106,14 @@
 
 install install-strip ::
 	$(top_srcdir)/mkinstalldirs $(DIRS_TO_MAKE)
+	rm -f $(bindir)/octave-bug
 	$(INSTALL_SCRIPT) octave-bug $(bindir)/octave-bug-$(version)
 	cd $(bindir) ; $(LN_S) octave-bug-$(version) octave-bug
+	rm -f $(bindir)/mkoctfile
 	$(INSTALL_SCRIPT) mkoctfile $(bindir)/mkoctfile-$(version)
 	cd $(bindir) ; $(LN_S) mkoctfile-$(version) mkoctfile
 	$(INSTALL_DATA) config.h $(octincludedir)/config.h
+	$(mk-includedir-link)
 
 maintainer-clean::
 	@echo ""
@@ -119,7 +126,7 @@
 	@echo ""
 
 install install-strip uninstall tags TAGS::
-	@$(subdir-for-command)
+	$(foreach d, $(INSTALL_SUBDIRS), $(do-subdir-for-command))
 .PHONY: install install-strip uninstall tags
 
 clean mostlyclean distclean maintainer-clean::
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -167,11 +167,11 @@
 VAR_1 := $(patsubst %.l, %, $(VAR_2))
 VAR_FILES := $(patsubst %.cc, %, $(VAR_1))
 
-OCTAVE_LFLAGS = -L../liboctave -L../libcruft -L../readline \
-	-L../kpathsea -L../glob -L../dlfcn -L. $(RLD_FLAG)
+OCTAVE_LFLAGS = -L../liboctave -L../libcruft -L../glob \
+	-L../dlfcn -L. $(RLD_FLAG)
 
-OCTAVE_LIBS = -loctinterp -loctave -lcruft \
-	$(LIBPLPLOT) $(LIBREADLINE) -lkpathsea -lglob $(LIBDLFCN)
+OCTAVE_LIBS = -loctinterp -loctave -lcruft $(LIBPLPLOT) \
+	$(LIBREADLINE) ../kpathsea/libkpathsea.a -lglob $(LIBDLFCN)
 
 LIBS_TO_INSTALL = liboctinterp.a
 
--- a/src/input.cc
+++ b/src/input.cc
@@ -444,7 +444,7 @@
 
   command_editor::set_name ("Octave");
 
-  command_editor::set_paren_string_delimiters ("\"");
+  command_editor::set_basic_quote_characters ("\"");
 
   command_editor::set_completion_function (generate_completion);
 }