changeset 3024:95e8b5c4824a

[project @ 1997-06-04 05:06:26 by jwe]
author jwe
date Wed, 04 Jun 1997 05:11:34 +0000
parents 0d37334d13ab
children 5a9dd0a68b1d
files ChangeLog PROJECTS aclocal.m4 configure.in kpathsea/ChangeLog liboctave/ChangeLog liboctave/pathsearch.cc liboctave/pathsearch.h scripts/ChangeLog src/ChangeLog src/octave.cc
diffstat 11 files changed, 37 insertions(+), 35 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Jun  4 00:07:29 1997  John W. Eaton  <jwe@bevo.che.wisc.edu>
+
+	* configure.in (OCTAVE_PROGRAM_INVOCATION_NAME): Delete check.
+	* aclocal.m4 (OCTAVE_PROGRAM_INVOCATION_NAME): Delete macro.
+
 Mon Jun  2 13:56:26 1997  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
 	* configure.in: Move checks for RANLIB, AR, and ARFLAGS before
--- a/PROJECTS
+++ b/PROJECTS
@@ -285,18 +285,6 @@
     find the first .oct or .m file in the path, and only prefer .oct
     over .m if both files are in the same directory.
 
-  * Fix the grammar to allow structure references and index operations
-    for for anonymous expressions.  For example, it should be possible
-    to write
-
-      localtime (time ()) . hour;
-
-    to get the current hour.  Likewise, it should be possible to write
-
-      svd (A) (1:13);
-
-    to extract the first 13 singular values of the matrix A.
-
   * Consider grouping all preference variables in a structure instead
     of further polluting the namespace.  Maybe `Octave_options.xxx'?
 
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -431,19 +431,6 @@
   AC_DEFINE(SMART_PUTENV)
 fi])
 dnl
-dnl This is a GNU libc invention, and this check is also from Karl
-dnl Berry's kpathsea library.
-dnl
-AC_DEFUN(OCTAVE_PROGRAM_INVOCATION_NAME,
-[AC_MSG_CHECKING(whether program_invocation_name is predefined)
-AC_CACHE_VAL(octave_cv_var_program_inv_name,
-[AC_TRY_LINK(, [main() { program_invocation_name = "love"; }],
-  octave_cv_var_program_inv_name=yes, octave_cv_var_program_inv_name=no)])dnl
-AC_MSG_RESULT($octave_cv_var_program_inv_name)
-if test $octave_cv_var_program_inv_name = yes; then
-  AC_DEFINE(HAVE_PROGRAM_INVOCATION_NAME)
-fi])
-dnl
 dnl These two checks for signal functions were originally part of the
 dnl aclocal.m4 file distributed with bash 2.0.
 dnl
--- 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.270 $)
+AC_REVISION($Revision: 1.272 $)
 AC_PREREQ(2.9)
 AC_INIT(src/octave.cc)
 AC_CONFIG_HEADER(config.h)
@@ -45,6 +45,7 @@
 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')
 OCTAVE_SET_DEFAULT(fcnfiledir, '$(datadir)/octave/m')
 OCTAVE_SET_DEFAULT(localfcnfiledir, '$(datadir)/octave/site/m')
@@ -733,7 +734,6 @@
   waitpid)
 
 OCTAVE_SMART_PUTENV
-OCTAVE_PROGRAM_INVOCATION_NAME
 
 LIBDLFCN=
 DLFCN_INCFLAGS=
--- a/kpathsea/ChangeLog
+++ b/kpathsea/ChangeLog
@@ -1,5 +1,8 @@
 Tue Jun  3 23:48:22 1997  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
+	* absolute.c (kpse_absolute_p): Recognize foo/bar as an
+	explicit_relative file name.
+
 	* common.ac: (program_invocation_name): AC_TRY_LINK only requires
 	function body.  Add declaration for program_invocation_name so gcc
 	won't complain about undeclared variable.
--- a/liboctave/ChangeLog
+++ b/liboctave/ChangeLog
@@ -1,3 +1,8 @@
+Wed Jun  4 00:08:55 1997  John W. Eaton  <jwe@bevo.che.wisc.edu>
+
+	* pathsearch.h, pathsearch.cc (dir_pat::set_program_name):
+	New static function.
+
 Mon Jun  2 12:44:14 1997  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
 	* lo-mappers.cc (fix): Use floor and ceil instead of casting to int.
--- a/liboctave/pathsearch.cc
+++ b/liboctave/pathsearch.cc
@@ -28,25 +28,22 @@
 
 #include <string>
 
+#include "lo-utils.h"
 #include "pathsearch.h"
 #include "str-vec.h"
+#include "str-vec.h"
 
 extern "C"
 {
 // Have to redefine these because they conflict with new C++ keywords
 // or otherwise cause trouble...
-#define boolean kpse_boolean
-#define true kpse_true
-#define false kpse_false
 #define string kpse_string
 
 #include <kpathsea/pathsearch.h>
+#include <kpathsea/progname.h>
 
 extern unsigned int kpathsea_debug;
 
-#undef true
-#undef false
-#undef boolean
 #undef string
 }
 
@@ -106,8 +103,7 @@
 
   if (initialized)
     {
-      char *tmp = kpse_path_search (p.c_str (), nm.c_str (),
-				    kpse_true);
+      char *tmp = kpse_path_search (p.c_str (), nm.c_str (), true);
       if (tmp)
 	{
 	  retval = tmp;
@@ -142,6 +138,12 @@
 }
 
 void
+dir_path::set_program_name (const char *nm)
+{
+  kpse_set_progname (nm);
+}
+
+void
 dir_path::init (void)
 {
   initialized = false;
--- a/liboctave/pathsearch.h
+++ b/liboctave/pathsearch.h
@@ -66,6 +66,8 @@
 
   string_vector find_all (const string&);
 
+  static void set_program_name (const char *);
+
 private:
 
   // The colon separated list.
--- a/scripts/ChangeLog
+++ b/scripts/ChangeLog
@@ -1,3 +1,7 @@
+Tue Jun  3 12:16:00 1997  John W. Eaton  <jwe@bevo.che.wisc.edu>
+
+	* miscellaneous/path.m: New file.
+
 Wed May 21 11:45:31 1997  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
 	* miscellaneous/bug_report.m: Pass file id to dump_prefs, not file
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+Wed Jun  4 00:09:42 1997  John W. Eaton  <jwe@bevo.che.wisc.edu>
+
+	* octave.cc (main): Call dir_path::set_program_name here.
+
 Tue Jun  3 16:47:34 1997  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
 	* variables.cc (symbol_out_of_date): Make it work again.
--- a/src/octave.cc
+++ b/src/octave.cc
@@ -348,6 +348,8 @@
 {
   octave_env::set_program_name (argv[0]);
 
+  dir_path::set_program_name (argv[0]);
+
   // The order of these calls is important.  The call to
   // install_defaults must come before install_builtins because
   // default variable values must be available for the variables to be