# HG changeset patch # User jwe # Date 859349895 0 # Node ID 19c45d29f17776548fa30f1906955692691aab65 # Parent 10a8198b17338ef3eb706c7f6835492f71ba270f [project @ 1997-03-26 04:17:16 by jwe] diff --git a/ChangeLog b/ChangeLog --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Tue Mar 25 21:46:49 1997 John W. Eaton + + * aclocal.m4 (OCTAVE_CXXLIBS): Delete macro definition. + * configure.in, mkoctfile.in, Makeconf.in, octave-bug.in: + Delete use of OCTAVE_CXXIBS. + Thu Mar 13 11:44:46 1997 John W. Eaton * configure.in: Move extra checks for Fortran compiler above diff --git a/Makeconf.in b/Makeconf.in --- a/Makeconf.in +++ b/Makeconf.in @@ -121,8 +121,6 @@ FLIBS = @FLIBS@ -CXXLIBS = @CXXLIBS@ - TERMLIBS = @TERMLIBS@ LIBPLPLOT = @LIBPLPLOT@ LIBDLFCN = @LIBDLFCN@ @@ -325,7 +323,6 @@ -e "s;%LDFLAGS%;\"${LDFLAGS}\";" \ -e "s;%LIBFLAGS%;\"-L${libdir}\";" \ -e "s;%RLD_FLAG%;\"${RLD_FLAG}\";" \ - -e "s;%CXXLIBS%;\"${CXXLIBS}\";" \ -e "s;%TERMLIBS%;\"${TERMLIBS}\";" \ -e "s;%LIBS%;\"${LIBS}\";" \ -e "s;%LEXLIB%;\"${LEXLIB}\";" \ diff --git a/NEWS b/NEWS --- a/NEWS +++ b/NEWS @@ -15,6 +15,15 @@ Lapack subroutine for symmetric matrices for a significant increase in performance. + * Octave now has a logical data type. A true value is represented + by 1, and false value by 0. Comparison operations like <, <=, ==, + >, >=, and != now return logical values. Indexing operations that + use zero-one style indexing must now use logical values. You can + use the new function logical() to convert a numeric value to a + logical value. This avoids the need for the built-in variable + prefer_zero_one_indexing, so it has been removed. Logical values + are automatically converted to numeric values where appropriate. + Summary of changes for version 2.0.5: ------------------------------------ diff --git a/aclocal.m4 b/aclocal.m4 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -59,91 +59,6 @@ fi fi]) dnl -dnl -dnl See what libraries are used by the C++ compiler. Need this for -dnl dynamic linking. -dnl -dnl Write a minimal program and compile it with -v. I don't know what -dnl to do if your compiler doesn't have -v... -dnl -dnl OCTAVE_CXXLIBS() -AC_DEFUN(OCTAVE_CXXLIBS, -[AC_REQUIRE([AC_PROG_CXXCPP]) -AC_REQUIRE([AC_PROG_CXX]) -AC_MSG_CHECKING([for C++ libraries]) -AC_CACHE_VAL(octave_cv_cxxlibs, -[AC_LANG_SAVE -AC_LANG_CPLUSPLUS -XCXXFLAGS="$CXXFLAGS" -CXXFLAGS="$XCXXFLAGS -v" -export CXXFLAGS -dnl -dnl This may be too tricky and break with future autoconf releases, -dnl but it works with version 2.3, even with the Ultrix /bin/sh. -dnl -dnl I don't think that stripping commas out of this will ever hurt. -dnl -coutput=`( AC_TRY_LINK([], [], []) ) AC_FD_CC>&1 | sed 's/,/ /g'` -CXXFLAGS="$XCXXFLAGS" -AC_LANG_RESTORE -changequote(, )dnl -dnl -octave_cv_cxxlibs= -lflags= -want_arg= -dnl -for arg in $coutput; do - if test x$want_arg = x; then - want_arg= - case $arg in - /*.a) - exists=false - for f in $lflags; do - if test x$arg = x$f; then - exists=true - fi - done - if $exists; then - arg= - else - lflags="$lflags $arg" - fi - ;; - -[LR]*) - exists=false - for f in $lflags; do - if test x$arg = x$f; then - exists=true - fi - done - ;; - -l*) - if test x$arg = x-lang-c++; then - arg= - else - lflags="$lflags $arg" - fi - ;; - -u) - want_arg=$arg - ;; - *) - arg= - ;; - esac - else - want_arg= - fi - if test x$arg != x; then - octave_cv_cxxlibs="$octave_cv_cxxlibs $arg" - fi -done -dnl -changequote([, ])]) -AC_MSG_RESULT([$octave_cv_cxxlibs]) -CXXLIBS="$octave_cv_cxxlibs" -AC_SUBST(CXXLIBS)]) -dnl dnl See what libraries are used by the Fortran compiler. dnl dnl Write a minimal program and compile it with -v. I don't know what diff --git a/configure.in b/configure.in --- 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.261 $) +AC_REVISION($Revision: 1.262 $) AC_PREREQ(2.9) AC_INIT(src/octave.cc) AC_CONFIG_HEADER(config.h) @@ -662,10 +662,6 @@ AC_ALLOCA AC_C_CONST -### Get the list of libraries that the C++ compiler normally uses. - -OCTAVE_CXXLIBS - ### See if we should define NPOS. OCTAVE_STRING_NPOS diff --git a/doc/interpreter/basics.texi b/doc/interpreter/basics.texi --- a/doc/interpreter/basics.texi +++ b/doc/interpreter/basics.texi @@ -160,7 +160,6 @@ ok_to_lose_imaginary_part = 1 page_screen_output = 0 prefer_column_vectors = 0 -prefer_zero_one_indexing = 1 print_empty_dimensions = 0 treat_neg_dim_as_zero = 1 warn_function_name_clash = 0 diff --git a/doc/interpreter/var.texi b/doc/interpreter/var.texi --- a/doc/interpreter/var.texi +++ b/doc/interpreter/var.texi @@ -423,11 +423,6 @@ Default value: 0. -@item prefer_zero_one_indexing -@xref{Index Expressions}. - -Default value: 0. - @item print_answer_id_name @xref{Terminal Output}. diff --git a/mkoctfile.in b/mkoctfile.in --- a/mkoctfile.in +++ b/mkoctfile.in @@ -33,7 +33,6 @@ FLIBS=%FLIBS% LIBS=%LIBS% LEXLIB=%LEXLIB% -CXXLIBS=%CXXLIBS% TERMLIBS=%TERMLIBS% LIBPLPLOT=%LIBPLPLOT% LIBDLFCN=%LIBDLFCN% diff --git a/octave-bug.in b/octave-bug.in --- a/octave-bug.in +++ b/octave-bug.in @@ -35,7 +35,6 @@ LDFLAGS=%LDFLAGS% LIBFLAGS=%LIBFLAGS% RLD_FLAG=%RLD_FLAG% -CXXLIBS=%CXXLIBS% TERMLIBS=%TERMLIBS% LIBS=%LIBS% LEXLIB=%LEXLIB% @@ -172,7 +171,6 @@ LDFLAGS: $LDFLAGS LIBFLAGS: $LIBFLAGS RLD_FLAG: $RLD_FLAG -CXXLIBS: $CXXLIBS TERMLIBS: $TERMLIBS LIBS: $LIBS LEXLIB: $LEXLIB diff --git a/scripts/ChangeLog b/scripts/ChangeLog --- a/scripts/ChangeLog +++ b/scripts/ChangeLog @@ -1,3 +1,8 @@ +Tue Mar 25 22:00:49 1997 John W. Eaton + + * miscellaneous/bug_report.m: Use __OCTAVE_HOME__ to find + octave-bug script. + Mon Mar 24 16:49:47 1997 John W. Eaton * miscellaneous/dump_prefs.m: Delete call to dump_1_pref for diff --git a/scripts/miscellaneous/bug_report.m b/scripts/miscellaneous/bug_report.m --- a/scripts/miscellaneous/bug_report.m +++ b/scripts/miscellaneous/bug_report.m @@ -50,7 +50,7 @@ cmd = "octave-bug"; if (length (subject) > 0) - cmd = sprintf ("%s -s \"%s\"", cmd, subject); + cmd = sprintf ("%s/bin/%s -s \"%s\"", __OCTAVE_HOME__, cmd, subject); endif if (! isempty (prefs)) diff --git a/src/ChangeLog b/src/ChangeLog --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,10 @@ Tue Mar 25 17:17:17 1997 John W. Eaton + * defaults.cc (symbols_of_defaults): DEFCONST OCTAVE_HOME. + + * toplev.cc (octave_config_info): Delete use of CXXLIBS. + * oct-conf.h.in: Ditto. + * octave.cc (maximum_braindamage): Don't bind prefer_zero_one_indexing. * ov.h: Don't declare Vprefer_zero_one_indexing. * ov.cc: Don't define Vprefer_zero_one_indexing. diff --git a/src/defaults.cc b/src/defaults.cc --- a/src/defaults.cc +++ b/src/defaults.cc @@ -435,6 +435,9 @@ DEFVAR (IMAGEPATH, OCTAVE_IMAGEPATH, 0, imagepath, "colon separated list of directories to search for image files"); + DEFCONST (OCTAVE_HOME, Voctave_home, 0, 0, + "top-level Octave installation directory"); + DEFCONSTX ("OCTAVE_VERSION", SBV_OCTAVE_VERSION, OCTAVE_VERSION, 0, 0, "Octave version"); } diff --git a/src/oct-conf.h.in b/src/oct-conf.h.in --- a/src/oct-conf.h.in +++ b/src/oct-conf.h.in @@ -108,10 +108,6 @@ #define RLD_FLAG %RLD_FLAG% #endif -#ifndef CXXLIBS -#define CXXLIBS %CXXLIBS% -#endif - #ifndef TERMLIBS #define TERMLIBS %TERMLIBS% #endif diff --git a/src/toplev.cc b/src/toplev.cc --- a/src/toplev.cc +++ b/src/toplev.cc @@ -906,7 +906,6 @@ m ["LDFLAGS"] = LDFLAGS; m ["LIBFLAGS"] = LIBFLAGS; m ["RLD_FLAG"] = RLD_FLAG; - m ["CXXLIBS"] = CXXLIBS; m ["TERMLIBS"] = TERMLIBS; m ["LIBS"] = LIBS; m ["LEXLIB"] = LEXLIB;