Mercurial > octave-nkf
changeset 3705:7e90f4e9a4d5
[project @ 2000-07-22 01:57:25 by jwe]
| author | jwe |
|---|---|
| date | Sat, 22 Jul 2000 01:57:28 +0000 |
| parents | aef06675c94d |
| children | 6581e686f83f |
| files | ChangeLog Makeconf.in configure.in doc/interpreter/control.txi scripts/ChangeLog scripts/strings/str2mat.m src/ChangeLog src/Makefile.in |
| diffstat | 8 files changed, 30 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Thu Jul 20 19:21:24 2000 +0000 +++ b/ChangeLog Sat Jul 22 01:57:28 2000 +0000 @@ -1,3 +1,9 @@ +2000-07-20 Joao Cardoso <jcardoso@inescn.pt> + + * configure.in: (LD_CXX): Define and substitute. + For sco3.2v5 systems, set SONAME_FLAGS and RLD_FLAG. + * Makeconf.in (LD_CXX): Allow substitution. + 2000-07-18 John W. Eaton <jwe@bevo.che.wisc.edu> * octMakefile.in (DISTSUBDIRS): Define in terms of $(ALL_SUBDIRS).
--- a/Makeconf.in Thu Jul 20 19:21:24 2000 +0000 +++ b/Makeconf.in Sat Jul 22 01:57:28 2000 +0000 @@ -121,6 +121,7 @@ CPPFLAGS = @CPPFLAGS@ +LD_CXX = @LD_CXX@ LDFLAGS = @LDFLAGS@ LD_STATIC_FLAG = @LD_STATIC_FLAG@ ALL_LDFLAGS = $(LIBFLAGS) $(FORTRAN_MAIN_FLAG) \
--- a/configure.in Thu Jul 20 19:21:24 2000 +0000 +++ b/configure.in Sat Jul 22 01:57:28 2000 +0000 @@ -21,7 +21,7 @@ ### Software Foundation, 59 Temple Place - Suite 330, Boston, MA ### 02111-1307, USA. -AC_REVISION($Revision: 1.332 $) +AC_REVISION($Revision: 1.333 $) AC_PREREQ(2.9) AC_INIT(src/octave.cc) AC_CONFIG_HEADER(config.h) @@ -711,6 +711,8 @@ changequote(,)dnl i[3456]86-*-sco3.2v5*) changequote([,])dnl + SONAME_FLAGS='-Xlinker -h -Xlinker $@' + RLD_FLAG= SH_LDFLAGS=-G ;; rs6000-ibm-aix* | powerpc-ibm-aix*) @@ -918,6 +920,7 @@ OCTAVE_SMART_PUTENV +LD_CXX='$(CXX)' LIBDLFCN= DLFCN_INCFLAGS= RDYNAMIC_FLAG= @@ -931,6 +934,7 @@ changequote(,)dnl i[3456]86-*-sco3.2v5*) changequote([,])dnl + LD_CXX='LD_RUN_PATH=$LD_RUN_PATH:$(octlibdir) $(CXX)' WITH_DL=true ;; *) @@ -960,6 +964,7 @@ AC_SUBST(LIBDLFCN) AC_SUBST(DLFCN_INCFLAGS) AC_SUBST(RDYNAMIC_FLAG) +AC_SUBST(LD_CXX) if test "$WITH_SHL" = yes || test "$WITH_SHL" = maybe; then AC_CHECK_LIB(dld, shl_load)
--- a/doc/interpreter/control.txi Thu Jul 20 19:21:24 2000 +0000 +++ b/doc/interpreter/control.txi Sat Jul 22 01:57:28 2000 +0000 @@ -456,6 +456,8 @@ @DOCSTRING(dlqr) +@DOCSTRING(dkalman) + @DOCSTRING(h2syn) @DOCSTRING(hinf_ctr)
--- a/scripts/ChangeLog Thu Jul 20 19:21:24 2000 +0000 +++ b/scripts/ChangeLog Sat Jul 22 01:57:28 2000 +0000 @@ -1,3 +1,7 @@ +2000-07-21 John W. Eaton <jwe@bevo.che.wisc.edu> + + * strings/str2mat.m: Apply setstr to each argument. + 2000-07-17 Gabriele Pannocchia <pannocchia@ing.unipi.it> * control/base/dkalman.m: New file.
--- a/scripts/strings/str2mat.m Thu Jul 20 19:21:24 2000 +0000 +++ b/scripts/strings/str2mat.m Sat Jul 22 01:57:28 2000 +0000 @@ -47,11 +47,10 @@ nc = zeros (nargin, 1); for k = 1 : nargin s = va_arg (); - if (isstr (s)) - [nr(k), nc(k)] = size (s); - else - error ("str2mat: all arguments must be strings"); + if (! isstr (s)) + s = setstr (s); endif + [nr(k), nc(k)] = size (s); endfor tmp = find (nr == 0); @@ -70,6 +69,9 @@ row_offset = 0; for k = 1 : nargin s = va_arg (); + if (! isstr (s)) + s = setstr (s); + endif if (nc(k) > 0) retval ((row_offset + 1) : (row_offset + nr(k)), 1:nc(k)) = s; endif
--- a/src/ChangeLog Thu Jul 20 19:21:24 2000 +0000 +++ b/src/ChangeLog Sat Jul 22 01:57:28 2000 +0000 @@ -1,3 +1,7 @@ +2000-07-20 Joao Cardoso <jcardoso@inescporto.pt> + + * Makefile.in (octave): Link with $(LD_CXX) instead of $(CXX) + 2000-07-20 John W. Eaton <jwe@bevo.che.wisc.edu> * oct-stream.cc (octave_base_stream::oscanf): Advance to next
--- a/src/Makefile.in Thu Jul 20 19:21:24 2000 +0000 +++ b/src/Makefile.in Sat Jul 22 01:57:28 2000 +0000 @@ -257,7 +257,7 @@ octave: stamp-prereq $(LIBRARIES) stamp-oct-links \ octave.o builtins.o ops.o $(DLD_STATIC_OBJ) - $(CXX) $(CPPFLAGS) $(ALL_CXXFLAGS) $(RDYNAMIC_FLAG) \ + $(LD_CXX) $(CPPFLAGS) $(ALL_CXXFLAGS) $(RDYNAMIC_FLAG) \ $(ALL_LDFLAGS) -o octave \ octave.o builtins.o ops.o $(XERBLA) $(DLD_STATIC_OBJ) \ $(OCTAVE_LFLAGS) \