# HG changeset patch # User jwe # Date 869772944 0 # Node ID 42975c59d2a08f376b586e9530803a3fae62ba1e # Parent 132c83a7b706a0c5ecc67da8d169f3af0cb28644 [project @ 1997-07-24 19:33:35 by jwe] diff -r 132c83a7b706 -r 42975c59d2a0 ChangeLog --- a/ChangeLog Thu Jul 17 14:44:42 1997 +0000 +++ b/ChangeLog Thu Jul 24 19:35:44 1997 +0000 @@ -1,3 +1,8 @@ +Thu Jul 17 13:31:08 1997 John W. Eaton + + * aclocal.m4 (OCTAVE_FLIBS): Only accept an ld_run_path that is + absolute. + Wed Jul 9 19:27:38 1997 John W. Eaton * configure.in: Also check for getwd. diff -r 132c83a7b706 -r 42975c59d2a0 aclocal.m4 --- a/aclocal.m4 Thu Jul 17 14:44:42 1997 +0000 +++ b/aclocal.m4 Thu Jul 24 19:35:44 1997 +0000 @@ -85,17 +85,18 @@ ld_run_path=`echo $foutput | \ sed -n -e 's/^.*LD_RUN_PATH *= *\([^ ]*\).*/\1/p'` dnl -dnl We are only supposed to find this on Solaris systems, and this -dnl substitution is probably only going to work with gcc on those -dnl systems... +dnl We are only supposed to find this on Solaris systems... +dnl Uh, the run path should be absolute, shouldn't it? dnl -if test -n "$ld_run_path"; then - if test "$ac_cv_prog_gcc" = yes; then - ld_run_path="-Xlinker -R -Xlinker $ld_run_path" - else - ld_run_path="-R $ld_run_path" - fi -fi +case "$ld_run_path" in + /*) + if test "$ac_cv_prog_gcc" = yes; then + ld_run_path="-Xlinker -R -Xlinker $ld_run_path" + else + ld_run_path="-R $ld_run_path" + fi + ;; +esac dnl flibs= lflags= diff -r 132c83a7b706 -r 42975c59d2a0 liboctave/ChangeLog --- a/liboctave/ChangeLog Thu Jul 17 14:44:42 1997 +0000 +++ b/liboctave/ChangeLog Thu Jul 24 19:35:44 1997 +0000 @@ -1,3 +1,7 @@ +Thu Jul 24 14:32:48 1997 John W. Eaton + + * file-ops.cc (tilde_expand_word): Fix off-by-one error. + Wed Jul 9 19:40:23 1997 John W. Eaton * lo-sysdep.cc (octave_getcwd): If getwd is available, use it. diff -r 132c83a7b706 -r 42975c59d2a0 liboctave/file-ops.cc --- a/liboctave/file-ops.cc Thu Jul 17 14:44:42 1997 +0000 +++ b/liboctave/file-ops.cc Thu Jul 24 19:35:44 1997 +0000 @@ -348,10 +348,7 @@ = file_ops::tilde_expansion_preexpansion_hook (username); if (! expansion.empty ()) - { - dirname = expansion + filename.substr (user_len); - return dirname; - } + return expansion + filename.substr (user_len+1); } // No preexpansion hook, or the preexpansion hook failed. Look in the @@ -370,7 +367,7 @@ = file_ops::tilde_expansion_failure_hook (username); if (! expansion.empty ()) - dirname = expansion + filename.substr (user_len); + dirname = expansion + filename.substr (user_len+1); } // If we don't have a failure hook, or if the failure hook did not @@ -380,7 +377,7 @@ dirname = filename; } else - dirname = pw.dir () + filename.substr (user_len); + dirname = pw.dir () + filename.substr (user_len+1); return dirname; } diff -r 132c83a7b706 -r 42975c59d2a0 src/ChangeLog --- a/src/ChangeLog Thu Jul 17 14:44:42 1997 +0000 +++ b/src/ChangeLog Thu Jul 24 19:35:44 1997 +0000 @@ -1,3 +1,9 @@ +Thu Jul 17 13:06:48 1997 Klaus Gebhardt + + * DLD-FUNCTIONS/rand.cc (Frand): Use F77_XFCN to call getsd, + setsd, setall, setcgn, dgenunf, and dgennor since they can call + XSTOPX. + Mon Jul 14 12:54:23 1997 John W. Eaton * dynamic-ld.cc (octave_dynamic_loader::load_fcn_from_dot_oct_file): diff -r 132c83a7b706 -r 42975c59d2a0 src/DLD-FUNCTIONS/rand.cc --- a/src/DLD-FUNCTIONS/rand.cc Thu Jul 17 14:44:42 1997 +0000 +++ b/src/DLD-FUNCTIONS/rand.cc Thu Jul 24 19:35:44 1997 +0000 @@ -71,7 +71,7 @@ { union d2i { double d; int i[2]; }; union d2i u; - F77_FCN (getsd, GETSD) (u.i[0], u.i[1]); + F77_XFCN (getsd, GETSD, (u.i[0], u.i[1])); return u.d; } @@ -98,7 +98,7 @@ u.d = val; int i0 = force_to_fit_range (u.i[0], 1, 2147483563); int i1 = force_to_fit_range (u.i[1], 1, 2147483399); - F77_FCN (setsd, SETSD) (i0, i1); + F77_XFCN (setsd, SETSD, (i0, i1)); } static char * @@ -139,7 +139,7 @@ s0 = force_to_fit_range (s0, 1, 2147483563); s1 = force_to_fit_range (s1, 1, 2147483399); - F77_FCN (setall, SETALL) (s0, s1); + F77_XFCN (setall, SETALL, (s0, s1)); initialized = 1; } @@ -179,13 +179,13 @@ { current_distribution = uniform_dist; - F77_FCN (setcgn, SETCGN) (uniform_dist); + F77_XFCN (setcgn, SETCGN, (uniform_dist)); } else if (s_arg == "normal") { current_distribution = normal_dist; - F77_FCN (setcgn, SETCGN) (normal_dist); + F77_XFCN (setcgn, SETCGN, (normal_dist)); } else error ("rand: unrecognized string argument"); @@ -301,12 +301,12 @@ switch (current_distribution) { case uniform_dist: - F77_FCN (dgenunf, DGENUNF) (0.0, 1.0, val); + F77_XFCN (dgenunf, DGENUNF, (0.0, 1.0, val)); rand_mat (i, j) = val; break; case normal_dist: - F77_FCN (dgennor, DGENNOR) (0.0, 1.0, val); + F77_XFCN (dgennor, DGENNOR, (0.0, 1.0, val)); rand_mat (i, j) = val; break; @@ -355,7 +355,7 @@ static void reset_rand_generator (void *) { - F77_FCN (setcgn, SETCGN) (current_distribution); + F77_XFCN (setcgn, SETCGN, (current_distribution)); } DEFUN_DLD (randn, args, nargout, @@ -392,7 +392,7 @@ current_distribution = normal_dist; - F77_FCN (setcgn, SETCGN) (normal_dist); + F77_XFCN (setcgn, SETCGN, (normal_dist)); retval = do_rand (args, nargin);