Mercurial > octave-nkf
changeset 4284:75ed329c117b
[project @ 2003-01-04 06:20:07 by jwe]
| author | jwe |
|---|---|
| date | Sat, 04 Jan 2003 06:20:07 +0000 |
| parents | 07c990a9edf5 |
| children | b20d6c838416 |
| files | ChangeLog configure.in src/ChangeLog src/sysdep.cc |
| diffstat | 4 files changed, 54 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sat Jan 04 05:24:55 2003 +0000 +++ b/ChangeLog Sat Jan 04 06:20:07 2003 +0000 @@ -1,8 +1,14 @@ +2003-01-04 John W. Eaton <jwe@bevo.che.wisc.edu> + + * configure.in (BUILD_CC, BUILD_CFLAGS, BUILD_CXX, + BUILD_CXXFLAGS): Kluge for Sun C/C++. + 2003-01-03 John W. Eaton <jwe@bevo.che.wisc.edu> * configure.in: Default value of BUILD_CXX is $CXX, not g++. (AH_BOTTOM): Define __USE_STD_IOSTREAM if using Compaq C++ compiler. For compiler/linker options, use -Wl,OPT instead of -Xlinker OPT. + Check for -ieee option for the C and C++ compilers on alpha systems. 2003-01-02 John W. Eaton <jwe@bevo.che.wisc.edu>
--- a/configure.in Sat Jan 04 05:24:55 2003 +0000 +++ b/configure.in Sat Jan 04 06:20:07 2003 +0000 @@ -22,7 +22,7 @@ ### 02111-1307, USA. AC_INIT -AC_REVISION($Revision: 1.405 $) +AC_REVISION($Revision: 1.406 $) AC_PREREQ(2.52) AC_CONFIG_SRCDIR([src/octave.cc]) AC_CONFIG_HEADER(config.h) @@ -267,15 +267,27 @@ AC_MSG_RESULT([adding -mieee-fp to XTRA_CXXFLAGS])]) ;; alpha*-*-*) - OCTAVE_CC_FLAG(-mieee-with-inexact, [ - ieee_fp_flag=-mieee-with-inexact - XTRA_CFLAGS="$XTRA_CFLAGS -mieee-with-inexact" - AC_MSG_RESULT([adding -mieee-with-inexact to XTRA_CFLAGS])]) + if test "$GCC" = yes; then + OCTAVE_CC_FLAG(-mieee-with-inexact, [ + ieee_fp_flag=-mieee-with-inexact + XTRA_CFLAGS="$XTRA_CFLAGS -mieee-with-inexact" + AC_MSG_RESULT([adding -mieee-with-inexact to XTRA_CFLAGS])]) - OCTAVE_CXX_FLAG(-mieee-with-inexact, [ - ieee_fp_flag=-mieee-with-inexact - XTRA_CXXFLAGS="$XTRA_CXXFLAGS -mieee-with-inexact" - AC_MSG_RESULT([adding -mieee-with-inexact to XTRA_CXXFLAGS])]) + OCTAVE_CXX_FLAG(-mieee-with-inexact, [ + ieee_fp_flag=-mieee-with-inexact + XTRA_CXXFLAGS="$XTRA_CXXFLAGS -mieee-with-inexact" + AC_MSG_RESULT([adding -mieee-with-inexact to XTRA_CXXFLAGS])]) + else + OCTAVE_CC_FLAG(-ieee, [ + ieee_fp_flag=-ieee + XTRA_CFLAGS="$XTRA_CFLAGS -ieee" + AC_MSG_RESULT([adding -ieee to XTRA_CFLAGS])]) + + OCTAVE_CXX_FLAG(-ieee, [ + ieee_fp_flag=-ieee + XTRA_CXXFLAGS="$XTRA_CXXFLAGS -ieee" + AC_MSG_RESULT([adding -ieee to XTRA_CXXFLAGS])]) + fi ;; *ibm-aix4*) OCTAVE_CC_FLAG(-mminimal-toc, [ @@ -334,6 +346,16 @@ BUILD_CFLAGS="-O2 -g" BUILD_CXX="$CXX" BUILD_CXXFLAGS="-O2 -g" + case "$canonical_host_type" in + sparc-sun-solaris2*) + if test "$GCC" != yes; then + BUILD_CC="$CC" -O1 + BUILD_CFLAGS="-g" + BUILD_CXX="$CXX" -O1 + BUILD_CXXFLAGS="-g" + fi + ;; + esac BUILD_EXEEXT="$EXEEXT" fi
--- a/src/ChangeLog Sat Jan 04 05:24:55 2003 +0000 +++ b/src/ChangeLog Sat Jan 04 06:20:07 2003 +0000 @@ -1,3 +1,8 @@ +2003-01-04 John W. Eaton <jwe@bevo.che.wisc.edu> + + * sysdep.cc [__DECCXX]: Add a kluge for some missing template + functions. + 2003-01-03 John W. Eaton <jwe@bevo.che.wisc.edu> * ov-usr-fcn.cc (octave_vr_val): Assert vr_list != 0, not vr_list.
--- a/src/sysdep.cc Sat Jan 04 05:24:55 2003 +0000 +++ b/src/sysdep.cc Sat Jan 04 06:20:07 2003 +0000 @@ -124,6 +124,18 @@ } #endif +#if defined (__DECCXX) + +// These don't seem to be instantiated automatically... + +template std::istream& +std::operator >> (std::istream&, std::complex<double>&); + +template std::string& +std::string::append (const std::string&, size_t, size_t); + +#endif + #if defined (NeXT) extern "C" {