Mercurial > octave-nkf
changeset 4361:34014c0fb2ce
[project @ 2003-03-02 03:12:08 by jwe]
| author | jwe |
|---|---|
| date | Sun, 02 Mar 2003 03:12:08 +0000 |
| parents | 1d7180ab9df1 |
| children | 0c69a845ef1a |
| files | ChangeLog Makeconf.in configure.in src/ChangeLog src/oct-conf.h.in src/oct-stdstrm.h |
| diffstat | 6 files changed, 28 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Mon Feb 24 02:57:24 2003 +0000 +++ b/ChangeLog Sun Mar 02 03:12:08 2003 +0000 @@ -1,3 +1,11 @@ +2003-03-01 John W. Eaton <jwe@bevo.che.wisc.edu> + + * configure.in (KPATHSEA_INCFLAGS): New variable. + * Makeconf.in (KPATHSEA_INCFLAGS): Substitute it. + (do-subst-config-vals): Add it to the list. + (INCFLAGS): Add $(KPATHSEA_INCFLAGS). + + 2003-02-23 Paul Kienzle <pkienzle@users.sf.net> * aclocal.m4 (OCTAVE_PLACEMENT_DELETE): New macro.
--- a/Makeconf.in Mon Feb 24 02:57:24 2003 +0000 +++ b/Makeconf.in Sun Mar 02 03:12:08 2003 +0000 @@ -85,6 +85,7 @@ DLFCN_INCFLAGS = @DLFCN_INCFLAGS@ GLOB_INCFLAGS = @GLOB_INCFLAGS@ +KPATHSEA_INCFLAGS = @KPATHSEA_INCFLAGS@ # Clean up INCFLAGS a bit if we are not compiling in a separate # directory. @@ -102,7 +103,8 @@ -I$(top_srcdir)/liboctave -I$(top_srcdir)/src \ -I$(top_srcdir)/libcruft/misc endif -INCFLAGS = $(TMP_IF_1) $(TMP_IF_2) $(DLFCN_INCFLAGS) $(GLOB_INCFLAGS) +INCFLAGS = $(TMP_IF_1) $(TMP_IF_2) $(DLFCN_INCFLAGS) \ + $(GLOB_INCFLAGS) $(KPATHSEA_INCFLAGS) LIBFLAGS = -L$(TOPDIR) @@ -402,6 +404,7 @@ -e "s;%OCTAVE_CONF_GLOB_INCFLAGS%;\"${GLOB_INCFLAGS}\";" \ -e "s;%OCTAVE_CONF_INCFLAGS%;\"${INCFLAGS}\";" \ -e "s;%OCTAVE_CONF_INCLUDE_LINK_DEPS%;\"${INCLUDE_LINK_DEPS}\";"\ + -e "s;%OCTAVE_CONF_KPATHSEA_INCFLAGS%;\"${KPATHSEA_INCFLAGS}\";" \ -e "s;%OCTAVE_CONF_LD_CXX%;\"${LD_CXX}\";" \ -e "s;%OCTAVE_CONF_LDFLAGS%;\"${LDFLAGS}\";" \ -e "s;%OCTAVE_CONF_LD_STATIC_FLAG%;\"${LD_STATIC_FLAG}\";" \
--- a/configure.in Mon Feb 24 02:57:24 2003 +0000 +++ b/configure.in Sun Mar 02 03:12:08 2003 +0000 @@ -22,7 +22,7 @@ ### 02111-1307, USA. AC_INIT -AC_REVISION($Revision: 1.418 $) +AC_REVISION($Revision: 1.419 $) AC_PREREQ(2.52) AC_CONFIG_SRCDIR([src/octave.cc]) AC_CONFIG_HEADER(config.h) @@ -139,6 +139,9 @@ ### Don't change the definition of LIBKPATHSEA without understanding ### the way it is used in liboctave/Makefile. +KPATHSEA_INCFLAGS='-I$(top_srcdir)/kpathsea -I$(TOPDIR)/kpathsea' +AC_SUBST(KPATHSEA_INCFLAGS) + LIBKPATHSEA='$(TOPDIR)/kpathsea/libkpathsea.$(LIBEXT)' AC_SUBST(LIBKPATHSEA)
--- a/src/ChangeLog Mon Feb 24 02:57:24 2003 +0000 +++ b/src/ChangeLog Sun Mar 02 03:12:08 2003 +0000 @@ -1,3 +1,10 @@ +2003-03-01 John W. Eaton <jwe@bevo.che.wisc.edu> + + * oct-conf.h.in: Substitute OCTAVE_CONF_KPATHSEA_INCFLAGS. + + * oct-stdstrm.h (octave_stdiostream::output_stream): Return stream + if mode is out, not in. + 2003-02-22 John W. Eaton <jwe@bevo.che.wisc.edu> * strfns.cc (Fchar): New function.
--- a/src/oct-conf.h.in Mon Feb 24 02:57:24 2003 +0000 +++ b/src/oct-conf.h.in Sun Mar 02 03:12:08 2003 +0000 @@ -148,6 +148,10 @@ #define OCTAVE_CONF_INCFLAGS %OCTAVE_CONF_INCFLAGS% #endif +#ifndef OCTAVE_CONF_KPATHSEA_INCFLAGS +#define OCTAVE_CONF_KPATHSEA_INCFLAGS %OCTAVE_CONF_KPATHSEA_INCFLAGS% +#endif + #ifndef OCTAVE_CONF_LDFLAGS #define OCTAVE_CONF_LDFLAGS %OCTAVE_CONF_LDFLAGS% #endif
--- a/src/oct-stdstrm.h Mon Feb 24 02:57:24 2003 +0000 +++ b/src/oct-stdstrm.h Sun Mar 02 03:12:08 2003 +0000 @@ -68,7 +68,7 @@ std::istream *input_stream (void) { return (md & std::ios::in) ? s : 0; } - std::ostream *output_stream (void) { return (md & std::ios::in) ? s : 0; } + std::ostream *output_stream (void) { return (md & std::ios::out) ? s : 0; } // XXX FIXME XXX -- should not have to cast away const here. c_file_ptr_buf *rdbuf (void) const