Mercurial > hg > octave-nkf
changeset 15882:b4fc49f82ac3
maint: merge snapshot changes
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Thu, 03 Jan 2013 01:57:47 -0500 |
parents | 20d506e155cf (current diff) 6be613476e37 (diff) |
children | fefd7c4a1309 |
files | configure.ac |
diffstat | 3 files changed, 10 insertions(+), 30 deletions(-) [+] |
line wrap: on
line diff
--- a/configure.ac +++ b/configure.ac @@ -516,20 +516,12 @@ AC_ARG_VAR([BUILD_EXEEXT], [build system executable extension (used if cross compiling)]) -dnl This is bogus. We shouldn't have to explicitly add libc too! -dnl Keep this check before the check for the Fortran compiler, -dnl in case -lm is needed to compile Fortran programs. ### Look for math library. If found, this will add -lm to LIBS. -case $host_os in - linux*) - AC_CHECK_LIB(m, sin, , , -lc) - ;; - *) - AC_CHECK_LIB(m, sin) - ;; -esac +dnl Keep this check before the check for the Fortran compiler, +dnl in case -lm is needed to compile Fortran programs. +AC_CHECK_LIB(m, sin) ### Determine the Fortran compiler and how to invoke it @@ -1428,9 +1420,7 @@ esac], [ENABLE_DYNAMIC_LINKING=true]) -if $STATIC_LIBS || $SHARED_LIBS; then - true -else +if ! $STATIC_LIBS && ! $SHARED_LIBS; then AC_MSG_ERROR([You can't disable building static AND shared libraries!]) fi @@ -1794,7 +1784,7 @@ ## Disable dynamic linking if capability is not present. if $dlopen_api || $shl_load_api || $loadlibrary_api || $dyld_api; then - true + : # some form of dynamic linking present else ENABLE_DYNAMIC_LINKING=false fi @@ -2012,21 +2002,11 @@ OCTAVE_CHECK_FUNC_CMATH(isinf) OCTAVE_CHECK_FUNC_CMATH(isfinite) -dnl Would like to get rid of this crap, and just have -dnl -dnl AC_CHECK_FUNCS([finite isnan isinf]) -dnl -dnl instead, but that used to fail on some systems... -dnl -dnl Also just using AC_CHECK_FUNCS doesn't seem to work to find isinf -dnl and isnan on Linux systems, so we use AC_CHECK_FUNC, and if that -dnl fails, we try again by including math.h and invoking the function -dnl with an argument. - -### I am told that Inf and NaN don't work on m68k HP sytems. +## Check for Inf and NaN functions case $canonical_host_type in m68k-hp-hpux*) + ## I am told that Inf and NaN don't work on m68k HP sytems. ;; *) AC_CHECK_FUNCS([finite isnan isinf signbit])
--- a/libinterp/octave-value/ov-cell.cc +++ b/libinterp/octave-value/ov-cell.cc @@ -1399,7 +1399,7 @@ s = struct (\"name\", @{\"Peter\", \"Hannah\", \"Robert\"@},\n\ \"age\", @{23, 16, 3@});\n\ c = struct2cell (s)\n\ - @result{} c = @{1x1x3 Cell Array@}\n\ + @result{} c = @{2x1x3 Cell Array@}\n\ c(1,1,:)(:)\n\ @result{}\n\ @{\n\
--- a/scripts/miscellaneous/orderfields.m +++ b/scripts/miscellaneous/orderfields.m @@ -48,7 +48,7 @@ ## @} ## @end group ## @group -## t = struct ("d", @{@}, "c", @{@}, "b", "a", @{@}); +## t = struct ("d", @{@}, "c", @{@}, "b", @{@}, "a", @{@}); ## t2 = orderfields (s, t) ## @result{} t2 = ## @{ @@ -59,7 +59,7 @@ ## @} ## @end group ## @group -## t3 = orderfields (s, [3, 2, 4, 1]); +## t3 = orderfields (s, [3, 2, 4, 1]) ## @result{} t3 = ## @{ ## a = 1