#! /bin/sh # # To apply this patch, cd to the top level Octave source directory and # run this file through /bin/sh. It will first remove any files that # have been deleted from the source distribution since the last # release and then update the sources with patch(1). # # Diffs for updating *.ps, *.dvi, *.info*, and *.html files are not # included because they can be recreated from the Texinfo files using # TeX, makeinfo, or texi2html. # # Diffs for updating parse.cc and y.tab.h are not included because # they can be recreated from the file parse.y using bison. # # Diffs for updating lex.cc are not included because it can be # recreated from lex.l using flex. # # John W. Eaton # jwe@bevo.che.wisc.edu # University of Wisconsin-Madison # Department of Chemical Engineering if test -f src/octave.cc ; then true else echo '***********************************************************' 1>&2 echo 'You must run this script in the top-level octave directory!' 1>&2 echo '***********************************************************' 1>&2 exit 1 fi ### ### Special commands should go here. ### echo 'patching existing files' patch -p1 << \PATCH_EOF diff -cNr octave-2.0.14/ChangeLog octave-2.0.15/ChangeLog *** octave-2.0.14/ChangeLog Wed Apr 14 12:55:58 1999 --- octave-2.0.15/ChangeLog Mon Jan 10 18:03:57 2000 *************** *** 1,3 **** --- 1,67 ---- + 2000-01-10 John W. Eaton + + * Version 2.0.15 released. + + 1999-11-15 John W. Eaton + + * configure.in (XTRA_CXXFLAGS, XTRA_CFLAGS): Use -mminimal-toc on + AIX systems. + + 1999-10-26 John W. Eaton + + * emacs/README: New file. + * emacs/Makefile.in (DISTFILES, BINDISTFILES): Add it to the lists. + + * emacs/Makefile.in: Don't distribute .elc files. + + 1999-10-21 John W. Eaton + + * configure.in: Check for select and poll. Also check for poll.h + and sys/poll.h. + + Mon Sep 20 11:02:29 1999 John W. Eaton + + * emacs/octave-inf.el, emacs/octave-mod.el: Update to match FSF + sources plus code that will make it work if Emacs doesn't have the + customize code. + + Tue Sep 14 07:57:06 1999 Kurt Hornik + + * emacs/octave-inf.el (inferior-octave-startup): Always pass "-i" + and "--no-line-editing" to Octave subprocess. + (inferior-octave-startup-args): Default to nil. + + Mon Sep 6 10:50:10 1999 John W. Eaton + + * emacs/octave-inf.el (inferior-octave-startup-args): + Add --no-line-editing to the list. + + Fri Jul 9 09:15:24 1999 John W. Eaton + + * configure.in: Try to handle IEEE FP flags for g77 on Alphas. + + Thu Jul 8 19:56:37 1999 Stephen Eglen + + * emacs/octave-inf.el (inferior-octave-directory-tracker): + Change regexp so that it doesn't match commands beginning with `cd'. + + Wed Jun 23 13:20:11 1999 Mumit Khan + + * configure.in (HAVE_TERMIOS_H): Avoid autoheader lossage. + + Sun Jun 20 23:05:18 1999 John W. Eaton + + * configure.in: Check for sys/ioctl.h. + + Thu May 27 21:47:26 1999 John W. Eaton + + * readline/histfile.c [__CYGWIN__]: Define O_BINARY if not already + defined. + + Mon May 10 09:06:47 1999 John W. Eaton + + * aclocal.m4 (OCTAVE_PROG_G77): Also match "FSF-g77", for egcs. + Wed Apr 14 12:55:42 1999 John W. Eaton * Version 2.0.14 released. diff -cNr octave-2.0.14/FLEX.patch octave-2.0.15/FLEX.patch *** octave-2.0.14/FLEX.patch Wed Dec 31 18:00:00 1969 --- octave-2.0.15/FLEX.patch Tue Nov 24 23:10:45 1998 *************** *** 0 **** --- 1,16 ---- + *** flex.skl~ Tue Sep 10 18:58:54 1996 + --- flex.skl Tue Nov 24 23:10:34 1998 + *************** + *** 1179,1185 **** + --- 1179,1189 ---- + %- + #ifndef YY_ALWAYS_INTERACTIVE + #ifndef YY_NEVER_INTERACTIVE + + #ifdef __cplusplus + + extern "C" int isatty YY_PROTO(( int )); + + #else + extern int isatty YY_PROTO(( int )); + + #endif + #endif + #endif + diff -cNr octave-2.0.14/Makefile octave-2.0.15/Makefile *** octave-2.0.14/Makefile Fri Jan 22 21:50:10 1999 --- octave-2.0.15/Makefile Mon Jan 10 18:10:44 2000 *************** *** 7,12 **** --- 7,16 ---- # University of Wisconsin-Madison # Department of Chemical Engineering + INSTALL = /usr/bin/install -c + INSTALL_PROGRAM = ${INSTALL} + INSTALL_DATA = ${INSTALL} -m 644 + TARGETS = octave-bug mkoctfile libcruft liboctave kpathsea dlfcn \ readline src scripts doc check octave.info INSTALL.OCTAVE BUGS \ install uninstall tags TAGS dist conf-dist snapshot snapshot-version *************** *** 23,29 **** $(MAKE) -f octMakefile omit_deps=true $@ install-strip: ! $(MAKE) -f octMakefile INSTALL_PROGRAM='${INSTALL} -s' install binary-dist: FORCE @if test -f configure && test -f octMakefile.in ; then \ --- 27,34 ---- $(MAKE) -f octMakefile omit_deps=true $@ install-strip: ! $(MAKE) -f octMakefile \ ! INSTALL_PROGRAM='${INSTALL} -s' INSTALL_SCRIPT='${INSTALL}' install binary-dist: FORCE @if test -f configure && test -f octMakefile.in ; then \ diff -cNr octave-2.0.14/NEWS octave-2.0.15/NEWS *** octave-2.0.14/NEWS Tue Nov 17 23:50:12 1998 --- octave-2.0.15/NEWS Mon Jan 10 18:07:33 2000 *************** *** 1,3 **** --- 1,27 ---- + Summary of changes for version 2.0.15: + ------------------------------------- + + This is primarily a bug-fixing release. + + * If you are using GNU Emacs 19.34 or earlier, you will need to add + the following code to your ~/.emacs file in order to use Emacs + Octave mode: + + ;; Set up the custom library. + ;; taken from http://www.dina.kvl.dk/~abraham/custom/ + (eval-and-compile + (condition-case () + (require 'custom) + (error nil)) + (if (and (featurep 'custom) (fboundp 'custom-declare-variable)) + nil ;; We've got what we needed + ;; We have the old custom-library, hack around it! + (defmacro defgroup (&rest args) + nil) + (defmacro defcustom (var value doc &rest args) + (` (defvar (, var) (, value) (, doc)))))) + + Summary of changes for version 2.0.14: ------------------------------------- diff -cNr octave-2.0.14/README octave-2.0.15/README *** octave-2.0.14/README Thu May 21 13:12:57 1998 --- octave-2.0.15/README Wed Oct 13 17:05:44 1999 *************** *** 28,34 **** anonymous ftp from ftp.che.wisc.edu in the directory /pub/octave. Complete source and binaries for several popular systems are available. Source distributions of Octave are also available from ! prep.ai.mit.edu in the directory /pub/gnu, as well as many mirror sites around the world. Installation and Bugs --- 28,34 ---- anonymous ftp from ftp.che.wisc.edu in the directory /pub/octave. Complete source and binaries for several popular systems are available. Source distributions of Octave are also available from ! ftp.gnu.org in the directory /pub/gnu, as well as many mirror sites around the world. Installation and Bugs *************** *** 84,90 **** may also be possible to install it using other implementations of these tools, but it will most certainly require much more work. Do yourself a favor and get the GNU development tools, either via ! anonymous ftp from prep.ai.mit.edu or by writing the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. The underlying numerical solvers are currently standard Fortran ones --- 84,90 ---- may also be possible to install it using other implementations of these tools, but it will most certainly require much more work. Do yourself a favor and get the GNU development tools, either via ! anonymous ftp from ftp.gnu.org or by writing the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. The underlying numerical solvers are currently standard Fortran ones diff -cNr octave-2.0.14/aclocal.m4 octave-2.0.15/aclocal.m4 *** octave-2.0.14/aclocal.m4 Wed Dec 9 14:24:17 1998 --- octave-2.0.15/aclocal.m4 Mon May 10 09:07:25 1999 *************** *** 81,87 **** octave_cv_f77_is_g77=yes else echo " END" > conftest.f ! foutput=`${F77-f77} -v conftest.f 2>&1 | grep "GNU F77"` if test -n "$foutput"; then octave_cv_f77_is_g77=yes else --- 81,87 ---- octave_cv_f77_is_g77=yes else echo " END" > conftest.f ! foutput=`${F77-f77} -v conftest.f 2>&1 | egrep "GNU F77|FSF-g77"` if test -n "$foutput"; then octave_cv_f77_is_g77=yes else diff -cNr octave-2.0.14/config.h.in octave-2.0.15/config.h.in *** octave-2.0.14/config.h.in Tue Nov 24 23:59:35 1998 --- octave-2.0.15/config.h.in Wed Nov 3 21:25:41 1999 *************** *** 373,378 **** --- 373,381 ---- /* Define if you have the rmdir function. */ #undef HAVE_RMDIR + /* Define if you have the select function. */ + #undef HAVE_SELECT + /* Define if you have the setgrent function. */ #undef HAVE_SETGRENT *************** *** 496,501 **** --- 499,507 ---- /* Define if you have the header file. */ #undef HAVE_NDIR_H + /* Define if you have the header file. */ + #undef HAVE_POLL_H + /* Define if you have the header file. */ #undef HAVE_PWD_H *************** *** 511,522 **** --- 517,534 ---- /* Define if you have the header file. */ #undef HAVE_SYS_DIR_H + /* Define if you have the header file. */ + #undef HAVE_SYS_IOCTL_H + /* Define if you have the header file. */ #undef HAVE_SYS_NDIR_H /* Define if you have the header file. */ #undef HAVE_SYS_PARAM_H + /* Define if you have the header file. */ + #undef HAVE_SYS_POLL_H + /* Define if you have the header file. */ #undef HAVE_SYS_RESOURCE_H *************** *** 543,548 **** --- 555,563 ---- /* Define if you have the header file. */ #undef HAVE_TERMIO_H + + /* Define if you have the header file. */ + #undef HAVE_TERMIOS_H /* Define if you have the header file. */ #undef HAVE_UNISTD_H diff -cNr octave-2.0.14/configure octave-2.0.15/configure *** octave-2.0.14/configure Wed Apr 14 12:58:06 1999 --- octave-2.0.15/configure Mon Jan 10 18:10:21 2000 *************** *** 26,32 **** # Guess values for system-dependent variables and create Makefiles. ! # Generated automatically using autoconf version 2.13 # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. # # This configure script is free software; the Free Software Foundation --- 26,32 ---- # Guess values for system-dependent variables and create Makefiles. ! # Generated automatically using autoconf version 2.12 # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. # # This configure script is free software; the Free Software Foundation *************** *** 94,100 **** # Initialize some other variables. subdirs= MFLAGS= MAKEFLAGS= - SHELL=${CONFIG_SHELL-/bin/sh} # Maximum number of lines to put in a shell here document. ac_max_here_lines=12 --- 94,99 ---- *************** *** 378,384 **** verbose=yes ;; -version | --version | --versio | --versi | --vers) ! echo "configure generated by autoconf version 2.13" exit 0 ;; -with-* | --with-*) --- 377,383 ---- verbose=yes ;; -version | --version | --versio | --versi | --vers) ! echo "configure generated by autoconf version 2.12" exit 0 ;; -with-* | --with-*) *************** *** 548,558 **** # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' ! ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_cc_cross - ac_exeext= - ac_objext=o if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu. if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then --- 547,555 ---- # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' ! ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_cc_cross if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu. if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then *************** *** 594,619 **** # Make sure we can run config.sub. ! if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then : else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } fi echo $ac_n "checking host system type""... $ac_c" 1>&6 ! echo "configure:603: checking host system type" >&5 host_alias=$host case "$host_alias" in NONE) case $nonopt in NONE) ! if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then : else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; } fi ;; *) host_alias=$nonopt ;; esac ;; esac ! host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias` host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` --- 591,616 ---- # Make sure we can run config.sub. ! if $ac_config_sub sun4 >/dev/null 2>&1; then : else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } fi echo $ac_n "checking host system type""... $ac_c" 1>&6 ! echo "configure:600: checking host system type" >&5 host_alias=$host case "$host_alias" in NONE) case $nonopt in NONE) ! if host_alias=`$ac_config_guess`; then : else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; } fi ;; *) host_alias=$nonopt ;; esac ;; esac ! host=`$ac_config_sub $host_alias` host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` *************** *** 824,844 **** EXTERN_CXXFLAGS="$CXXFLAGS" ! for ac_prog in $CCC c++ g++ gcc CC cxx cc++ cl do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ! echo "configure:833: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$CXX"; then ac_cv_prog_CXX="$CXX" # Let the user override the test. else ! IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" ! ac_dummy="$PATH" ! for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then ac_cv_prog_CXX="$ac_prog" --- 821,840 ---- EXTERN_CXXFLAGS="$CXXFLAGS" ! for ac_prog in $CCC c++ g++ gcc CC cxx cc++ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ! echo "configure:830: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$CXX"; then ac_cv_prog_CXX="$CXX" # Let the user override the test. else ! IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" ! for ac_dir in $PATH; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then ac_cv_prog_CXX="$ac_prog" *************** *** 861,883 **** echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 ! echo "configure:865: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' ! ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_cxx_cross ! cat > conftest.$ac_ext << EOF ! ! #line 876 "configure" #include "confdefs.h" ! ! int main(){return(0);} EOF ! if { (eval echo configure:881: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cxx_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then --- 857,877 ---- echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 ! echo "configure:861: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' ! ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_cxx_cross ! cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then ac_cv_prog_cxx_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then *************** *** 895,901 **** # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' ! ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_cc_cross echo "$ac_t""$ac_cv_prog_cxx_works" 1>&6 --- 889,895 ---- # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' ! ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_cc_cross echo "$ac_t""$ac_cv_prog_cxx_works" 1>&6 *************** *** 903,914 **** { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 ! echo "configure:907: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6 cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 ! echo "configure:912: checking whether we are using GNU C++" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else --- 897,908 ---- { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 ! echo "configure:901: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6 cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 ! echo "configure:906: checking whether we are using GNU C++" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else *************** *** 917,923 **** yes; #endif EOF ! if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:921: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gxx=yes else ac_cv_prog_gxx=no --- 911,917 ---- yes; #endif EOF ! if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:915: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gxx=yes else ac_cv_prog_gxx=no *************** *** 928,942 **** if test $ac_cv_prog_gxx = yes; then GXX=yes ! else ! GXX= ! fi ! ! ac_test_CXXFLAGS="${CXXFLAGS+set}" ! ac_save_CXXFLAGS="$CXXFLAGS" ! CXXFLAGS= ! echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 ! echo "configure:940: checking whether ${CXX-g++} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else --- 922,932 ---- if test $ac_cv_prog_gxx = yes; then GXX=yes ! ac_test_CXXFLAGS="${CXXFLAGS+set}" ! ac_save_CXXFLAGS="$CXXFLAGS" ! CXXFLAGS= ! echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 ! echo "configure:930: checking whether ${CXX-g++} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else *************** *** 951,974 **** fi echo "$ac_t""$ac_cv_prog_cxx_g" 1>&6 ! if test "$ac_test_CXXFLAGS" = set; then ! CXXFLAGS="$ac_save_CXXFLAGS" ! elif test $ac_cv_prog_cxx_g = yes; then ! if test "$GXX" = yes; then CXXFLAGS="-g -O2" else - CXXFLAGS="-g" - fi - else - if test "$GXX" = yes; then CXXFLAGS="-O2" - else - CXXFLAGS= fi fi echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6 ! echo "configure:972: checking how to run the C++ preprocessor" >&5 if test -z "$CXXCPP"; then if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 --- 941,960 ---- fi echo "$ac_t""$ac_cv_prog_cxx_g" 1>&6 ! if test "$ac_test_CXXFLAGS" = set; then ! CXXFLAGS="$ac_save_CXXFLAGS" ! elif test $ac_cv_prog_cxx_g = yes; then CXXFLAGS="-g -O2" else CXXFLAGS="-O2" fi + else + GXX= + test "${CXXFLAGS+set}" = set || CXXFLAGS="-g" fi echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6 ! echo "configure:958: checking how to run the C++ preprocessor" >&5 if test -z "$CXXCPP"; then if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 *************** *** 977,993 **** # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' ! ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_cxx_cross CXXCPP="${CXX-g++} -E" cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo configure:990: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ! ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : else --- 963,979 ---- # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' ! ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_cxx_cross CXXCPP="${CXX-g++} -E" cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo configure:976: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ! ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : else *************** *** 1003,1009 **** # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' ! ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_cc_cross fi fi --- 989,995 ---- # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' ! ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_cc_cross fi fi *************** *** 1031,1037 **** echo $ac_n "checking for C++ support for new friend template declaration""... $ac_c" 1>&6 ! echo "configure:1035: checking for C++ support for new friend template declaration" >&5 if eval "test \"`echo '$''{'octave_cv_cxx_new_friend_template_decl'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else --- 1017,1023 ---- echo $ac_n "checking for C++ support for new friend template declaration""... $ac_c" 1>&6 ! echo "configure:1021: checking for C++ support for new friend template declaration" >&5 if eval "test \"`echo '$''{'octave_cv_cxx_new_friend_template_decl'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else *************** *** 1041,1047 **** # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' ! ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_cxx_cross rm -f conftest.h --- 1027,1033 ---- # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' ! ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_cxx_cross rm -f conftest.h *************** *** 1058,1064 **** } EOB cat > conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* octave_cv_cxx_new_friend_template_decl=no else --- 1054,1060 ---- ; return 0; } EOF ! if { (eval echo configure:1058: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* octave_cv_cxx_new_friend_template_decl=no else *************** *** 1083,1089 **** # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' ! ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_cc_cross --- 1069,1075 ---- # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' ! ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_cc_cross *************** *** 1105,1120 **** # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ! echo "configure:1109: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else ! IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" ! ac_dummy="$PATH" ! for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then ac_cv_prog_CC="gcc" --- 1091,1105 ---- # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ! echo "configure:1095: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else ! IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" ! for ac_dir in $PATH; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then ac_cv_prog_CC="gcc" *************** *** 1135,1151 **** # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ! echo "configure:1139: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else ! IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" ac_prog_rejected=no ! ac_dummy="$PATH" ! for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then --- 1120,1135 ---- # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ! echo "configure:1124: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else ! IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" ac_prog_rejected=no ! for ac_dir in $PATH; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then *************** *** 1180,1240 **** echo "$ac_t""no" 1>&6 fi - if test -z "$CC"; then - case "`uname -s`" in - *win32* | *WIN32*) - # Extract the first word of "cl", so it can be a program name with args. - set dummy cl; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 - echo "configure:1190: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. - else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_CC="cl" - break - fi - done - IFS="$ac_save_ifs" - fi - fi - CC="$ac_cv_prog_CC" - if test -n "$CC"; then - echo "$ac_t""$CC" 1>&6 - else - echo "$ac_t""no" 1>&6 - fi - ;; - esac - fi test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 ! echo "configure:1222: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' ! ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_cc_cross ! cat > conftest.$ac_ext << EOF ! ! #line 1233 "configure" #include "confdefs.h" - main(){return(0);} EOF ! if { (eval echo configure:1238: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then --- 1164,1188 ---- echo "$ac_t""no" 1>&6 fi test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 ! echo "configure:1172: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' ! ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_cc_cross ! cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then *************** *** 1248,1271 **** ac_cv_prog_cc_works=no fi rm -fr conftest* - ac_ext=c - # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. - ac_cpp='$CPP $CPPFLAGS' - ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' - ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' - cross_compiling=$ac_cv_prog_cc_cross echo "$ac_t""$ac_cv_prog_cc_works" 1>&6 if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 ! echo "configure:1264: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 ! echo "configure:1269: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else --- 1196,1213 ---- ac_cv_prog_cc_works=no fi rm -fr conftest* echo "$ac_t""$ac_cv_prog_cc_works" 1>&6 if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 ! echo "configure:1206: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 ! echo "configure:1211: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else *************** *** 1274,1280 **** yes; #endif EOF ! if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1278: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no --- 1216,1222 ---- yes; #endif EOF ! if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1220: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no *************** *** 1285,1299 **** if test $ac_cv_prog_gcc = yes; then GCC=yes ! else ! GCC= ! fi ! ! ac_test_CFLAGS="${CFLAGS+set}" ! ac_save_CFLAGS="$CFLAGS" ! CFLAGS= ! echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 ! echo "configure:1297: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else --- 1227,1237 ---- if test $ac_cv_prog_gcc = yes; then GCC=yes ! ac_test_CFLAGS="${CFLAGS+set}" ! ac_save_CFLAGS="$CFLAGS" ! CFLAGS= ! echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 ! echo "configure:1235: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else *************** *** 1308,1331 **** fi echo "$ac_t""$ac_cv_prog_cc_g" 1>&6 ! if test "$ac_test_CFLAGS" = set; then ! CFLAGS="$ac_save_CFLAGS" ! elif test $ac_cv_prog_cc_g = yes; then ! if test "$GCC" = yes; then CFLAGS="-g -O2" else - CFLAGS="-g" - fi - else - if test "$GCC" = yes; then CFLAGS="-O2" - else - CFLAGS= fi fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 ! echo "configure:1329: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= --- 1246,1265 ---- fi echo "$ac_t""$ac_cv_prog_cc_g" 1>&6 ! if test "$ac_test_CFLAGS" = set; then ! CFLAGS="$ac_save_CFLAGS" ! elif test $ac_cv_prog_cc_g = yes; then CFLAGS="-g -O2" else CFLAGS="-O2" fi + else + GCC= + test "${CFLAGS+set}" = set || CFLAGS="-g" fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 ! echo "configure:1263: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= *************** *** 1340,1353 **** # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo configure:1350: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ! ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : else --- 1274,1287 ---- # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo configure:1284: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ! ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : else *************** *** 1357,1387 **** rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo configure:1367: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ! ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ! if test -z "$ac_err"; then ! : ! else ! echo "$ac_err" >&5 ! echo "configure: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ! rm -rf conftest* ! CPP="${CC-cc} -nologo -E" ! cat > conftest.$ac_ext < ! Syntax Error ! EOF ! ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo configure:1384: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ! ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : else --- 1291,1304 ---- rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo configure:1301: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ! ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : else *************** *** 1394,1401 **** rm -f conftest* fi rm -f conftest* - fi - rm -f conftest* ac_cv_prog_CPP="$CPP" fi CPP="$ac_cv_prog_CPP" --- 1311,1316 ---- *************** *** 1406,1418 **** if test $ac_cv_prog_gcc = yes; then echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6 ! echo "configure:1410: checking whether ${CC-cc} needs -traditional" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_pattern="Autoconf.*'x'" cat > conftest.$ac_ext < Autoconf TIOCGETP --- 1321,1333 ---- if test $ac_cv_prog_gcc = yes; then echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6 ! echo "configure:1325: checking whether ${CC-cc} needs -traditional" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_pattern="Autoconf.*'x'" cat > conftest.$ac_ext < Autoconf TIOCGETP *************** *** 1430,1436 **** if test $ac_cv_prog_gcc_traditional = no; then cat > conftest.$ac_ext < Autoconf TCGETA --- 1345,1351 ---- if test $ac_cv_prog_gcc_traditional = no; then cat > conftest.$ac_ext < Autoconf TCGETA *************** *** 1490,1496 **** ac_safe=`echo "-mieee-fp" | sed 'y%./+-%__p_%'` echo $ac_n "checking whether ${CC-cc} accepts -mieee-fp""... $ac_c" 1>&6 ! echo "configure:1494: checking whether ${CC-cc} accepts -mieee-fp" >&5 if eval "test \"`echo '$''{'octave_cv_cc_flag_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else --- 1405,1411 ---- ac_safe=`echo "-mieee-fp" | sed 'y%./+-%__p_%'` echo $ac_n "checking whether ${CC-cc} accepts -mieee-fp""... $ac_c" 1>&6 ! echo "configure:1409: checking whether ${CC-cc} accepts -mieee-fp" >&5 if eval "test \"`echo '$''{'octave_cv_cc_flag_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else *************** *** 1500,1519 **** # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' ! ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_cc_cross XCFLAGS="$CFLAGS" CFLAGS="$CFLAGS -mieee-fp" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "octave_cv_cc_flag_$ac_safe=yes" else --- 1415,1434 ---- # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' ! ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_cc_cross XCFLAGS="$CFLAGS" CFLAGS="$CFLAGS -mieee-fp" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "octave_cv_cc_flag_$ac_safe=yes" else *************** *** 1524,1536 **** fi rm -f conftest* CFLAGS="$XCFLAGS" ! ac_ext=c ! # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ! ac_cpp='$CPP $CPPFLAGS' ! ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' ! ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' ! cross_compiling=$ac_cv_prog_cc_cross ! fi --- 1439,1445 ---- fi rm -f conftest* CFLAGS="$XCFLAGS" ! fi *************** *** 1544,1554 **** fi - ac_safe=`echo "-mieee-fp" | sed 'y%./+-%__p_%'` echo $ac_n "checking whether ${CXX-c++} accepts -mieee-fp""... $ac_c" 1>&6 ! echo "configure:1552: checking whether ${CXX-c++} accepts -mieee-fp" >&5 if eval "test \"`echo '$''{'octave_cv_cxx_flag_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else --- 1453,1462 ---- fi ac_safe=`echo "-mieee-fp" | sed 'y%./+-%__p_%'` echo $ac_n "checking whether ${CXX-c++} accepts -mieee-fp""... $ac_c" 1>&6 ! echo "configure:1460: checking whether ${CXX-c++} accepts -mieee-fp" >&5 if eval "test \"`echo '$''{'octave_cv_cxx_flag_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else *************** *** 1558,1577 **** # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' ! ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_cxx_cross XCXXFLAGS="$CXXFLAGS" CXXFLAGS="$CXXFLAGS -mieee-fp" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "octave_cv_cxx_flag_$ac_safe=yes" else --- 1466,1485 ---- # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' ! ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_cxx_cross XCXXFLAGS="$CXXFLAGS" CXXFLAGS="$CXXFLAGS -mieee-fp" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "octave_cv_cxx_flag_$ac_safe=yes" else *************** *** 1586,1592 **** # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' ! ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_cc_cross --- 1494,1500 ---- # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' ! ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_cc_cross *************** *** 1607,1613 **** ac_safe=`echo "-mieee-with-inexact" | sed 'y%./+-%__p_%'` echo $ac_n "checking whether ${CC-cc} accepts -mieee-with-inexact""... $ac_c" 1>&6 ! echo "configure:1611: checking whether ${CC-cc} accepts -mieee-with-inexact" >&5 if eval "test \"`echo '$''{'octave_cv_cc_flag_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else --- 1515,1521 ---- ac_safe=`echo "-mieee-with-inexact" | sed 'y%./+-%__p_%'` echo $ac_n "checking whether ${CC-cc} accepts -mieee-with-inexact""... $ac_c" 1>&6 ! echo "configure:1519: checking whether ${CC-cc} accepts -mieee-with-inexact" >&5 if eval "test \"`echo '$''{'octave_cv_cc_flag_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else *************** *** 1617,1636 **** # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' ! ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_cc_cross XCFLAGS="$CFLAGS" CFLAGS="$CFLAGS -mieee-with-inexact" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "octave_cv_cc_flag_$ac_safe=yes" else --- 1525,1544 ---- # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' ! ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_cc_cross XCFLAGS="$CFLAGS" CFLAGS="$CFLAGS -mieee-with-inexact" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "octave_cv_cc_flag_$ac_safe=yes" else *************** *** 1641,1653 **** fi rm -f conftest* CFLAGS="$XCFLAGS" ! ac_ext=c ! # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ! ac_cpp='$CPP $CPPFLAGS' ! ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' ! ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' ! cross_compiling=$ac_cv_prog_cc_cross ! fi --- 1549,1555 ---- fi rm -f conftest* CFLAGS="$XCFLAGS" ! fi *************** *** 1664,1670 **** ac_safe=`echo "-mieee-with-inexact" | sed 'y%./+-%__p_%'` echo $ac_n "checking whether ${CXX-c++} accepts -mieee-with-inexact""... $ac_c" 1>&6 ! echo "configure:1668: checking whether ${CXX-c++} accepts -mieee-with-inexact" >&5 if eval "test \"`echo '$''{'octave_cv_cxx_flag_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else --- 1566,1572 ---- ac_safe=`echo "-mieee-with-inexact" | sed 'y%./+-%__p_%'` echo $ac_n "checking whether ${CXX-c++} accepts -mieee-with-inexact""... $ac_c" 1>&6 ! echo "configure:1570: checking whether ${CXX-c++} accepts -mieee-with-inexact" >&5 if eval "test \"`echo '$''{'octave_cv_cxx_flag_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else *************** *** 1674,1693 **** # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' ! ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_cxx_cross XCXXFLAGS="$CXXFLAGS" CXXFLAGS="$CXXFLAGS -mieee-with-inexact" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "octave_cv_cxx_flag_$ac_safe=yes" else --- 1576,1595 ---- # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' ! ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_cxx_cross XCXXFLAGS="$CXXFLAGS" CXXFLAGS="$CXXFLAGS -mieee-with-inexact" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "octave_cv_cxx_flag_$ac_safe=yes" else *************** *** 1702,1708 **** # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' ! ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_cc_cross --- 1604,1610 ---- # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' ! ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_cc_cross *************** *** 1721,1729 **** ;; *ibm-aix4*) ! ac_safe=`echo "-mno-fp-in-toc" | sed 'y%./+-%__p_%'` ! echo $ac_n "checking whether ${CC-cc} accepts -mno-fp-in-toc""... $ac_c" 1>&6 ! echo "configure:1727: checking whether ${CC-cc} accepts -mno-fp-in-toc" >&5 if eval "test \"`echo '$''{'octave_cv_cc_flag_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else --- 1623,1631 ---- ;; *ibm-aix4*) ! ac_safe=`echo "-mminimal-toc" | sed 'y%./+-%__p_%'` ! echo $ac_n "checking whether ${CC-cc} accepts -mminimal-toc""... $ac_c" 1>&6 ! echo "configure:1629: checking whether ${CC-cc} accepts -mminimal-toc" >&5 if eval "test \"`echo '$''{'octave_cv_cc_flag_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else *************** *** 1733,1752 **** # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' ! ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_cc_cross XCFLAGS="$CFLAGS" ! CFLAGS="$CFLAGS -mno-fp-in-toc" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "octave_cv_cc_flag_$ac_safe=yes" else --- 1635,1654 ---- # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' ! ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_cc_cross XCFLAGS="$CFLAGS" ! CFLAGS="$CFLAGS -mminimal-toc" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "octave_cv_cc_flag_$ac_safe=yes" else *************** *** 1757,1785 **** fi rm -f conftest* CFLAGS="$XCFLAGS" ! ac_ext=c ! # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ! ac_cpp='$CPP $CPPFLAGS' ! ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' ! ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' ! cross_compiling=$ac_cv_prog_cc_cross ! fi if eval "test \"`echo '$octave_cv_cc_flag_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 ! XTRA_CFLAGS="$XTRA_CFLAGS -mno-fp-in-toc" else echo "$ac_t""no" 1>&6 fi ! ac_safe=`echo "-mno-fp-in-toc" | sed 'y%./+-%__p_%'` ! echo $ac_n "checking whether ${CXX-c++} accepts -mno-fp-in-toc""... $ac_c" 1>&6 ! echo "configure:1783: checking whether ${CXX-c++} accepts -mno-fp-in-toc" >&5 if eval "test \"`echo '$''{'octave_cv_cxx_flag_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else --- 1659,1681 ---- fi rm -f conftest* CFLAGS="$XCFLAGS" ! fi if eval "test \"`echo '$octave_cv_cc_flag_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 ! XTRA_CFLAGS="$XTRA_CFLAGS -mminimal-toc" else echo "$ac_t""no" 1>&6 fi ! ac_safe=`echo "-mminimal-toc" | sed 'y%./+-%__p_%'` ! echo $ac_n "checking whether ${CXX-c++} accepts -mminimal-toc""... $ac_c" 1>&6 ! echo "configure:1679: checking whether ${CXX-c++} accepts -mminimal-toc" >&5 if eval "test \"`echo '$''{'octave_cv_cxx_flag_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else *************** *** 1789,1808 **** # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' ! ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_cxx_cross XCXXFLAGS="$CXXFLAGS" ! CXXFLAGS="$CXXFLAGS -mno-fp-in-toc" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "octave_cv_cxx_flag_$ac_safe=yes" else --- 1685,1704 ---- # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' ! ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_cxx_cross XCXXFLAGS="$CXXFLAGS" ! CXXFLAGS="$CXXFLAGS -mminimal-toc" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "octave_cv_cxx_flag_$ac_safe=yes" else *************** *** 1817,1823 **** # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' ! ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_cc_cross --- 1713,1719 ---- # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' ! ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_cc_cross *************** *** 1826,1832 **** if eval "test \"`echo '$octave_cv_cxx_flag_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 ! XTRA_CXXFLAGS="$XTRA_CXXFLAGS -mno-fp-in-toc" else echo "$ac_t""no" 1>&6 --- 1722,1728 ---- if eval "test \"`echo '$octave_cv_cxx_flag_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 ! XTRA_CXXFLAGS="$XTRA_CXXFLAGS -mminimal-toc" else echo "$ac_t""no" 1>&6 *************** *** 1841,1847 **** ac_safe=`echo "-fno-rtti" | sed 'y%./+-%__p_%'` echo $ac_n "checking whether ${CXX-c++} accepts -fno-rtti""... $ac_c" 1>&6 ! echo "configure:1845: checking whether ${CXX-c++} accepts -fno-rtti" >&5 if eval "test \"`echo '$''{'octave_cv_cxx_flag_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else --- 1737,1743 ---- ac_safe=`echo "-fno-rtti" | sed 'y%./+-%__p_%'` echo $ac_n "checking whether ${CXX-c++} accepts -fno-rtti""... $ac_c" 1>&6 ! echo "configure:1741: checking whether ${CXX-c++} accepts -fno-rtti" >&5 if eval "test \"`echo '$''{'octave_cv_cxx_flag_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else *************** *** 1851,1870 **** # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' ! ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_cxx_cross XCXXFLAGS="$CXXFLAGS" CXXFLAGS="$CXXFLAGS -fno-rtti" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "octave_cv_cxx_flag_$ac_safe=yes" else --- 1747,1766 ---- # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' ! ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_cxx_cross XCXXFLAGS="$CXXFLAGS" CXXFLAGS="$CXXFLAGS -fno-rtti" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "octave_cv_cxx_flag_$ac_safe=yes" else *************** *** 1879,1885 **** # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' ! ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_cc_cross --- 1775,1781 ---- # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' ! ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_cc_cross *************** *** 1897,1903 **** ac_safe=`echo "-fno-exceptions" | sed 'y%./+-%__p_%'` echo $ac_n "checking whether ${CXX-c++} accepts -fno-exceptions""... $ac_c" 1>&6 ! echo "configure:1901: checking whether ${CXX-c++} accepts -fno-exceptions" >&5 if eval "test \"`echo '$''{'octave_cv_cxx_flag_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else --- 1793,1799 ---- ac_safe=`echo "-fno-exceptions" | sed 'y%./+-%__p_%'` echo $ac_n "checking whether ${CXX-c++} accepts -fno-exceptions""... $ac_c" 1>&6 ! echo "configure:1797: checking whether ${CXX-c++} accepts -fno-exceptions" >&5 if eval "test \"`echo '$''{'octave_cv_cxx_flag_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else *************** *** 1907,1926 **** # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' ! ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_cxx_cross XCXXFLAGS="$CXXFLAGS" CXXFLAGS="$CXXFLAGS -fno-exceptions" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "octave_cv_cxx_flag_$ac_safe=yes" else --- 1803,1822 ---- # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' ! ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_cxx_cross XCXXFLAGS="$CXXFLAGS" CXXFLAGS="$CXXFLAGS -fno-exceptions" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "octave_cv_cxx_flag_$ac_safe=yes" else *************** *** 1935,1941 **** # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' ! ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_cc_cross --- 1831,1837 ---- # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' ! ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_cc_cross *************** *** 1955,1961 **** ac_safe=`echo "-fno-implicit-templates" | sed 'y%./+-%__p_%'` echo $ac_n "checking whether ${CXX-c++} accepts -fno-implicit-templates""... $ac_c" 1>&6 ! echo "configure:1959: checking whether ${CXX-c++} accepts -fno-implicit-templates" >&5 if eval "test \"`echo '$''{'octave_cv_cxx_flag_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else --- 1851,1857 ---- ac_safe=`echo "-fno-implicit-templates" | sed 'y%./+-%__p_%'` echo $ac_n "checking whether ${CXX-c++} accepts -fno-implicit-templates""... $ac_c" 1>&6 ! echo "configure:1855: checking whether ${CXX-c++} accepts -fno-implicit-templates" >&5 if eval "test \"`echo '$''{'octave_cv_cxx_flag_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else *************** *** 1965,1984 **** # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' ! ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_cxx_cross XCXXFLAGS="$CXXFLAGS" CXXFLAGS="$CXXFLAGS -fno-implicit-templates" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "octave_cv_cxx_flag_$ac_safe=yes" else --- 1861,1880 ---- # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' ! ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_cxx_cross XCXXFLAGS="$CXXFLAGS" CXXFLAGS="$CXXFLAGS -fno-implicit-templates" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "octave_cv_cxx_flag_$ac_safe=yes" else *************** *** 1993,1999 **** # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' ! ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_cc_cross --- 1889,1895 ---- # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' ! ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_cc_cross *************** *** 2031,2037 **** ;; *-*-linux*) echo $ac_n "checking for sin in -lm""... $ac_c" 1>&6 ! echo "configure:2035: checking for sin in -lm" >&5 ac_lib_var=`echo m'_'sin | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 --- 1927,1933 ---- ;; *-*-linux*) echo $ac_n "checking for sin in -lm""... $ac_c" 1>&6 ! echo "configure:1931: checking for sin in -lm" >&5 ac_lib_var=`echo m'_'sin | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 *************** *** 2039,2045 **** ac_save_LIBS="$LIBS" LIBS="-lm -lc $LIBS" cat > conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else --- 1946,1952 ---- sin() ; return 0; } EOF ! if { (eval echo configure:1950: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else *************** *** 2080,2086 **** ;; *) echo $ac_n "checking for sin in -lm""... $ac_c" 1>&6 ! echo "configure:2084: checking for sin in -lm" >&5 ac_lib_var=`echo m'_'sin | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 --- 1976,1982 ---- ;; *) echo $ac_n "checking for sin in -lm""... $ac_c" 1>&6 ! echo "configure:1980: checking for sin in -lm" >&5 ac_lib_var=`echo m'_'sin | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 *************** *** 2088,2094 **** ac_save_LIBS="$LIBS" LIBS="-lm $LIBS" cat > conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else --- 1995,2001 ---- sin() ; return 0; } EOF ! if { (eval echo configure:1999: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else *************** *** 2143,2158 **** # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ! echo "configure:2147: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$RANLIB"; then ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. else ! IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" ! ac_dummy="$PATH" ! for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then ac_cv_prog_RANLIB="ranlib" --- 2039,2053 ---- # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ! echo "configure:2043: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$RANLIB"; then ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. else ! IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" ! for ac_dir in $PATH; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then ac_cv_prog_RANLIB="ranlib" *************** *** 2222,2237 **** # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ! echo "configure:2226: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_F77'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$F77"; then ac_cv_prog_F77="$F77" # Let the user override the test. else ! IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" ! ac_dummy="$PATH" ! for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then ac_cv_prog_F77="$ac_prog" --- 2117,2131 ---- # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ! echo "configure:2121: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_F77'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$F77"; then ac_cv_prog_F77="$F77" # Let the user override the test. else ! IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" ! for ac_dir in $PATH; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then ac_cv_prog_F77="$ac_prog" *************** *** 2261,2267 **** else if test -n "$F77"; then echo $ac_n "checking for Fortran libraries""... $ac_c" 1>&6 ! echo "configure:2265: checking for Fortran libraries" >&5 if eval "test \"`echo '$''{'octave_cv_flibs'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 --- 2155,2161 ---- else if test -n "$F77"; then echo $ac_n "checking for Fortran libraries""... $ac_c" 1>&6 ! echo "configure:2159: checking for Fortran libraries" >&5 if eval "test \"`echo '$''{'octave_cv_flibs'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 *************** *** 2414,2420 **** FLIBS="$octave_cv_flibs" echo "$ac_t""$FLIBS" 1>&6 echo $ac_n "checking whether ${F77-f77} uses uppercase external names""... $ac_c" 1>&6 ! echo "configure:2418: checking whether ${F77-f77} uses uppercase external names" >&5 if eval "test \"`echo '$''{'octave_cv_f77_uppercase_names'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else --- 2308,2314 ---- FLIBS="$octave_cv_flibs" echo "$ac_t""$FLIBS" 1>&6 echo $ac_n "checking whether ${F77-f77} uses uppercase external names""... $ac_c" 1>&6 ! echo "configure:2312: checking whether ${F77-f77} uses uppercase external names" >&5 if eval "test \"`echo '$''{'octave_cv_f77_uppercase_names'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else *************** *** 2439,2445 **** fi echo $ac_n "checking whether ${F77-f77} appends underscores to external names""... $ac_c" 1>&6 ! echo "configure:2443: checking whether ${F77-f77} appends underscores to external names" >&5 if eval "test \"`echo '$''{'octave_cv_f77_append_underscore'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 --- 2333,2339 ---- fi echo $ac_n "checking whether ${F77-f77} appends underscores to external names""... $ac_c" 1>&6 ! echo "configure:2337: checking whether ${F77-f77} appends underscores to external names" >&5 if eval "test \"`echo '$''{'octave_cv_f77_append_underscore'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 *************** *** 2471,2477 **** fi echo $ac_n "checking whether ${F77-f77} is the GNU Fortran compiler""... $ac_c" 1>&6 ! echo "configure:2475: checking whether ${F77-f77} is the GNU Fortran compiler" >&5 if eval "test \"`echo '$''{'octave_cv_f77_is_g77'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else --- 2365,2371 ---- fi echo $ac_n "checking whether ${F77-f77} is the GNU Fortran compiler""... $ac_c" 1>&6 ! echo "configure:2369: checking whether ${F77-f77} is the GNU Fortran compiler" >&5 if eval "test \"`echo '$''{'octave_cv_f77_is_g77'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else *************** *** 2479,2485 **** octave_cv_f77_is_g77=yes else echo " END" > conftest.f ! foutput=`${F77-f77} -v conftest.f 2>&1 | grep "GNU F77"` if test -n "$foutput"; then octave_cv_f77_is_g77=yes else --- 2373,2379 ---- octave_cv_f77_is_g77=yes else echo " END" > conftest.f ! foutput=`${F77-f77} -v conftest.f 2>&1 | egrep "GNU F77|FSF-g77"` if test -n "$foutput"; then octave_cv_f77_is_g77=yes else *************** *** 2502,2508 **** fi else echo $ac_n "checking ${F77-f77}/f2c compatibility""... $ac_c" 1>&6 ! echo "configure:2506: checking ${F77-f77}/f2c compatibility" >&5 if eval "test \"`echo '$''{'octave_cv_f2c_f77_compat'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else --- 2396,2402 ---- fi else echo $ac_n "checking ${F77-f77}/f2c compatibility""... $ac_c" 1>&6 ! echo "configure:2400: checking ${F77-f77}/f2c compatibility" >&5 if eval "test \"`echo '$''{'octave_cv_f2c_f77_compat'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else *************** *** 2572,2580 **** fi case "$canonical_host_type" in alpha*-dec-osf*) ! if test "$octave_cv_f77_is_g77" = yes \ ! || test -z "$ieee_fp_flag"; then ! true else FFLAGS="-fpe1 $FFLAGS" fi --- 2466,2473 ---- fi case "$canonical_host_type" in alpha*-dec-osf*) ! if test "$octave_cv_f77_is_g77" = yes; then ! FFLAGS="$ieee_fp_flag $FFLAGS" else FFLAGS="-fpe1 $FFLAGS" fi *************** *** 2594,2609 **** # Extract the first word of "f2c", so it can be a program name with args. set dummy f2c; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ! echo "configure:2598: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_F2C'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$F2C"; then ac_cv_prog_F2C="$F2C" # Let the user override the test. else ! IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" ! ac_dummy="$PATH" ! for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then ac_cv_prog_F2C="f2c" --- 2487,2501 ---- # Extract the first word of "f2c", so it can be a program name with args. set dummy f2c; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ! echo "configure:2491: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_F2C'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$F2C"; then ac_cv_prog_F2C="$F2C" # Let the user override the test. else ! IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" ! for ac_dir in $PATH; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then ac_cv_prog_F2C="f2c" *************** *** 2659,2665 **** oct_conflib=libconflib.a oct_obj_ext=o ! if { (eval echo configure:2663: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then $AR $ARFLAGS $oct_conflib conftest.$oct_obj_ext 1>&5 if test -n "$RANLIB"; then $RANLIB $oct_conflib 1>&5 --- 2551,2557 ---- oct_conflib=libconflib.a oct_obj_ext=o ! if { (eval echo configure:2555: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then $AR $ARFLAGS $oct_conflib conftest.$oct_obj_ext 1>&5 if test -n "$RANLIB"; then $RANLIB $oct_conflib 1>&5 *************** *** 2667,2673 **** fi rm -f conftest* echo $ac_n "checking for f_open in -lf2c""... $ac_c" 1>&6 ! echo "configure:2671: checking for f_open in -lf2c" >&5 ac_lib_var=`echo f2c'_'f_open | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 --- 2559,2565 ---- fi rm -f conftest* echo $ac_n "checking for f_open in -lf2c""... $ac_c" 1>&6 ! echo "configure:2563: checking for f_open in -lf2c" >&5 ac_lib_var=`echo f2c'_'f_open | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 *************** *** 2675,2681 **** ac_save_LIBS="$LIBS" LIBS="-lf2c -L. -lconflib $LIBS" cat > conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else --- 2578,2584 ---- f_open() ; return 0; } EOF ! if { (eval echo configure:2582: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else *************** *** 2711,2717 **** if test -z "$FLIBS"; then echo $ac_n "checking for d_sin in -lF77""... $ac_c" 1>&6 ! echo "configure:2715: checking for d_sin in -lF77" >&5 ac_lib_var=`echo F77'_'d_sin | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 --- 2603,2609 ---- if test -z "$FLIBS"; then echo $ac_n "checking for d_sin in -lF77""... $ac_c" 1>&6 ! echo "configure:2607: checking for d_sin in -lF77" >&5 ac_lib_var=`echo F77'_'d_sin | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 *************** *** 2719,2725 **** ac_save_LIBS="$LIBS" LIBS="-lF77 $LIBS" cat > conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else --- 2622,2628 ---- d_sin() ; return 0; } EOF ! if { (eval echo configure:2626: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else *************** *** 2753,2759 **** if test -n "$FLIBS"; then echo $ac_n "checking for f_rew in -lI77""... $ac_c" 1>&6 ! echo "configure:2757: checking for f_rew in -lI77" >&5 ac_lib_var=`echo I77'_'f_rew | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 --- 2645,2651 ---- if test -n "$FLIBS"; then echo $ac_n "checking for f_rew in -lI77""... $ac_c" 1>&6 ! echo "configure:2649: checking for f_rew in -lI77" >&5 ac_lib_var=`echo I77'_'f_rew | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 *************** *** 2761,2767 **** ac_save_LIBS="$LIBS" LIBS="-lI77 -lF77 $LIBS" cat > conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else --- 2664,2670 ---- f_rew() ; return 0; } EOF ! if { (eval echo configure:2668: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else *************** *** 3017,3023 **** ### functions like gethostname and gettimeofday is in libsocket. echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6 ! echo "configure:3021: checking for POSIXized ISC" >&5 if test -d /etc/conf/kconfig.d && grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1 then --- 2909,2915 ---- ### functions like gethostname and gettimeofday is in libsocket. echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6 ! echo "configure:2913: checking for POSIXized ISC" >&5 if test -d /etc/conf/kconfig.d && grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1 then *************** *** 3039,3056 **** ac_safe=`echo "minix/config.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for minix/config.h""... $ac_c" 1>&6 ! echo "configure:3043: checking for minix/config.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo configure:3053: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ! ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* eval "ac_cv_header_$ac_safe=yes" --- 2931,2948 ---- ac_safe=`echo "minix/config.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for minix/config.h""... $ac_c" 1>&6 ! echo "configure:2935: checking for minix/config.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo configure:2945: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ! ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* eval "ac_cv_header_$ac_safe=yes" *************** *** 3087,3095 **** fi echo $ac_n "checking for AIX""... $ac_c" 1>&6 ! echo "configure:3091: checking for AIX" >&5 cat > conftest.$ac_ext <&6 ! echo "configure:2983: checking for AIX" >&5 cat > conftest.$ac_ext <&6 ! echo "configure:3115: checking for getpwnam in -lsun" >&5 ac_lib_var=`echo sun'_'getpwnam | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 --- 3003,3009 ---- echo $ac_n "checking for getpwnam in -lsun""... $ac_c" 1>&6 ! echo "configure:3007: checking for getpwnam in -lsun" >&5 ac_lib_var=`echo sun'_'getpwnam | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 *************** *** 3119,3125 **** ac_save_LIBS="$LIBS" LIBS="-lsun $LIBS" cat > conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else --- 3022,3028 ---- getpwnam() ; return 0; } EOF ! if { (eval echo configure:3026: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else *************** *** 3158,3164 **** fi echo $ac_n "checking for gethostname in -lsocket""... $ac_c" 1>&6 ! echo "configure:3162: checking for gethostname in -lsocket" >&5 ac_lib_var=`echo socket'_'gethostname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 --- 3050,3056 ---- fi echo $ac_n "checking for gethostname in -lsocket""... $ac_c" 1>&6 ! echo "configure:3054: checking for gethostname in -lsocket" >&5 ac_lib_var=`echo socket'_'gethostname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 *************** *** 3166,3172 **** ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else --- 3069,3075 ---- gethostname() ; return 0; } EOF ! if { (eval echo configure:3073: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else *************** *** 3208,3214 **** case "$canonical_host_type" in alpha*-dec-osf*) echo $ac_n "checking for dgemm_ in -ldxml""... $ac_c" 1>&6 ! echo "configure:3212: checking for dgemm_ in -ldxml" >&5 ac_lib_var=`echo dxml'_'dgemm_ | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 --- 3100,3106 ---- case "$canonical_host_type" in alpha*-dec-osf*) echo $ac_n "checking for dgemm_ in -ldxml""... $ac_c" 1>&6 ! echo "configure:3104: checking for dgemm_ in -ldxml" >&5 ac_lib_var=`echo dxml'_'dgemm_ | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 *************** *** 3216,3222 **** ac_save_LIBS="$LIBS" LIBS="-ldxml $LIBS" cat > conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else --- 3119,3125 ---- dgemm_() ; return 0; } EOF ! if { (eval echo configure:3123: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else *************** *** 3255,3261 **** ### be eliminated in favor of run-time checks. echo $ac_n "checking size of short""... $ac_c" 1>&6 ! echo "configure:3259: checking size of short" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else --- 3147,3153 ---- ### be eliminated in favor of run-time checks. echo $ac_n "checking size of short""... $ac_c" 1>&6 ! echo "configure:3151: checking size of short" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else *************** *** 3263,3269 **** ac_cv_sizeof_short=2 else cat > conftest.$ac_ext < main() --- 3155,3161 ---- ac_cv_sizeof_short=2 else cat > conftest.$ac_ext < main() *************** *** 3274,3280 **** exit(0); } EOF ! if { (eval echo configure:3278: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_short=`cat conftestval` else --- 3166,3172 ---- exit(0); } EOF ! if { (eval echo configure:3170: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_short=`cat conftestval` else *************** *** 3294,3300 **** echo $ac_n "checking size of int""... $ac_c" 1>&6 ! echo "configure:3298: checking size of int" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else --- 3186,3192 ---- echo $ac_n "checking size of int""... $ac_c" 1>&6 ! echo "configure:3190: checking size of int" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else *************** *** 3302,3308 **** ac_cv_sizeof_int=4 else cat > conftest.$ac_ext < main() --- 3194,3200 ---- ac_cv_sizeof_int=4 else cat > conftest.$ac_ext < main() *************** *** 3313,3319 **** exit(0); } EOF ! if { (eval echo configure:3317: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_int=`cat conftestval` else --- 3205,3211 ---- exit(0); } EOF ! if { (eval echo configure:3209: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_int=`cat conftestval` else *************** *** 3333,3339 **** echo $ac_n "checking size of long""... $ac_c" 1>&6 ! echo "configure:3337: checking size of long" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else --- 3225,3231 ---- echo $ac_n "checking size of long""... $ac_c" 1>&6 ! echo "configure:3229: checking size of long" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else *************** *** 3341,3347 **** ac_cv_sizeof_long=4 else cat > conftest.$ac_ext < main() --- 3233,3239 ---- ac_cv_sizeof_long=4 else cat > conftest.$ac_ext < main() *************** *** 3352,3358 **** exit(0); } EOF ! if { (eval echo configure:3356: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_long=`cat conftestval` else --- 3244,3250 ---- exit(0); } EOF ! if { (eval echo configure:3248: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_long=`cat conftestval` else *************** *** 3377,3395 **** # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 ! echo "configure:3381: checking for working alloca.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { char *p = alloca(2 * sizeof(int)); ; return 0; } EOF ! if { (eval echo configure:3393: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_header_alloca_h=yes else --- 3269,3287 ---- # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 ! echo "configure:3273: checking for working alloca.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { char *p = alloca(2 * sizeof(int)); ; return 0; } EOF ! if { (eval echo configure:3285: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ac_cv_header_alloca_h=yes else *************** *** 3410,3439 **** fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 ! echo "configure:3414: checking for alloca" >&5 if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < ! # define alloca _alloca # else ! # if HAVE_ALLOCA_H ! # include ! # else ! # ifdef _AIX #pragma alloca ! # else ! # ifndef alloca /* predefined by HP cc +Olibcalls */ char *alloca (); - # endif # endif # endif # endif --- 3302,3326 ---- fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 ! echo "configure:3306: checking for alloca" >&5 if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < # else ! # ifdef _AIX #pragma alloca ! # else ! # ifndef alloca /* predefined by HP cc +Olibcalls */ char *alloca (); # endif # endif # endif *************** *** 3443,3449 **** char *p = (char *) alloca(1); ; return 0; } EOF ! if { (eval echo configure:3447: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_func_alloca_works=yes else --- 3330,3336 ---- char *p = (char *) alloca(1); ; return 0; } EOF ! if { (eval echo configure:3334: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ac_cv_func_alloca_works=yes else *************** *** 3468,3486 **** # that cause trouble. Some versions do not even contain alloca or # contain a buggy version. If you still want to use their alloca, # use ar to extract alloca.o from them instead of compiling alloca.c. ! ALLOCA=alloca.${ac_objext} cat >> confdefs.h <<\EOF #define C_ALLOCA 1 EOF echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 ! echo "configure:3479: checking whether alloca needs Cray hooks" >&5 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <> confdefs.h <<\EOF #define C_ALLOCA 1 EOF echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 ! echo "configure:3366: checking whether alloca needs Cray hooks" >&5 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 ! echo "configure:3509: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 ! echo "configure:3396: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else --- 3420,3426 ---- ; return 0; } EOF ! if { (eval echo configure:3424: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else *************** *** 3560,3566 **** fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 ! echo "configure:3564: checking stack direction for C alloca" >&5 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else --- 3447,3453 ---- fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 ! echo "configure:3451: checking stack direction for C alloca" >&5 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else *************** *** 3568,3574 **** ac_cv_c_stack_direction=0 else cat > conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_stack_direction=1 else --- 3474,3480 ---- exit (find_stack_direction() < 0); } EOF ! if { (eval echo configure:3478: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_c_stack_direction=1 else *************** *** 3609,3620 **** fi echo $ac_n "checking for working const""... $ac_c" 1>&6 ! echo "configure:3613: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 ! echo "configure:3500: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else --- 3550,3556 ---- ; return 0; } EOF ! if { (eval echo configure:3554: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else *************** *** 3687,3693 **** ### See if we should define NPOS. echo $ac_n "checking whether including defines NPOS""... $ac_c" 1>&6 ! echo "configure:3691: checking whether including defines NPOS" >&5 if eval "test \"`echo '$''{'octave_cv_string_npos'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else --- 3574,3580 ---- ### See if we should define NPOS. echo $ac_n "checking whether including defines NPOS""... $ac_c" 1>&6 ! echo "configure:3578: checking whether including defines NPOS" >&5 if eval "test \"`echo '$''{'octave_cv_string_npos'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else *************** *** 3696,3713 **** # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' ! ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext < int main() { size_t foo = NPOS ; return 0; } EOF ! if { (eval echo configure:3711: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* octave_cv_string_npos=yes else --- 3583,3600 ---- # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' ! ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext < int main() { size_t foo = NPOS ; return 0; } EOF ! if { (eval echo configure:3598: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* octave_cv_string_npos=yes else *************** *** 3730,3736 **** # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' ! ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_cc_cross --- 3617,3623 ---- # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' ! ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_cc_cross *************** *** 3738,3749 **** ### Checks for header files. echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 ! echo "configure:3742: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include --- 3625,3636 ---- ### Checks for header files. echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 ! echo "configure:3629: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include *************** *** 3751,3758 **** #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo configure:3755: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ! ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ac_cv_header_stdc=yes --- 3638,3645 ---- #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo configure:3642: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ! ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* ac_cv_header_stdc=yes *************** *** 3768,3774 **** if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF --- 3655,3661 ---- if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF *************** *** 3786,3792 **** if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF --- 3673,3679 ---- if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF *************** *** 3807,3813 **** : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') --- 3694,3700 ---- : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') *************** *** 3818,3824 **** exit (0); } EOF ! if { (eval echo configure:3822: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else --- 3705,3711 ---- exit (0); } EOF ! if { (eval echo configure:3709: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then : else *************** *** 3846,3857 **** do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6 ! echo "configure:3850: checking for $ac_hdr that defines DIR" >&5 if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include <$ac_hdr> --- 3733,3744 ---- do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6 ! echo "configure:3737: checking for $ac_hdr that defines DIR" >&5 if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include <$ac_hdr> *************** *** 3859,3865 **** DIR *dirp = 0; ; return 0; } EOF ! if { (eval echo configure:3863: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_dirent_$ac_safe=yes" else --- 3746,3752 ---- DIR *dirp = 0; ; return 0; } EOF ! if { (eval echo configure:3750: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_dirent_$ac_safe=yes" else *************** *** 3884,3890 **** # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. if test $ac_header_dirent = dirent.h; then echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6 ! echo "configure:3888: checking for opendir in -ldir" >&5 ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 --- 3771,3777 ---- # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. if test $ac_header_dirent = dirent.h; then echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6 ! echo "configure:3775: checking for opendir in -ldir" >&5 ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 *************** *** 3892,3898 **** ac_save_LIBS="$LIBS" LIBS="-ldir $LIBS" cat > conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else --- 3790,3796 ---- opendir() ; return 0; } EOF ! if { (eval echo configure:3794: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else *************** *** 3925,3931 **** else echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 ! echo "configure:3929: checking for opendir in -lx" >&5 ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 --- 3812,3818 ---- else echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 ! echo "configure:3816: checking for opendir in -lx" >&5 ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 *************** *** 3933,3939 **** ac_save_LIBS="$LIBS" LIBS="-lx $LIBS" cat > conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else --- 3831,3837 ---- opendir() ; return 0; } EOF ! if { (eval echo configure:3835: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else *************** *** 3967,3978 **** fi echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 ! echo "configure:3971: checking whether time.h and sys/time.h may both be included" >&5 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include --- 3854,3865 ---- fi echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 ! echo "configure:3858: checking whether time.h and sys/time.h may both be included" >&5 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include *************** *** 3981,3987 **** struct tm *tp; ; return 0; } EOF ! if { (eval echo configure:3985: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else --- 3868,3874 ---- struct tm *tp; ; return 0; } EOF ! if { (eval echo configure:3872: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else *************** *** 4002,4013 **** fi echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6 ! echo "configure:4006: checking for sys/wait.h that is POSIX.1 compatible" >&5 if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include --- 3889,3900 ---- fi echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6 ! echo "configure:3893: checking for sys/wait.h that is POSIX.1 compatible" >&5 if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include *************** *** 4023,4029 **** s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; ; return 0; } EOF ! if { (eval echo configure:4027: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_sys_wait_h=yes else --- 3910,3916 ---- s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; ; return 0; } EOF ! if { (eval echo configure:3914: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_sys_wait_h=yes else *************** *** 4044,4079 **** fi - ### I'm told that termios.h is broken on NeXT systems. - - TERMIOS_H=termios.h - case "$canonical_host_type" in - *-*-nextstep*) - TERMIOS_H= - ;; - esac - for ac_hdr in assert.h curses.h dlfcn.h fcntl.h float.h \ floatingpoint.h fnmatch.h glob.h grp.h ieeefp.h limits.h \ ! memory.h nan.h ncurses.h pwd.h sgtty.h stdlib.h string.h \ ! sys/param.h sys/resource.h sys/select.h sys/stat.h sys/time.h \ ! sys/times.h sys/types.h sys/utsname.h termcap.h termio.h \ ! $TERMIOS_H unistd.h varargs.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 ! echo "configure:4066: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo configure:4076: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ! ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* eval "ac_cv_header_$ac_safe=yes" --- 3931,3957 ---- fi for ac_hdr in assert.h curses.h dlfcn.h fcntl.h float.h \ floatingpoint.h fnmatch.h glob.h grp.h ieeefp.h limits.h \ ! memory.h nan.h ncurses.h poll.h pwd.h sgtty.h stdlib.h string.h \ ! sys/ioctl.h sys/param.h sys/poll.h sys/resource.h sys/select.h \ ! sys/stat.h sys/time.h sys/times.h sys/types.h sys/utsname.h \ ! termcap.h termio.h termios.h unistd.h varargs.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 ! echo "configure:3944: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo configure:3954: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ! ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* eval "ac_cv_header_$ac_safe=yes" *************** *** 4099,4104 **** --- 3977,3993 ---- done + ### I'm told that termios.h is broken on NeXT systems. + + case "$canonical_host_type" in + *-*-nextstep*) + if test "$ac_cv_header_termios_h" = yes; then + echo "configure: warning: Ignoring termios.h on NeXT systems." 1>&2 + ac_cv_header_termios_h=no + fi + ;; + esac + if test "$ac_cv_header_termios_h" = yes \ || test "$ac_cv_header_termio_h" = yes \ || test "$ac_cv_header_sgtty_h" = yes; then *************** *** 4113,4119 **** if test "$ac_cv_header_fnmatch_h" = yes \ && test "$ac_cv_header_glob_h" = yes; then cat > conftest.$ac_ext < conftest.$ac_ext <&6 ! echo "configure:4134: checking for glob in -lglob" >&5 ac_lib_var=`echo glob'_'glob | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 --- 4019,4025 ---- GLOB_DIR= echo $ac_n "checking for glob in -lglob""... $ac_c" 1>&6 ! echo "configure:4023: checking for glob in -lglob" >&5 ac_lib_var=`echo glob'_'glob | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 *************** *** 4138,4144 **** ac_save_LIBS="$LIBS" LIBS="-lglob $LIBS" cat > conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else --- 4038,4044 ---- glob() ; return 0; } EOF ! if { (eval echo configure:4042: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else *************** *** 4179,4190 **** for ac_func in fnmatch glob do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 ! echo "configure:4183: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 ! echo "configure:4072: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else --- 4096,4102 ---- ; return 0; } EOF ! if { (eval echo configure:4100: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else *************** *** 4285,4302 **** fork getcwd getegid geteuid getgid getgrent getgrgid getgrnam \ gethostname getpgrp getpid getppid getpwent getpwnam getpwuid \ gettimeofday getuid getwd lstat memmove mkdir mkfifo on_exit pipe \ ! putenv rename rindex rmdir setgrent setpwent setvbuf sigaction \ sigpending sigprocmask sigsuspend stat strcasecmp strdup strerror \ stftime stricmp strncasecmp strnicmp tempnam umask unlink usleep \ vfprintf vsprintf waitpid do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 ! echo "configure:4295: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 ! echo "configure:4184: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else --- 4208,4214 ---- ; return 0; } EOF ! if { (eval echo configure:4212: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else *************** *** 4345,4351 **** echo $ac_n "checking whether putenv uses malloc""... $ac_c" 1>&6 ! echo "configure:4349: checking whether putenv uses malloc" >&5 if eval "test \"`echo '$''{'octave_cv_func_putenv_malloc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else --- 4234,4240 ---- echo $ac_n "checking whether putenv uses malloc""... $ac_c" 1>&6 ! echo "configure:4238: checking whether putenv uses malloc" >&5 if eval "test \"`echo '$''{'octave_cv_func_putenv_malloc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else *************** *** 4353,4359 **** octave_cv_func_putenv_malloc=no else cat > conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then octave_cv_func_putenv_malloc=yes else --- 4295,4301 ---- exit (rstr1 == rstr2 ? 0 : 1); } EOF ! if { (eval echo configure:4299: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then octave_cv_func_putenv_malloc=yes else *************** *** 4427,4445 **** fi echo $ac_n "checking whether program_invocation_name is predefined""... $ac_c" 1>&6 ! echo "configure:4431: checking whether program_invocation_name is predefined" >&5 if eval "test \"`echo '$''{'octave_cv_var_program_inv_name'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* octave_cv_var_program_inv_name=yes else --- 4316,4334 ---- fi echo $ac_n "checking whether program_invocation_name is predefined""... $ac_c" 1>&6 ! echo "configure:4320: checking whether program_invocation_name is predefined" >&5 if eval "test \"`echo '$''{'octave_cv_var_program_inv_name'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* octave_cv_var_program_inv_name=yes else *************** *** 4473,4479 **** ;; *) echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 ! echo "configure:4477: checking for dlopen in -ldl" >&5 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 --- 4362,4368 ---- ;; *) echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 ! echo "configure:4366: checking for dlopen in -ldl" >&5 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 *************** *** 4481,4487 **** ac_save_LIBS="$LIBS" LIBS="-ldl $LIBS" cat > conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else --- 4381,4387 ---- dlopen() ; return 0; } EOF ! if { (eval echo configure:4385: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else *************** *** 4522,4533 **** for ac_func in dlopen dlsym dlerror dlclose do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 ! echo "configure:4526: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 ! echo "configure:4415: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else --- 4439,4445 ---- ; return 0; } EOF ! if { (eval echo configure:4443: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else *************** *** 4591,4597 **** ac_safe=`echo "-rdynamic" | sed 'y%./+-%__p_%'` echo $ac_n "checking whether ${CXX-c++} accepts -rdynamic""... $ac_c" 1>&6 ! echo "configure:4595: checking whether ${CXX-c++} accepts -rdynamic" >&5 if eval "test \"`echo '$''{'octave_cv_cxx_flag_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else --- 4480,4486 ---- ac_safe=`echo "-rdynamic" | sed 'y%./+-%__p_%'` echo $ac_n "checking whether ${CXX-c++} accepts -rdynamic""... $ac_c" 1>&6 ! echo "configure:4484: checking whether ${CXX-c++} accepts -rdynamic" >&5 if eval "test \"`echo '$''{'octave_cv_cxx_flag_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else *************** *** 4601,4620 **** # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' ! ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_cxx_cross XCXXFLAGS="$CXXFLAGS" CXXFLAGS="$CXXFLAGS -rdynamic" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "octave_cv_cxx_flag_$ac_safe=yes" else --- 4490,4509 ---- # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' ! ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_cxx_cross XCXXFLAGS="$CXXFLAGS" CXXFLAGS="$CXXFLAGS -rdynamic" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "octave_cv_cxx_flag_$ac_safe=yes" else *************** *** 4629,4635 **** # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' ! ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_cc_cross --- 4518,4524 ---- # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' ! ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_cc_cross *************** *** 4658,4664 **** if test "$WITH_SHL" = yes || test "$WITH_SHL" = maybe; then echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6 ! echo "configure:4662: checking for shl_load in -ldld" >&5 ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 --- 4547,4553 ---- if test "$WITH_SHL" = yes || test "$WITH_SHL" = maybe; then echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6 ! echo "configure:4551: checking for shl_load in -ldld" >&5 ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 *************** *** 4666,4672 **** ac_save_LIBS="$LIBS" LIBS="-ldld $LIBS" cat > conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else --- 4566,4572 ---- shl_load() ; return 0; } EOF ! if { (eval echo configure:4570: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else *************** *** 4707,4718 **** for ac_func in shl_load shl_findsym do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 ! echo "configure:4711: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 ! echo "configure:4600: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else --- 4624,4630 ---- ; return 0; } EOF ! if { (eval echo configure:4628: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else *************** *** 4797,4808 **** ### There is more than one possible prototype for gettimeofday. See ### which one (if any) appears in sys/time.h. echo $ac_n "checking for gettimeofday""... $ac_c" 1>&6 ! echo "configure:4801: checking for gettimeofday" >&5 if eval "test \"`echo '$''{'ac_cv_func_gettimeofday'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 ! echo "configure:4690: checking for gettimeofday" >&5 if eval "test \"`echo '$''{'ac_cv_func_gettimeofday'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_gettimeofday=yes" else --- 4714,4720 ---- ; return 0; } EOF ! if { (eval echo configure:4718: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_gettimeofday=yes" else *************** *** 4840,4853 **** if eval "test \"`echo '$ac_cv_func_'gettimeofday`\" = yes"; then echo "$ac_t""yes" 1>&6 cat > conftest.$ac_ext < int main() { gettimeofday ((struct timeval *) 0,(struct timezone *) 0); ; return 0; } EOF ! if { (eval echo configure:4851: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 --- 4729,4742 ---- if eval "test \"`echo '$ac_cv_func_'gettimeofday`\" = yes"; then echo "$ac_t""yes" 1>&6 cat > conftest.$ac_ext < int main() { gettimeofday ((struct timeval *) 0,(struct timezone *) 0); ; return 0; } EOF ! if { (eval echo configure:4740: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 *************** *** 4873,4879 **** ### with functions from the BSD/NET2 math library. echo $ac_n "checking for quiet_nan in -lsunmath""... $ac_c" 1>&6 ! echo "configure:4877: checking for quiet_nan in -lsunmath" >&5 ac_lib_var=`echo sunmath'_'quiet_nan | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 --- 4762,4768 ---- ### with functions from the BSD/NET2 math library. echo $ac_n "checking for quiet_nan in -lsunmath""... $ac_c" 1>&6 ! echo "configure:4766: checking for quiet_nan in -lsunmath" >&5 ac_lib_var=`echo sunmath'_'quiet_nan | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 *************** *** 4881,4887 **** ac_save_LIBS="$LIBS" LIBS="-lsunmath $LIBS" cat > conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else --- 4781,4787 ---- quiet_nan() ; return 0; } EOF ! if { (eval echo configure:4785: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else *************** *** 4948,4959 **** for ac_func in finite isnan isinf infinity quiet_nan do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 ! echo "configure:4952: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 ! echo "configure:4841: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else --- 4865,4871 ---- ; return 0; } EOF ! if { (eval echo configure:4869: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else *************** *** 5008,5019 **** for ac_func in acosh asinh atanh erf erfc do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 ! echo "configure:5012: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 ! echo "configure:4901: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else --- 4925,4931 ---- ; return 0; } EOF ! if { (eval echo configure:4929: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else *************** *** 5064,5075 **** ### Checks for OS specific cruft. echo $ac_n "checking for st_blksize in struct stat""... $ac_c" 1>&6 ! echo "configure:5068: checking for st_blksize in struct stat" >&5 if eval "test \"`echo '$''{'ac_cv_struct_st_blksize'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include --- 4953,4964 ---- ### Checks for OS specific cruft. echo $ac_n "checking for st_blksize in struct stat""... $ac_c" 1>&6 ! echo "configure:4957: checking for st_blksize in struct stat" >&5 if eval "test \"`echo '$''{'ac_cv_struct_st_blksize'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include *************** *** 5077,5083 **** struct stat s; s.st_blksize; ; return 0; } EOF ! if { (eval echo configure:5081: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_st_blksize=yes else --- 4966,4972 ---- struct stat s; s.st_blksize; ; return 0; } EOF ! if { (eval echo configure:4970: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_st_blksize=yes else *************** *** 5098,5109 **** fi echo $ac_n "checking for st_blocks in struct stat""... $ac_c" 1>&6 ! echo "configure:5102: checking for st_blocks in struct stat" >&5 if eval "test \"`echo '$''{'ac_cv_struct_st_blocks'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include --- 4987,4998 ---- fi echo $ac_n "checking for st_blocks in struct stat""... $ac_c" 1>&6 ! echo "configure:4991: checking for st_blocks in struct stat" >&5 if eval "test \"`echo '$''{'ac_cv_struct_st_blocks'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include *************** *** 5111,5117 **** struct stat s; s.st_blocks; ; return 0; } EOF ! if { (eval echo configure:5115: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_st_blocks=yes else --- 5000,5006 ---- struct stat s; s.st_blocks; ; return 0; } EOF ! if { (eval echo configure:5004: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_st_blocks=yes else *************** *** 5130,5145 **** EOF else ! LIBOBJS="$LIBOBJS fileblocks.${ac_objext}" fi echo $ac_n "checking for st_rdev in struct stat""... $ac_c" 1>&6 ! echo "configure:5138: checking for st_rdev in struct stat" >&5 if eval "test \"`echo '$''{'ac_cv_struct_st_rdev'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include --- 5019,5034 ---- EOF else ! LIBOBJS="$LIBOBJS fileblocks.o" fi echo $ac_n "checking for st_rdev in struct stat""... $ac_c" 1>&6 ! echo "configure:5027: checking for st_rdev in struct stat" >&5 if eval "test \"`echo '$''{'ac_cv_struct_st_rdev'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include *************** *** 5147,5153 **** struct stat s; s.st_rdev; ; return 0; } EOF ! if { (eval echo configure:5151: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_st_rdev=yes else --- 5036,5042 ---- struct stat s; s.st_rdev; ; return 0; } EOF ! if { (eval echo configure:5040: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_st_rdev=yes else *************** *** 5168,5179 **** fi echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6 ! echo "configure:5172: checking whether struct tm is in sys/time.h or time.h" >&5 if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include --- 5057,5068 ---- fi echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6 ! echo "configure:5061: checking whether struct tm is in sys/time.h or time.h" >&5 if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include *************** *** 5181,5187 **** struct tm *tp; tp->tm_sec; ; return 0; } EOF ! if { (eval echo configure:5185: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm=time.h else --- 5070,5076 ---- struct tm *tp; tp->tm_sec; ; return 0; } EOF ! if { (eval echo configure:5074: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm=time.h else *************** *** 5202,5213 **** fi echo $ac_n "checking for tm_zone in struct tm""... $ac_c" 1>&6 ! echo "configure:5206: checking for tm_zone in struct tm" >&5 if eval "test \"`echo '$''{'ac_cv_struct_tm_zone'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include <$ac_cv_struct_tm> --- 5091,5102 ---- fi echo $ac_n "checking for tm_zone in struct tm""... $ac_c" 1>&6 ! echo "configure:5095: checking for tm_zone in struct tm" >&5 if eval "test \"`echo '$''{'ac_cv_struct_tm_zone'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include <$ac_cv_struct_tm> *************** *** 5215,5221 **** struct tm tm; tm.tm_zone; ; return 0; } EOF ! if { (eval echo configure:5219: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm_zone=yes else --- 5104,5110 ---- struct tm tm; tm.tm_zone; ; return 0; } EOF ! if { (eval echo configure:5108: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm_zone=yes else *************** *** 5235,5246 **** else echo $ac_n "checking for tzname""... $ac_c" 1>&6 ! echo "configure:5239: checking for tzname" >&5 if eval "test \"`echo '$''{'ac_cv_var_tzname'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #ifndef tzname /* For SGI. */ --- 5124,5135 ---- else echo $ac_n "checking for tzname""... $ac_c" 1>&6 ! echo "configure:5128: checking for tzname" >&5 if eval "test \"`echo '$''{'ac_cv_var_tzname'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #ifndef tzname /* For SGI. */ *************** *** 5250,5256 **** atoi(*tzname); ; return 0; } EOF ! if { (eval echo configure:5254: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_var_tzname=yes else --- 5139,5145 ---- atoi(*tzname); ; return 0; } EOF ! if { (eval echo configure:5143: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ac_cv_var_tzname=yes else *************** *** 5272,5278 **** fi echo $ac_n "checking whether closedir returns void""... $ac_c" 1>&6 ! echo "configure:5276: checking whether closedir returns void" >&5 if eval "test \"`echo '$''{'ac_cv_func_closedir_void'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else --- 5161,5167 ---- fi echo $ac_n "checking whether closedir returns void""... $ac_c" 1>&6 ! echo "configure:5165: checking whether closedir returns void" >&5 if eval "test \"`echo '$''{'ac_cv_func_closedir_void'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else *************** *** 5280,5292 **** ac_cv_func_closedir_void=yes else cat > conftest.$ac_ext < #include <$ac_header_dirent> int closedir(); main() { exit(closedir(opendir(".")) != 0); } EOF ! if { (eval echo configure:5290: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_closedir_void=no else --- 5169,5181 ---- ac_cv_func_closedir_void=yes else cat > conftest.$ac_ext < #include <$ac_header_dirent> int closedir(); main() { exit(closedir(opendir(".")) != 0); } EOF ! if { (eval echo configure:5179: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_func_closedir_void=no else *************** *** 5310,5321 **** echo $ac_n "checking for gr_passwd in struct group""... $ac_c" 1>&6 ! echo "configure:5314: checking for gr_passwd in struct group" >&5 if eval "test \"`echo '$''{'octave_cv_struct_gr_passwd'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include --- 5199,5210 ---- echo $ac_n "checking for gr_passwd in struct group""... $ac_c" 1>&6 ! echo "configure:5203: checking for gr_passwd in struct group" >&5 if eval "test \"`echo '$''{'octave_cv_struct_gr_passwd'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include *************** *** 5323,5329 **** struct group s; s.gr_passwd; ; return 0; } EOF ! if { (eval echo configure:5327: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* octave_cv_struct_gr_passwd=yes else --- 5212,5218 ---- struct group s; s.gr_passwd; ; return 0; } EOF ! if { (eval echo configure:5216: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* octave_cv_struct_gr_passwd=yes else *************** *** 5347,5353 **** TERMLIBS="" for termlib in ncurses curses termcap terminfo termlib; do echo $ac_n "checking for tputs in -l${termlib}""... $ac_c" 1>&6 ! echo "configure:5351: checking for tputs in -l${termlib}" >&5 ac_lib_var=`echo ${termlib}'_'tputs | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 --- 5236,5242 ---- TERMLIBS="" for termlib in ncurses curses termcap terminfo termlib; do echo $ac_n "checking for tputs in -l${termlib}""... $ac_c" 1>&6 ! echo "configure:5240: checking for tputs in -l${termlib}" >&5 ac_lib_var=`echo ${termlib}'_'tputs | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 *************** *** 5355,5361 **** ac_save_LIBS="$LIBS" LIBS="-l${termlib} $LIBS" cat > conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else --- 5255,5261 ---- tputs() ; return 0; } EOF ! if { (eval echo configure:5259: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else *************** *** 5407,5422 **** fi echo $ac_n "checking for struct exception in math.h""... $ac_c" 1>&6 ! echo "configure:5411: checking for struct exception in math.h" >&5 cat > conftest.$ac_ext < int main() { struct exception *x; x->type; x->name; ; return 0; } EOF ! if { (eval echo configure:5420: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 cat >> confdefs.h <<\EOF --- 5296,5311 ---- fi echo $ac_n "checking for struct exception in math.h""... $ac_c" 1>&6 ! echo "configure:5300: checking for struct exception in math.h" >&5 cat > conftest.$ac_ext < int main() { struct exception *x; x->type; x->name; ; return 0; } EOF ! if { (eval echo configure:5309: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* echo "$ac_t""yes" 1>&6 cat >> confdefs.h <<\EOF *************** *** 5434,5445 **** ### Signal stuff. echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 ! echo "configure:5438: checking return type of signal handlers" >&5 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include --- 5323,5334 ---- ### Signal stuff. echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 ! echo "configure:5327: checking return type of signal handlers" >&5 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include *************** *** 5456,5462 **** int i; ; return 0; } EOF ! if { (eval echo configure:5460: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else --- 5345,5351 ---- int i; ; return 0; } EOF ! if { (eval echo configure:5349: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else *************** *** 5475,5486 **** echo $ac_n "checking for sys_siglist declaration in signal.h or unistd.h""... $ac_c" 1>&6 ! echo "configure:5479: checking for sys_siglist declaration in signal.h or unistd.h" >&5 if eval "test \"`echo '$''{'ac_cv_decl_sys_siglist'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include --- 5364,5375 ---- echo $ac_n "checking for sys_siglist declaration in signal.h or unistd.h""... $ac_c" 1>&6 ! echo "configure:5368: checking for sys_siglist declaration in signal.h or unistd.h" >&5 if eval "test \"`echo '$''{'ac_cv_decl_sys_siglist'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include *************** *** 5492,5498 **** char *msg = *(sys_siglist + 1); ; return 0; } EOF ! if { (eval echo configure:5496: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_decl_sys_siglist=yes else --- 5381,5387 ---- char *msg = *(sys_siglist + 1); ; return 0; } EOF ! if { (eval echo configure:5385: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_decl_sys_siglist=yes else *************** *** 5513,5528 **** fi echo $ac_n "checking for sys_siglist variable""... $ac_c" 1>&6 ! echo "configure:5517: checking for sys_siglist variable" >&5 cat > conftest.$ac_ext < int main() { extern char *sys_siglist[]; printf ("%s\n", sys_siglist[1]); ; return 0; } EOF ! if { (eval echo configure:5526: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 cat >> confdefs.h <<\EOF --- 5402,5417 ---- fi echo $ac_n "checking for sys_siglist variable""... $ac_c" 1>&6 ! echo "configure:5406: checking for sys_siglist variable" >&5 cat > conftest.$ac_ext < int main() { extern char *sys_siglist[]; printf ("%s\n", sys_siglist[1]); ; return 0; } EOF ! if { (eval echo configure:5415: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* echo "$ac_t""yes" 1>&6 cat >> confdefs.h <<\EOF *************** *** 5538,5550 **** rm -f conftest* echo $ac_n "checking for type of signal functions""... $ac_c" 1>&6 ! echo "configure:5542: checking for type of signal functions" >&5 if eval "test \"`echo '$''{'octave_cv_signal_vintage'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { --- 5427,5439 ---- rm -f conftest* echo $ac_n "checking for type of signal functions""... $ac_c" 1>&6 ! echo "configure:5431: checking for type of signal functions" >&5 if eval "test \"`echo '$''{'octave_cv_signal_vintage'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { *************** *** 5557,5563 **** ; return 0; } EOF ! if { (eval echo configure:5561: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* octave_cv_signal_vintage=posix else --- 5446,5452 ---- ; return 0; } EOF ! if { (eval echo configure:5450: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* octave_cv_signal_vintage=posix else *************** *** 5566,5572 **** rm -rf conftest* cat > conftest.$ac_ext < int main() { --- 5455,5461 ---- rm -rf conftest* cat > conftest.$ac_ext < int main() { *************** *** 5576,5582 **** ; return 0; } EOF ! if { (eval echo configure:5580: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* octave_cv_signal_vintage=4.2bsd else --- 5465,5471 ---- ; return 0; } EOF ! if { (eval echo configure:5469: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* octave_cv_signal_vintage=4.2bsd else *************** *** 5585,5591 **** rm -rf conftest* cat > conftest.$ac_ext < --- 5474,5480 ---- rm -rf conftest* cat > conftest.$ac_ext < *************** *** 5598,5604 **** ; return 0; } EOF ! if { (eval echo configure:5602: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* octave_cv_signal_vintage=svr3 else --- 5487,5493 ---- ; return 0; } EOF ! if { (eval echo configure:5491: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* octave_cv_signal_vintage=svr3 else *************** *** 5639,5645 **** echo $ac_n "checking if signal handlers must be reinstalled when invoked""... $ac_c" 1>&6 ! echo "configure:5643: checking if signal handlers must be reinstalled when invoked" >&5 if eval "test \"`echo '$''{'octave_cv_must_reinstall_sighandlers'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else --- 5528,5534 ---- echo $ac_n "checking if signal handlers must be reinstalled when invoked""... $ac_c" 1>&6 ! echo "configure:5532: checking if signal handlers must be reinstalled when invoked" >&5 if eval "test \"`echo '$''{'octave_cv_must_reinstall_sighandlers'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else *************** *** 5651,5657 **** fi else cat > conftest.$ac_ext < --- 5540,5546 ---- fi else cat > conftest.$ac_ext < *************** *** 5693,5699 **** } EOF ! if { (eval echo configure:5697: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then octave_cv_must_reinstall_sighandlers=no else --- 5582,5588 ---- } EOF ! if { (eval echo configure:5586: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then octave_cv_must_reinstall_sighandlers=no else *************** *** 5723,5734 **** ### Type stuff. echo $ac_n "checking for mode_t""... $ac_c" 1>&6 ! echo "configure:5727: checking for mode_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS --- 5612,5623 ---- ### Type stuff. echo $ac_n "checking for mode_t""... $ac_c" 1>&6 ! echo "configure:5616: checking for mode_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS *************** *** 5737,5743 **** #endif EOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | ! egrep "(^|[^a-zA-Z_0-9])mode_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then rm -rf conftest* ac_cv_type_mode_t=yes else --- 5626,5632 ---- #endif EOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | ! egrep "mode_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then rm -rf conftest* ac_cv_type_mode_t=yes else *************** *** 5756,5767 **** fi echo $ac_n "checking for off_t""... $ac_c" 1>&6 ! echo "configure:5760: checking for off_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS --- 5645,5656 ---- fi echo $ac_n "checking for off_t""... $ac_c" 1>&6 ! echo "configure:5649: checking for off_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS *************** *** 5770,5776 **** #endif EOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | ! egrep "(^|[^a-zA-Z_0-9])off_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then rm -rf conftest* ac_cv_type_off_t=yes else --- 5659,5665 ---- #endif EOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | ! egrep "off_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then rm -rf conftest* ac_cv_type_off_t=yes else *************** *** 5789,5800 **** fi echo $ac_n "checking for pid_t""... $ac_c" 1>&6 ! echo "configure:5793: checking for pid_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS --- 5678,5689 ---- fi echo $ac_n "checking for pid_t""... $ac_c" 1>&6 ! echo "configure:5682: checking for pid_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS *************** *** 5803,5809 **** #endif EOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | ! egrep "(^|[^a-zA-Z_0-9])pid_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then rm -rf conftest* ac_cv_type_pid_t=yes else --- 5692,5698 ---- #endif EOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | ! egrep "pid_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then rm -rf conftest* ac_cv_type_pid_t=yes else *************** *** 5822,5833 **** fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 ! echo "configure:5826: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS --- 5711,5722 ---- fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 ! echo "configure:5715: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS *************** *** 5836,5842 **** #endif EOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | ! egrep "(^|[^a-zA-Z_0-9])size_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then rm -rf conftest* ac_cv_type_size_t=yes else --- 5725,5731 ---- #endif EOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | ! egrep "size_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then rm -rf conftest* ac_cv_type_size_t=yes else *************** *** 5855,5866 **** fi echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 ! echo "configure:5859: checking for uid_t in sys/types.h" >&5 if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF --- 5744,5755 ---- fi echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 ! echo "configure:5748: checking for uid_t in sys/types.h" >&5 if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF *************** *** 5889,5900 **** fi echo $ac_n "checking for dev_t""... $ac_c" 1>&6 ! echo "configure:5893: checking for dev_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_dev_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS --- 5778,5789 ---- fi echo $ac_n "checking for dev_t""... $ac_c" 1>&6 ! echo "configure:5782: checking for dev_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_dev_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS *************** *** 5903,5909 **** #endif EOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | ! egrep "(^|[^a-zA-Z_0-9])dev_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then rm -rf conftest* ac_cv_type_dev_t=yes else --- 5792,5798 ---- #endif EOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | ! egrep "dev_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then rm -rf conftest* ac_cv_type_dev_t=yes else *************** *** 5922,5933 **** fi echo $ac_n "checking for ino_t""... $ac_c" 1>&6 ! echo "configure:5926: checking for ino_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_ino_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS --- 5811,5822 ---- fi echo $ac_n "checking for ino_t""... $ac_c" 1>&6 ! echo "configure:5815: checking for ino_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_ino_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS *************** *** 5936,5942 **** #endif EOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | ! egrep "(^|[^a-zA-Z_0-9])ino_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then rm -rf conftest* ac_cv_type_ino_t=yes else --- 5825,5831 ---- #endif EOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | ! egrep "ino_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then rm -rf conftest* ac_cv_type_ino_t=yes else *************** *** 5955,5966 **** fi echo $ac_n "checking for nlink_t""... $ac_c" 1>&6 ! echo "configure:5959: checking for nlink_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_nlink_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS --- 5844,5855 ---- fi echo $ac_n "checking for nlink_t""... $ac_c" 1>&6 ! echo "configure:5848: checking for nlink_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_nlink_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS *************** *** 5969,5975 **** #endif EOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | ! egrep "(^|[^a-zA-Z_0-9])nlink_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then rm -rf conftest* ac_cv_type_nlink_t=yes else --- 5858,5864 ---- #endif EOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | ! egrep "nlink_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then rm -rf conftest* ac_cv_type_nlink_t=yes else *************** *** 5988,5999 **** fi echo $ac_n "checking for sigset_t""... $ac_c" 1>&6 ! echo "configure:5992: checking for sigset_t" >&5 if eval "test \"`echo '$''{'octave_cv_type_sigset_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS --- 5877,5888 ---- fi echo $ac_n "checking for sigset_t""... $ac_c" 1>&6 ! echo "configure:5881: checking for sigset_t" >&5 if eval "test \"`echo '$''{'octave_cv_type_sigset_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS *************** *** 6041,6052 **** for ac_func in getrusage times do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 ! echo "configure:6045: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 ! echo "configure:5934: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else --- 5958,5964 ---- ; return 0; } EOF ! if { (eval echo configure:5962: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else *************** *** 6140,6155 **** # Extract the first word of "flex", so it can be a program name with args. set dummy flex; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ! echo "configure:6144: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LEX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$LEX"; then ac_cv_prog_LEX="$LEX" # Let the user override the test. else ! IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" ! ac_dummy="$PATH" ! for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then ac_cv_prog_LEX="flex" --- 6029,6043 ---- # Extract the first word of "flex", so it can be a program name with args. set dummy flex; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ! echo "configure:6033: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LEX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$LEX"; then ac_cv_prog_LEX="$LEX" # Let the user override the test. else ! IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" ! for ac_dir in $PATH; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then ac_cv_prog_LEX="flex" *************** *** 6174,6180 **** *) ac_lib=l ;; esac echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6 ! echo "configure:6178: checking for yywrap in -l$ac_lib" >&5 ac_lib_var=`echo $ac_lib'_'yywrap | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 --- 6062,6068 ---- *) ac_lib=l ;; esac echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6 ! echo "configure:6066: checking for yywrap in -l$ac_lib" >&5 ac_lib_var=`echo $ac_lib'_'yywrap | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 *************** *** 6182,6188 **** ac_save_LIBS="$LIBS" LIBS="-l$ac_lib $LIBS" cat > conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else --- 6081,6087 ---- yywrap() ; return 0; } EOF ! if { (eval echo configure:6085: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else *************** *** 6235,6250 **** # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ! echo "configure:6239: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$YACC"; then ac_cv_prog_YACC="$YACC" # Let the user override the test. else ! IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" ! ac_dummy="$PATH" ! for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then ac_cv_prog_YACC="$ac_prog" --- 6123,6137 ---- # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ! echo "configure:6127: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$YACC"; then ac_cv_prog_YACC="$YACC" # Let the user override the test. else ! IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" ! for ac_dir in $PATH; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then ac_cv_prog_YACC="$ac_prog" *************** *** 6275,6281 **** esac echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 ! echo "configure:6279: checking whether ln -s works" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else --- 6162,6168 ---- esac echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 ! echo "configure:6166: checking whether ln -s works" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else *************** *** 6304,6319 **** # Extract the first word of "runtest", so it can be a program name with args. set dummy runtest; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ! echo "configure:6308: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RUNTEST'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$RUNTEST"; then ac_cv_prog_RUNTEST="$RUNTEST" # Let the user override the test. else ! IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" ! ac_dummy="$PATH" ! for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then ac_cv_prog_RUNTEST="runtest" --- 6191,6205 ---- # Extract the first word of "runtest", so it can be a program name with args. set dummy runtest; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ! echo "configure:6195: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RUNTEST'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$RUNTEST"; then ac_cv_prog_RUNTEST="$RUNTEST" # Let the user override the test. else ! IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" ! for ac_dir in $PATH; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then ac_cv_prog_RUNTEST="runtest" *************** *** 6345,6374 **** # SunOS /usr/etc/install # IRIX /sbin/install # AIX /bin/install - # AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag # AFS /usr/afsws/bin/install, which mishandles nonexistent args # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 ! echo "configure:6354: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ! IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":" for ac_dir in $PATH; do # Account for people who put trailing slashes in PATH elements. case "$ac_dir/" in /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;; *) # OSF1 and SCO ODT 3.0 have their own names for install. ! # Don't use installbsd from OSF since it installs stuff as root ! # by default. ! for ac_prog in ginstall scoinst install; do if test -f $ac_dir/$ac_prog; then if test $ac_prog = install && grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. : else ac_cv_path_install="$ac_dir/$ac_prog -c" --- 6231,6258 ---- # SunOS /usr/etc/install # IRIX /sbin/install # AIX /bin/install # AFS /usr/afsws/bin/install, which mishandles nonexistent args # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 ! echo "configure:6239: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ! IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS="${IFS}:" for ac_dir in $PATH; do # Account for people who put trailing slashes in PATH elements. case "$ac_dir/" in /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;; *) # OSF1 and SCO ODT 3.0 have their own names for install. ! for ac_prog in ginstall installbsd scoinst install; do if test -f $ac_dir/$ac_prog; then if test $ac_prog = install && grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. + # OSF/1 installbsd also uses dspmsg, but is usable. : else ac_cv_path_install="$ac_dir/$ac_prog -c" *************** *** 6398,6405 **** # It thinks the first close brace ends the variable substitution. test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' - test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' - test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' INSTALL_SCRIPT='${INSTALL}' --- 6282,6287 ---- *************** *** 6423,6438 **** # Extract the first word of "gnuplot", so it can be a program name with args. set dummy gnuplot; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ! echo "configure:6427: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_GNUPLOT_BINARY'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$GNUPLOT_BINARY"; then ac_cv_prog_GNUPLOT_BINARY="$GNUPLOT_BINARY" # Let the user override the test. else ! IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" ! ac_dummy="$PATH" ! for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then ac_cv_prog_GNUPLOT_BINARY="gnuplot" --- 6305,6319 ---- # Extract the first word of "gnuplot", so it can be a program name with args. set dummy gnuplot; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ! echo "configure:6309: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_GNUPLOT_BINARY'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$GNUPLOT_BINARY"; then ac_cv_prog_GNUPLOT_BINARY="$GNUPLOT_BINARY" # Let the user override the test. else ! IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" ! for ac_dir in $PATH; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then ac_cv_prog_GNUPLOT_BINARY="gnuplot" *************** *** 6451,6457 **** if test -n "$GNUPLOT_BINARY"; then echo $ac_n "checking to see if your gnuplot supports multiplot""... $ac_c" 1>&6 ! echo "configure:6455: checking to see if your gnuplot supports multiplot" >&5 if test -z "`echo 'set term unknown; set multiplot' | \ $GNUPLOT_BINARY 2>&1`"; then echo "$ac_t""yes" 1>&6 --- 6332,6338 ---- if test -n "$GNUPLOT_BINARY"; then echo $ac_n "checking to see if your gnuplot supports multiplot""... $ac_c" 1>&6 ! echo "configure:6336: checking to see if your gnuplot supports multiplot" >&5 if test -z "`echo 'set term unknown; set multiplot' | \ $GNUPLOT_BINARY 2>&1`"; then echo "$ac_t""yes" 1>&6 *************** *** 6463,6469 **** echo "$ac_t""no" 1>&6 fi echo $ac_n "checking to see if your gnuplot supports multiple plot windows""... $ac_c" 1>&6 ! echo "configure:6467: checking to see if your gnuplot supports multiple plot windows" >&5 if test -z "`echo 'set term x11 2' | $GNUPLOT_BINARY 2>&1`"; then echo "$ac_t""yes" 1>&6 cat >> confdefs.h <<\EOF --- 6344,6350 ---- echo "$ac_t""no" 1>&6 fi echo $ac_n "checking to see if your gnuplot supports multiple plot windows""... $ac_c" 1>&6 ! echo "configure:6348: checking to see if your gnuplot supports multiple plot windows" >&5 if test -z "`echo 'set term x11 2' | $GNUPLOT_BINARY 2>&1`"; then echo "$ac_t""yes" 1>&6 cat >> confdefs.h <<\EOF *************** *** 6509,6524 **** # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ! echo "configure:6513: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_DEFAULT_PAGER'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$DEFAULT_PAGER"; then ac_cv_prog_DEFAULT_PAGER="$DEFAULT_PAGER" # Let the user override the test. else ! IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" ! ac_dummy="$PATH" ! for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then ac_cv_prog_DEFAULT_PAGER="$ac_prog" --- 6390,6404 ---- # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ! echo "configure:6394: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_DEFAULT_PAGER'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$DEFAULT_PAGER"; then ac_cv_prog_DEFAULT_PAGER="$DEFAULT_PAGER" # Let the user override the test. else ! IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" ! for ac_dir in $PATH; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then ac_cv_prog_DEFAULT_PAGER="$ac_prog" *************** *** 6581,6587 **** ac_safe=`echo "-Wall" | sed 'y%./+-%__p_%'` echo $ac_n "checking whether ${CC-cc} accepts -Wall""... $ac_c" 1>&6 ! echo "configure:6585: checking whether ${CC-cc} accepts -Wall" >&5 if eval "test \"`echo '$''{'octave_cv_cc_flag_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else --- 6461,6467 ---- ac_safe=`echo "-Wall" | sed 'y%./+-%__p_%'` echo $ac_n "checking whether ${CC-cc} accepts -Wall""... $ac_c" 1>&6 ! echo "configure:6465: checking whether ${CC-cc} accepts -Wall" >&5 if eval "test \"`echo '$''{'octave_cv_cc_flag_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else *************** *** 6591,6610 **** # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' ! ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_cc_cross XCFLAGS="$CFLAGS" CFLAGS="$CFLAGS -Wall" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "octave_cv_cc_flag_$ac_safe=yes" else --- 6471,6490 ---- # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' ! ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_cc_cross XCFLAGS="$CFLAGS" CFLAGS="$CFLAGS -Wall" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "octave_cv_cc_flag_$ac_safe=yes" else *************** *** 6615,6627 **** fi rm -f conftest* CFLAGS="$XCFLAGS" ! ac_ext=c ! # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ! ac_cpp='$CPP $CPPFLAGS' ! ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' ! ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' ! cross_compiling=$ac_cv_prog_cc_cross ! fi --- 6495,6501 ---- fi rm -f conftest* CFLAGS="$XCFLAGS" ! fi *************** *** 6641,6647 **** ac_safe=`echo "-Wall" | sed 'y%./+-%__p_%'` echo $ac_n "checking whether ${CXX-c++} accepts -Wall""... $ac_c" 1>&6 ! echo "configure:6645: checking whether ${CXX-c++} accepts -Wall" >&5 if eval "test \"`echo '$''{'octave_cv_cxx_flag_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else --- 6515,6521 ---- ac_safe=`echo "-Wall" | sed 'y%./+-%__p_%'` echo $ac_n "checking whether ${CXX-c++} accepts -Wall""... $ac_c" 1>&6 ! echo "configure:6519: checking whether ${CXX-c++} accepts -Wall" >&5 if eval "test \"`echo '$''{'octave_cv_cxx_flag_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else *************** *** 6651,6670 **** # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' ! ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_cxx_cross XCXXFLAGS="$CXXFLAGS" CXXFLAGS="$CXXFLAGS -Wall" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "octave_cv_cxx_flag_$ac_safe=yes" else --- 6525,6544 ---- # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' ! ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_cxx_cross XCXXFLAGS="$CXXFLAGS" CXXFLAGS="$CXXFLAGS -Wall" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "octave_cv_cxx_flag_$ac_safe=yes" else *************** *** 6679,6685 **** # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' ! ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_cc_cross --- 6553,6559 ---- # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' ! ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_cc_cross *************** *** 6716,6722 **** ac_safe=`echo "$flag" | sed 'y%./+-%__p_%'` echo $ac_n "checking whether ${CC-cc} accepts $flag""... $ac_c" 1>&6 ! echo "configure:6720: checking whether ${CC-cc} accepts $flag" >&5 if eval "test \"`echo '$''{'octave_cv_cc_flag_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else --- 6590,6596 ---- ac_safe=`echo "$flag" | sed 'y%./+-%__p_%'` echo $ac_n "checking whether ${CC-cc} accepts $flag""... $ac_c" 1>&6 ! echo "configure:6594: checking whether ${CC-cc} accepts $flag" >&5 if eval "test \"`echo '$''{'octave_cv_cc_flag_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else *************** *** 6726,6745 **** # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' ! ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_cc_cross XCFLAGS="$CFLAGS" CFLAGS="$CFLAGS $flag" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "octave_cv_cc_flag_$ac_safe=yes" else --- 6600,6619 ---- # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' ! ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_cc_cross XCFLAGS="$CFLAGS" CFLAGS="$CFLAGS $flag" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "octave_cv_cc_flag_$ac_safe=yes" else *************** *** 6750,6762 **** fi rm -f conftest* CFLAGS="$XCFLAGS" ! ac_ext=c ! # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ! ac_cpp='$CPP $CPPFLAGS' ! ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' ! ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' ! cross_compiling=$ac_cv_prog_cc_cross ! fi --- 6624,6630 ---- fi rm -f conftest* CFLAGS="$XCFLAGS" ! fi *************** *** 6777,6783 **** ac_safe=`echo "$flag" | sed 'y%./+-%__p_%'` echo $ac_n "checking whether ${CXX-c++} accepts $flag""... $ac_c" 1>&6 ! echo "configure:6781: checking whether ${CXX-c++} accepts $flag" >&5 if eval "test \"`echo '$''{'octave_cv_cxx_flag_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else --- 6645,6651 ---- ac_safe=`echo "$flag" | sed 'y%./+-%__p_%'` echo $ac_n "checking whether ${CXX-c++} accepts $flag""... $ac_c" 1>&6 ! echo "configure:6649: checking whether ${CXX-c++} accepts $flag" >&5 if eval "test \"`echo '$''{'octave_cv_cxx_flag_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else *************** *** 6787,6806 **** # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' ! ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_cxx_cross XCXXFLAGS="$CXXFLAGS" CXXFLAGS="$CXXFLAGS $flag" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "octave_cv_cxx_flag_$ac_safe=yes" else --- 6655,6674 ---- # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' ! ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_cxx_cross XCXXFLAGS="$CXXFLAGS" CXXFLAGS="$CXXFLAGS $flag" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "octave_cv_cxx_flag_$ac_safe=yes" else *************** *** 6815,6821 **** # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' ! ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_cc_cross --- 6683,6689 ---- # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' ! ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_cc_cross *************** *** 6871,6877 **** # Ultrix sh set writes to stderr and can't be redirected directly, # and sets the high bit in the cache file unless we assign to the vars. (set) 2>&1 | ! case `(ac_space=' '; set | grep ac_space) 2>&1` in *ac_space=\ *) # `set' does not quote correctly, so add quotes (double-quote substitution # turns \\\\ into \\, and sed turns \\ into \). --- 6739,6745 ---- # Ultrix sh set writes to stderr and can't be redirected directly, # and sets the high bit in the cache file unless we assign to the vars. (set) 2>&1 | ! case `(ac_space=' '; set) 2>&1` in *ac_space=\ *) # `set' does not quote correctly, so add quotes (double-quote substitution # turns \\\\ into \\, and sed turns \\ into \). *************** *** 6938,6944 **** echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion" exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;; -version | --version | --versio | --versi | --vers | --ver | --ve | --v) ! echo "$CONFIG_STATUS generated by autoconf version 2.13" exit 0 ;; -help | --help | --hel | --he | --h) echo "\$ac_cs_usage"; exit 0 ;; --- 6806,6812 ---- echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion" exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;; -version | --version | --versio | --versi | --vers | --ver | --ve | --v) ! echo "$CONFIG_STATUS generated by autoconf version 2.12" exit 0 ;; -help | --help | --hel | --he | --h) echo "\$ac_cs_usage"; exit 0 ;; *************** *** 6971,6981 **** s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF $ac_vpsub $extrasub - s%@SHELL@%$SHELL%g s%@CFLAGS@%$CFLAGS%g s%@CPPFLAGS@%$CPPFLAGS%g s%@CXXFLAGS@%$CXXFLAGS%g - s%@FFLAGS@%$FFLAGS%g s%@DEFS@%$DEFS%g s%@LDFLAGS@%$LDFLAGS%g s%@LIBS@%$LIBS%g --- 6839,6847 ---- *************** *** 7038,7043 **** --- 6904,6910 ---- s%@F2C@%$F2C%g s%@FORTRAN_MAIN_FLAG@%$FORTRAN_MAIN_FLAG%g s%@FC@%$FC%g + s%@FFLAGS@%$FFLAGS%g s%@FLIBS@%$FLIBS%g s%@F2CFLAGS@%$F2CFLAGS%g /@f77_rules_frag@/r $f77_rules_frag *************** *** 7078,7085 **** s%@LN_S@%$LN_S%g s%@RUNTEST@%$RUNTEST%g s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g - s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g s%@INSTALL_DATA@%$INSTALL_DATA%g s%@DEFAULT_PAGER@%$DEFAULT_PAGER%g s%@GNUPLOT_BINARY@%$GNUPLOT_BINARY%g s%@EXE@%$EXE%g --- 6945,6952 ---- s%@LN_S@%$LN_S%g s%@RUNTEST@%$RUNTEST%g s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g s%@INSTALL_DATA@%$INSTALL_DATA%g + s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g s%@DEFAULT_PAGER@%$DEFAULT_PAGER%g s%@GNUPLOT_BINARY@%$GNUPLOT_BINARY%g s%@EXE@%$EXE%g diff -cNr octave-2.0.14/configure.in octave-2.0.15/configure.in *** octave-2.0.14/configure.in Thu Feb 4 15:20:14 1999 --- octave-2.0.15/configure.in Mon Nov 15 10:13:48 1999 *************** *** 241,247 **** OCTAVE_CC_FLAG(-mieee-fp, [ ieee_fp_flag=-mieee-fp XTRA_CFLAGS="$XTRA_CFLAGS -mieee-fp"]) - OCTAVE_CXX_FLAG(-mieee-fp, [ ieee_fp_flag=-mieee-fp XTRA_CXXFLAGS="$XTRA_CXXFLAGS -mieee-fp"]) --- 241,246 ---- *************** *** 255,264 **** XTRA_CXXFLAGS="$XTRA_CXXFLAGS -mieee-with-inexact"]) ;; *ibm-aix4*) ! OCTAVE_CC_FLAG(-mno-fp-in-toc, [ ! XTRA_CFLAGS="$XTRA_CFLAGS -mno-fp-in-toc"]) ! OCTAVE_CXX_FLAG(-mno-fp-in-toc, [ ! XTRA_CXXFLAGS="$XTRA_CXXFLAGS -mno-fp-in-toc"]) ;; esac --- 254,263 ---- XTRA_CXXFLAGS="$XTRA_CXXFLAGS -mieee-with-inexact"]) ;; *ibm-aix4*) ! OCTAVE_CC_FLAG(-mminimal-toc, [ ! XTRA_CFLAGS="$XTRA_CFLAGS -mminimal-toc"]) ! OCTAVE_CXX_FLAG(-mminimal-toc, [ ! XTRA_CXXFLAGS="$XTRA_CXXFLAGS -mminimal-toc"]) ;; esac *************** *** 377,385 **** fi case "$canonical_host_type" in alpha*-dec-osf*) ! if test "$octave_cv_f77_is_g77" = yes \ ! || test -z "$ieee_fp_flag"; then ! true else FFLAGS="-fpe1 $FFLAGS" fi --- 376,383 ---- fi case "$canonical_host_type" in alpha*-dec-osf*) ! if test "$octave_cv_f77_is_g77" = yes; then ! FFLAGS="$ieee_fp_flag $FFLAGS" else FFLAGS="-fpe1 $FFLAGS" fi *************** *** 678,699 **** AC_HEADER_TIME AC_HEADER_SYS_WAIT ### I'm told that termios.h is broken on NeXT systems. - TERMIOS_H=termios.h case "$canonical_host_type" in *-*-nextstep*) ! TERMIOS_H= ;; esac - AC_CHECK_HEADERS(assert.h curses.h dlfcn.h fcntl.h float.h \ - floatingpoint.h fnmatch.h glob.h grp.h ieeefp.h limits.h \ - memory.h nan.h ncurses.h pwd.h sgtty.h stdlib.h string.h \ - sys/param.h sys/resource.h sys/select.h sys/stat.h sys/time.h \ - sys/times.h sys/types.h sys/utsname.h termcap.h termio.h \ - $TERMIOS_H unistd.h varargs.h) - if test "$ac_cv_header_termios_h" = yes \ || test "$ac_cv_header_termio_h" = yes \ || test "$ac_cv_header_sgtty_h" = yes; then --- 676,699 ---- AC_HEADER_TIME AC_HEADER_SYS_WAIT + AC_CHECK_HEADERS(assert.h curses.h dlfcn.h fcntl.h float.h \ + floatingpoint.h fnmatch.h glob.h grp.h ieeefp.h limits.h \ + memory.h nan.h ncurses.h poll.h pwd.h sgtty.h stdlib.h string.h \ + sys/ioctl.h sys/param.h sys/poll.h sys/resource.h sys/select.h \ + sys/stat.h sys/time.h sys/times.h sys/types.h sys/utsname.h \ + termcap.h termio.h termios.h unistd.h varargs.h) + ### I'm told that termios.h is broken on NeXT systems. case "$canonical_host_type" in *-*-nextstep*) ! if test "$ac_cv_header_termios_h" = yes; then ! AC_MSG_WARN([Ignoring termios.h on NeXT systems.]) ! ac_cv_header_termios_h=no ! fi ;; esac if test "$ac_cv_header_termios_h" = yes \ || test "$ac_cv_header_termio_h" = yes \ || test "$ac_cv_header_sgtty_h" = yes; then *************** *** 747,753 **** fork getcwd getegid geteuid getgid getgrent getgrgid getgrnam \ gethostname getpgrp getpid getppid getpwent getpwnam getpwuid \ gettimeofday getuid getwd lstat memmove mkdir mkfifo on_exit pipe \ ! putenv rename rindex rmdir setgrent setpwent setvbuf sigaction \ sigpending sigprocmask sigsuspend stat strcasecmp strdup strerror \ stftime stricmp strncasecmp strnicmp tempnam umask unlink usleep \ vfprintf vsprintf waitpid) --- 747,753 ---- fork getcwd getegid geteuid getgid getgrent getgrgid getgrnam \ gethostname getpgrp getpid getppid getpwent getpwnam getpwuid \ gettimeofday getuid getwd lstat memmove mkdir mkfifo on_exit pipe \ ! putenv rename rindex rmdir select setgrent setpwent setvbuf sigaction \ sigpending sigprocmask sigsuspend stat strcasecmp strdup strerror \ stftime stricmp strncasecmp strnicmp tempnam umask unlink usleep \ vfprintf vsprintf waitpid) diff -cNr octave-2.0.14/doc/ChangeLog octave-2.0.15/doc/ChangeLog *** octave-2.0.14/doc/ChangeLog Wed Apr 14 12:55:53 1999 --- octave-2.0.15/doc/ChangeLog Mon Jan 10 18:04:06 2000 *************** *** 1,3 **** --- 1,14 ---- + 2000-01-10 John W. Eaton + + * Version 2.0.15 released. + + Fri Jun 18 23:17:02 1999 John W. Eaton + + * interpreter/Makefile.in (octave_toc.html): Add -expandinfo to + tex12html options. + * liboctave/Makefile.in (liboctave_toc.html): Likewise. + * faq/Makefile.in (Octave-FAQ_toc.html): Likewise. + Wed Apr 14 12:55:42 1999 John W. Eaton * Version 2.0.14 released. diff -cNr octave-2.0.14/doc/faq/Makefile.in octave-2.0.15/doc/faq/Makefile.in *** octave-2.0.14/doc/faq/Makefile.in Fri Oct 9 00:30:36 1998 --- octave-2.0.15/doc/faq/Makefile.in Fri Jun 18 23:16:35 1999 *************** *** 50,56 **** -dvips -o Octave-FAQ.ps Octave-FAQ.dvi Octave-FAQ_toc.html: ! -texi2html -split_chapter $(srcdir)/Octave-FAQ.texi check install uninstall: .PHONY: check install uninstall --- 50,56 ---- -dvips -o Octave-FAQ.ps Octave-FAQ.dvi Octave-FAQ_toc.html: ! -texi2html -expandinfo -split_chapter $(srcdir)/Octave-FAQ.texi check install uninstall: .PHONY: check install uninstall diff -cNr octave-2.0.14/doc/faq/Octave-FAQ.texi octave-2.0.15/doc/faq/Octave-FAQ.texi *** octave-2.0.14/doc/faq/Octave-FAQ.texi Sat Feb 14 01:54:44 1998 --- octave-2.0.15/doc/faq/Octave-FAQ.texi Wed Oct 13 17:07:02 1999 *************** *** 494,500 **** gnu@@gnu.org, phone (617) 542-5942 or anonymous ftp the file @file{/pub/gnu/GNUinfo/ORDERS} from ftp.gnu.org. ! @cindex FSF, contact @cindex GNUware, anonymous FTP sites If you are on the Internet, you can copy the latest distribution --- 494,500 ---- gnu@@gnu.org, phone (617) 542-5942 or anonymous ftp the file @file{/pub/gnu/GNUinfo/ORDERS} from ftp.gnu.org. ! @cindex FSF, contact @cindex GNUware, anonymous FTP sites If you are on the Internet, you can copy the latest distribution diff -cNr octave-2.0.14/doc/interpreter/Makefile.in octave-2.0.15/doc/interpreter/Makefile.in *** octave-2.0.14/doc/interpreter/Makefile.in Fri Oct 9 00:29:28 1998 --- octave-2.0.15/doc/interpreter/Makefile.in Fri Jun 18 23:15:51 1999 *************** *** 79,85 **** mv BUGS ../../BUGS octave_toc.html: ! -texi2html -split_chapter -I$(srcdir)/.. $(srcdir)/octave.texi check: all .PHONY: check --- 79,86 ---- mv BUGS ../../BUGS octave_toc.html: ! -texi2html -expandinfo -split_chapter -I$(srcdir)/.. \ ! $(srcdir)/octave.texi check: all .PHONY: check diff -cNr octave-2.0.14/doc/interpreter/arith.texi octave-2.0.15/doc/interpreter/arith.texi *** octave-2.0.14/doc/interpreter/arith.texi Thu Feb 19 01:50:53 1998 --- octave-2.0.15/doc/interpreter/arith.texi Mon Sep 20 11:10:35 1999 *************** *** 300,306 **** @node Trigonometry, Sums and Products, Complex Arithmetic, Arithmetic @section Trigonometry ! Octave provides the following trigonometric functions: @deftypefn {Mapping Function} {} sin (@var{z}) @deftypefnx {Mapping Function} {} cos (@var{z}) --- 300,316 ---- @node Trigonometry, Sums and Products, Complex Arithmetic, Arithmetic @section Trigonometry ! Octave provides the following trigonometric functions. Angles are ! specified in radians. To convert from degrees to radians multipy by ! @iftex ! @tex ! $\pi/180$ ! @end tex ! @end iftex ! @ifinfo ! @code{pi/180} ! @end ifinfo ! (e.g. @code{sin (30 * pi/180)} returns the sine of 30 degrees). @deftypefn {Mapping Function} {} sin (@var{z}) @deftypefnx {Mapping Function} {} cos (@var{z}) diff -cNr octave-2.0.14/doc/interpreter/basics.texi octave-2.0.15/doc/interpreter/basics.texi *** octave-2.0.14/doc/interpreter/basics.texi Wed Oct 14 23:44:27 1998 --- octave-2.0.15/doc/interpreter/basics.texi Thu Jun 24 11:02:17 1999 *************** *** 217,223 **** @code{"@value{OCTAVEHOME}/bin/octave"}, and @code{program_name} would have the value @code{"octave"}. ! If executing a script from the command line (e.g., @code{octave foo.m} or using an executable Octave script, the program name is set to the name of the script. @xref{Executable Octave Programs} for an example of how to create an executable Octave script. --- 217,223 ---- @code{"@value{OCTAVEHOME}/bin/octave"}, and @code{program_name} would have the value @code{"octave"}. ! If executing a script from the command line (e.g., @code{octave foo.m}) or using an executable Octave script, the program name is set to the name of the script. @xref{Executable Octave Programs} for an example of how to create an executable Octave script. *************** *** 889,895 **** @end deffn @defvr {Built-in Variable} echo_executing_commands ! This variable is may also be used to control the echo state. It may be the sum of the following values: @table @asis --- 889,895 ---- @end deffn @defvr {Built-in Variable} echo_executing_commands ! This variable may also be used to control the echo state. It may be the sum of the following values: @table @asis *************** *** 940,946 **** case, Octave generated an error message because the keyword @code{function} was misspelled. Instead of seeing @samp{function f}, Octave saw two consecutive variable names, which is invalid in this ! context. It marked the error at the @code{y} because the first name by itself was accepted as valid input. Another class of error message occurs at evaluation time. These --- 940,946 ---- case, Octave generated an error message because the keyword @code{function} was misspelled. Instead of seeing @samp{function f}, Octave saw two consecutive variable names, which is invalid in this ! context. It marked the error at @code{y} because the first name by itself was accepted as valid input. Another class of error message occurs at evaluation time. These *************** *** 973,981 **** In the example above, the first line indicates that a variable named @samp{x} was found to be undefined near line 1 and column 24 of some function or expression. For errors occurring within functions, lines ! from the beginning of the file containing the function definition. For ! errors occurring at the top level, the line number indicates the input ! line number, which is usually displayed in the prompt string. The second and third lines in the example indicate that the error occurred within an assignment expression, and the last line of the error --- 973,982 ---- In the example above, the first line indicates that a variable named @samp{x} was found to be undefined near line 1 and column 24 of some function or expression. For errors occurring within functions, lines ! are counted from the beginning of the file containing the function ! definition. For errors occurring at the top level, the line number ! indicates the input line number, which is usually displayed in the ! prompt string. The second and third lines in the example indicate that the error occurred within an assignment expression, and the last line of the error diff -cNr octave-2.0.14/doc/interpreter/data.texi octave-2.0.15/doc/interpreter/data.texi *** octave-2.0.14/doc/interpreter/data.texi Wed Sep 10 16:01:56 1997 --- octave-2.0.15/doc/interpreter/data.texi Tue May 4 10:02:12 1999 *************** *** 73,79 **** Matrix objects can be of any size, and can be dynamically reshaped and resized. It is easy to extract individual rows, columns, or submatrices ! is using a variety of powerful indexing features. @xref{Index Expressions}. @xref{Numeric Data Types}, for more information. --- 73,79 ---- Matrix objects can be of any size, and can be dynamically reshaped and resized. It is easy to extract individual rows, columns, or submatrices ! using a variety of powerful indexing features. @xref{Index Expressions}. @xref{Numeric Data Types}, for more information. diff -cNr octave-2.0.14/doc/interpreter/diffeq.texi octave-2.0.15/doc/interpreter/diffeq.texi *** octave-2.0.14/doc/interpreter/diffeq.texi Wed Sep 10 16:01:56 1997 --- octave-2.0.15/doc/interpreter/diffeq.texi Thu Jun 24 10:57:02 1999 *************** *** 20,26 **** @node Ordinary Differential Equations, Differential-Algebraic Equations, Differential Equations, Differential Equations @section Ordinary Differential Equations ! The function @code{lsode} can be used Solve ODEs of the form @iftex @tex $$ --- 20,26 ---- @node Ordinary Differential Equations, Differential-Algebraic Equations, Differential Equations, Differential Equations @section Ordinary Differential Equations ! The function @code{lsode} can be used to solve ODEs of the form @iftex @tex $$ *************** *** 122,128 **** @node Differential-Algebraic Equations, , Ordinary Differential Equations, Differential Equations @section Differential-Algebraic Equations ! The function @code{dassl} can be used Solve DAEs of the form @iftex @tex $$ --- 122,128 ---- @node Differential-Algebraic Equations, , Ordinary Differential Equations, Differential Equations @section Differential-Algebraic Equations ! The function @code{dassl} can be used to solve DAEs of the form @iftex @tex $$ diff -cNr octave-2.0.14/doc/interpreter/emacs.texi octave-2.0.15/doc/interpreter/emacs.texi *** octave-2.0.14/doc/interpreter/emacs.texi Fri Dec 4 17:07:02 1998 --- octave-2.0.15/doc/interpreter/emacs.texi Fri Sep 3 00:40:45 1999 *************** *** 345,351 **** Octave. Customization of Octave mode can be performed by modification of the ! variable @code{octave-mode-hook}. It the value of this variable is non-@code{nil}, turning on Octave mode calls its value. If you discover a problem with Octave mode, you can conveniently send a --- 345,351 ---- Octave. Customization of Octave mode can be performed by modification of the ! variable @code{octave-mode-hook}. If the value of this variable is non-@code{nil}, turning on Octave mode calls its value. If you discover a problem with Octave mode, you can conveniently send a diff -cNr octave-2.0.14/doc/interpreter/image.texi octave-2.0.15/doc/interpreter/image.texi *** octave-2.0.14/doc/interpreter/image.texi Wed Sep 10 16:01:56 1997 --- octave-2.0.15/doc/interpreter/image.texi Thu Sep 9 19:49:07 1999 *************** *** 34,40 **** @deftypefn {Function File} {} gray (@var{n}) Return a gray colormap with @var{n} entries corresponding to values from ! 0 to @var{n}. The argument @var{n} should be a scalar. If it is omitted, 64 is assumed. @end deftypefn --- 34,40 ---- @deftypefn {Function File} {} gray (@var{n}) Return a gray colormap with @var{n} entries corresponding to values from ! 0 to @var{n}-1. The argument @var{n} should be a scalar. If it is omitted, 64 is assumed. @end deftypefn diff -cNr octave-2.0.14/doc/interpreter/io.texi octave-2.0.15/doc/interpreter/io.texi *** octave-2.0.14/doc/interpreter/io.texi Wed Apr 14 12:52:51 1999 --- octave-2.0.15/doc/interpreter/io.texi Fri May 28 15:42:17 1999 *************** *** 621,630 **** @subsection Line-Oriented Input @deftypefn {Built-in Function} {} fgetl (@var{fid}, @var{len}) ! Read characters from a file, stopping at the first newline character ! that is encountered or after @var{len} characters have been read, and ! returning the characters as a string. The newline is not included in ! the returned value. If @var{len} is omitted, @code{fgetl} reads until the next newline character. --- 621,629 ---- @subsection Line-Oriented Input @deftypefn {Built-in Function} {} fgetl (@var{fid}, @var{len}) ! Read characters from a file, stopping after a newline, or EOF, ! or @var{len} characters have been read. The characters read, excluding ! the possible trailing newline, are returned as a string. If @var{len} is omitted, @code{fgetl} reads until the next newline character. *************** *** 633,642 **** @end deftypefn @deftypefn {Built-in Function} {} fgets (@var{fid}, @var{len}) ! Read characters from a file, stopping at the first newline character ! that is encountered or after @var{len} characters have been read, and ! returning the characters as a string. The newline is included in the ! returned value. If @var{len} is omitted, @code{fgets} reads until the next newline character. --- 632,640 ---- @end deftypefn @deftypefn {Built-in Function} {} fgets (@var{fid}, @var{len}) ! Read characters from a file, stopping after a newline, or EOF, ! or @var{len} characters have been read. The characters read, including ! the possible trailing newline, are returned as a string. If @var{len} is omitted, @code{fgets} reads until the next newline character. *************** *** 1166,1172 **** read for this specification. When @code{scanf} finds a conversion specification that uses this flag, it reads input as directed by the rest of the conversion specification, but it discards this input, does ! not use a pointer argument, and does not increment the count of successful assignments. @cindex flag character (@code{scanf}) --- 1164,1170 ---- read for this specification. When @code{scanf} finds a conversion specification that uses this flag, it reads input as directed by the rest of the conversion specification, but it discards this input, does ! not return any valu, and does not increment the count of successful assignments. @cindex flag character (@code{scanf}) *************** *** 1175,1182 **** width}. Reading of characters from the input stream stops either when this maximum is reached or when a non-matching character is found, whichever happens first. Most conversions discard initial whitespace ! characters (those that don't are explicitly documented), and these ! discarded characters don't count towards the maximum field width. @cindex maximum field width (@code{scanf}) @item --- 1173,1181 ---- width}. Reading of characters from the input stream stops either when this maximum is reached or when a non-matching character is found, whichever happens first. Most conversions discard initial whitespace ! characters, and these discarded characters don't count towards the ! maximum field width. Conversions that do not discard initial whitespace ! are explicitly documented. @cindex maximum field width (@code{scanf}) @item diff -cNr octave-2.0.14/doc/interpreter/preface.texi octave-2.0.15/doc/interpreter/preface.texi *** octave-2.0.14/doc/interpreter/preface.texi Thu Oct 29 18:52:19 1998 --- octave-2.0.15/doc/interpreter/preface.texi Wed Oct 13 17:06:51 1999 *************** *** 85,91 **** C-style input and output functions. @item ! Brian Fox @email{bfox@@gnu.ai.mit.edu} wrote the @code{readline} library used for command history editing, and the portion of this manual that documents it. --- 85,91 ---- C-style input and output functions. @item ! Brian Fox @email{bfox@@gnu.org} wrote the @code{readline} library used for command history editing, and the portion of this manual that documents it. diff -cNr octave-2.0.14/doc/liboctave/Makefile.in octave-2.0.15/doc/liboctave/Makefile.in *** octave-2.0.14/doc/liboctave/Makefile.in Fri Oct 9 00:30:13 1998 --- octave-2.0.15/doc/liboctave/Makefile.in Fri Jun 18 23:16:20 1999 *************** *** 54,60 **** -dvips -o liboctave.ps liboctave.dvi liboctave_toc.html: ! -texi2html -split_chapter -I$(srcdir)/.. $(srcdir)/liboctave.texi check: .PHONY: check --- 54,61 ---- -dvips -o liboctave.ps liboctave.dvi liboctave_toc.html: ! -texi2html -expandinfo -split_chapter -I$(srcdir)/.. \ ! $(srcdir)/liboctave.texi check: .PHONY: check diff -cNr octave-2.0.14/doc/texinfo.tex octave-2.0.15/doc/texinfo.tex *** octave-2.0.14/doc/texinfo.tex Tue May 20 14:42:56 1997 --- octave-2.0.15/doc/texinfo.tex Wed Oct 13 17:06:47 1999 *************** *** 25,31 **** %what you give them. Help stamp out software-hoarding! ! % Send bug reports to bug-texinfo@prep.ai.mit.edu. % Please include a *precise* test case in each bug report. --- 25,31 ---- %what you give them. Help stamp out software-hoarding! ! % Send bug reports to bug-texinfo@gnu.org. % Please include a *precise* test case in each bug report. *************** *** 778,784 **** \immediate\write16{If you are running another version of TeX, relax.} \immediate\write16{If you are running Unix TeX 3.0, kill this TeX process.} \immediate\write16{ Then upgrade your TeX installation if you can.} ! \immediate\write16{ (See ftp://ftp.gnu.ai.mit.edu/pub/gnu/TeX.README.)} \immediate\write16{If you are stuck with version 3.0, run the} \immediate\write16{ script ``tex3patch'' from the Texinfo distribution} \immediate\write16{ to use a workaround.} --- 778,784 ---- \immediate\write16{If you are running another version of TeX, relax.} \immediate\write16{If you are running Unix TeX 3.0, kill this TeX process.} \immediate\write16{ Then upgrade your TeX installation if you can.} ! \immediate\write16{ (See ftp://ftp.gnu.org/pub/gnu/TeX.README.)} \immediate\write16{If you are stuck with version 3.0, run the} \immediate\write16{ script ``tex3patch'' from the Texinfo distribution} \immediate\write16{ to use a workaround.} diff -cNr octave-2.0.14/emacs/Makefile.in octave-2.0.15/emacs/Makefile.in *** octave-2.0.14/emacs/Makefile.in Wed Nov 18 00:09:28 1998 --- octave-2.0.15/emacs/Makefile.in Tue Oct 26 17:49:47 1999 *************** *** 19,34 **** INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_DATA = @INSTALL_DATA@ ! EL_FILES = octave-hlp.el octave-inf.el octave-mod.el ! ! ELC_FILES = octave-hlp.elc octave-inf.elc octave-mod.elc SOURCES = $(EL_FILES) otags ! DISTFILES = Makefile.in $(EL_FILES) $(ELC_FILES) otags NEWS TODO ! BINDISTFILES = \ ! $(addprefix $(srcdir)/, $(EL_FILES) $(ELC_FILES) otags NEWS TODO) all: .PHONY: all --- 19,31 ---- INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_DATA = @INSTALL_DATA@ ! EL_FILES = octave-hlp.el octave-inf.el octave-mod.el custom-old.el SOURCES = $(EL_FILES) otags ! DISTFILES = Makefile.in $(EL_FILES) otags NEWS TODO README ! BINDISTFILES = $(addprefix $(srcdir)/, $(EL_FILES) otags NEWS TODO README) all: .PHONY: all diff -cNr octave-2.0.14/emacs/README octave-2.0.15/emacs/README *** octave-2.0.14/emacs/README Wed Dec 31 18:00:00 1969 --- octave-2.0.15/emacs/README Tue Oct 26 17:46:48 1999 *************** *** 0 **** --- 1,20 ---- + These lisp files should work under recent versions (19 onwards) of + both Emacs and XEmacs. See the Octave documentation (info node + `Emacs') on how to install and use these packages. + + These files use the custom package so that user variables can be + changed easily. The custom package has been included in Emacs since + around version 19.34. If you have an old version of Emacs without the + custom package, you should get the following error when trying to load + the octave files: + + Cannot open load file: custom + + In this case, you should use the simple replacement custom library + here, renaming it to custom.el so that Emacs can find it: + + % mv custom-old.el custom.el + + But remember when you upgrade Emacs to version 20 and beyond, you + should delete this primitive custom file and use the built-in version + instead. diff -cNr octave-2.0.14/emacs/custom-old.el octave-2.0.15/emacs/custom-old.el *** octave-2.0.14/emacs/custom-old.el Wed Dec 31 18:00:00 1969 --- octave-2.0.15/emacs/custom-old.el Tue Oct 26 17:46:48 1999 *************** *** 0 **** --- 1,17 ---- + ;;; custom.el --- Primitive custom library. + + ;; Use this file only if you are using an old version of Emacs that + ;; does not come with the custom package. + + ;; Set up the custom library. + ;; taken from http://www.dina.kvl.dk/~abraham/custom/ + + (if (and (featurep 'custom) (fboundp 'custom-declare-variable)) + nil ;; We've got what we needed + ;; We have the old custom-library, hack around it! + (defmacro defgroup (&rest args) + nil) + (defmacro defcustom (var value doc &rest args) + (` (defvar (, var) (, value) (, doc))))) + + (provide 'custom) diff -cNr octave-2.0.14/emacs/octave-hlp.el octave-2.0.15/emacs/octave-hlp.el *** octave-2.0.14/emacs/octave-hlp.el Wed Sep 10 15:57:05 1997 --- octave-2.0.15/emacs/octave-hlp.el Tue Oct 26 17:46:48 1999 *************** *** 1,6 **** ! ;; octave-hlp.el --- getting help on Octave symbols using info ! ;;; Copyright (C) 1997 Free Software Foundation, Inc. ;; Author: Kurt Hornik ;; Author: John Eaton --- 1,6 ---- ! ;;; octave-hlp.el --- getting help on Octave symbols using info ! ;; Copyright (C) 1997 Free Software Foundation, Inc. ;; Author: Kurt Hornik ;; Author: John Eaton diff -cNr octave-2.0.14/emacs/octave-inf.el octave-2.0.15/emacs/octave-inf.el *** octave-2.0.14/emacs/octave-inf.el Fri Oct 2 14:25:07 1998 --- octave-2.0.15/emacs/octave-inf.el Tue Oct 26 17:46:48 1999 *************** *** 1,6 **** ! ;; octave-inf.el --- running Octave as an inferior Emacs process ! ;;; Copyright (C) 1997 Free Software Foundation, Inc. ;; Author: Kurt Hornik ;; Author: John Eaton --- 1,6 ---- ! ;;; octave-inf.el --- running Octave as an inferior Emacs process ! ;; Copyright (C) 1997 Free Software Foundation, Inc. ;; Author: Kurt Hornik ;; Author: John Eaton *************** *** 29,50 **** (require 'octave-mod) (require 'comint) ! (defvar inferior-octave-program "octave" ! "*Program invoked by `inferior-octave'.") ! (defvar inferior-octave-prompt "\\(^octave\\(\\|.bin\\)\\(:[0-9]+\\)?\\|^debug\\|^\\)>+ " ! "*Regexp to match prompts for the inferior Octave process.") ! (defvar inferior-octave-startup-file nil "*Name of the inferior Octave startup file. The contents of this file are sent to the inferior Octave process on ! startup.") ! (defvar inferior-octave-startup-args '("-i") "*List of command line arguments for the inferior Octave process. For example, for suppressing the startup message and using `traditional' ! mode, set this to (\"-q\" \"--traditional\").") (defvar inferior-octave-mode-map nil "Keymap used in Inferior Octave mode.") --- 29,63 ---- (require 'octave-mod) (require 'comint) ! (defgroup octave-inferior nil ! "Running Octave as an inferior Emacs process." ! :group 'octave) ! ! (defcustom inferior-octave-program "octave" ! "*Program invoked by `inferior-octave'." ! :type 'string ! :group 'octave-inferior) ! (defcustom inferior-octave-prompt "\\(^octave\\(\\|.bin\\)\\(:[0-9]+\\)?\\|^debug\\|^\\)>+ " ! "*Regexp to match prompts for the inferior Octave process." ! :type 'regexp ! :group 'octave-inferior) ! (defcustom inferior-octave-startup-file nil "*Name of the inferior Octave startup file. The contents of this file are sent to the inferior Octave process on ! startup." ! :type '(choice (const :tag "None" nil) ! file) ! :group 'octave-inferior) ! (defcustom inferior-octave-startup-args nil "*List of command line arguments for the inferior Octave process. For example, for suppressing the startup message and using `traditional' ! mode, set this to (\"-q\" \"--traditional\")." ! :type '(repeat string) ! :group 'octave-inferior) (defvar inferior-octave-mode-map nil "Keymap used in Inferior Octave mode.") *************** *** 69,76 **** (modify-syntax-entry ?\n ">" table) (setq inferior-octave-mode-syntax-table table))) ! (defvar inferior-octave-mode-hook nil ! "*Hook to be run when Inferior Octave mode is started.") (defvar inferior-octave-font-lock-keywords (list --- 82,91 ---- (modify-syntax-entry ?\n ">" table) (setq inferior-octave-mode-syntax-table table))) ! (defcustom inferior-octave-mode-hook nil ! "*Hook to be run when Inferior Octave mode is started." ! :type 'hook ! :group 'octave-inferior) (defvar inferior-octave-font-lock-keywords (list *************** *** 167,173 **** (substring inferior-octave-buffer 1 -1) inferior-octave-buffer inferior-octave-program ! inferior-octave-startup-args))) (set-process-filter proc 'inferior-octave-output-digest) (setq comint-ptyp process-connection-type inferior-octave-process proc --- 182,189 ---- (substring inferior-octave-buffer 1 -1) inferior-octave-buffer inferior-octave-program ! (append (list "-i" "--no-line-editing") ! inferior-octave-startup-args)))) (set-process-filter proc 'inferior-octave-output-digest) (setq comint-ptyp process-connection-type inferior-octave-process proc *************** *** 336,344 **** (defun inferior-octave-directory-tracker (string) "Tracks `cd' commands issued to the inferior Octave process. Use \\[inferior-octave-resync-dirs] to resync if Emacs gets confused." ! (if (string-match "^[ \t]*cd[ \t]*\\([^ \t\n;]*\\)[ \t\n;]" ! string) ! (cd (substring string (match-beginning 1) (match-end 1))))) (defun inferior-octave-resync-dirs () "Resync the buffer's idea of the current directory. --- 352,362 ---- (defun inferior-octave-directory-tracker (string) "Tracks `cd' commands issued to the inferior Octave process. Use \\[inferior-octave-resync-dirs] to resync if Emacs gets confused." ! (cond ! ((string-match "^[ \t]*cd[ \t;]*$" string) ! (cd "~")) ! ((string-match "^[ \t]*cd[ \t]+\\([^ \t\n;]*\\)[ \t\n;]*" string) ! (cd (substring string (match-beginning 1) (match-end 1)))))) (defun inferior-octave-resync-dirs () "Resync the buffer's idea of the current directory. diff -cNr octave-2.0.14/emacs/octave-mod.el octave-2.0.15/emacs/octave-mod.el *** octave-2.0.14/emacs/octave-mod.el Fri Dec 4 11:09:06 1998 --- octave-2.0.15/emacs/octave-mod.el Tue Oct 26 17:46:48 1999 *************** *** 1,6 **** ! ;; octave-mod.el --- editing Octave source files under Emacs ! ;;; Copyright (C) 1997 Free Software Foundation, Inc. ;; Author: Kurt Hornik ;; Author: John Eaton --- 1,6 ---- ! ;;; octave-mod.el --- editing Octave source files under Emacs ! ;; Copyright (C) 1997 Free Software Foundation, Inc. ;; Author: Kurt Hornik ;; Author: John Eaton *************** *** 40,48 **** ;; `run-octave' for further information on usage and customization. ;;; Code: (defconst octave-maintainer-address ! "Kurt Hornik , bug-gnu-emacs@prep.ai.mit.edu" "Current maintainer of the Emacs Octave package.") (defvar octave-abbrev-table nil --- 40,57 ---- ;; `run-octave' for further information on usage and customization. ;;; Code: + (require 'custom) + + (defgroup octave nil + "Major mode for editing Octave source files." + :group 'languages) + + (defvar inferior-octave-output-list nil) + (defvar inferior-octave-output-string nil) + (defvar inferior-octave-receive-in-progress nil) (defconst octave-maintainer-address ! "Kurt Hornik , bug-gnu-emacs@gnu.org" "Current maintainer of the Emacs Octave package.") (defvar octave-abbrev-table nil *************** *** 167,173 **** 'font-lock-keyword-face) ;; Fontify all builtin operators. (cons "\\(&\\||\\|<=\\|>=\\|==\\|<\\|>\\|!=\\|!\\)" ! 'font-lock-reference-face) ;; Fontify all builtin variables. (cons (concat "\\<\\(" (mapconcat 'identity octave-variables "\\|") --- 176,182 ---- 'font-lock-keyword-face) ;; Fontify all builtin operators. (cons "\\(&\\||\\|<=\\|>=\\|==\\|<\\|>\\|!=\\|!\\)" ! 'font-lock-builtin-face) ;; Fontify all builtin variables. (cons (concat "\\<\\(" (mapconcat 'identity octave-variables "\\|") *************** *** 179,186 **** '(3 font-lock-function-name-face nil t))) "Additional Octave expressions to highlight.") ! (defvar inferior-octave-buffer "*Inferior Octave*" ! "*Name of buffer for running an inferior Octave process.") (defvar inferior-octave-process nil) --- 188,197 ---- '(3 font-lock-function-name-face nil t))) "Additional Octave expressions to highlight.") ! (defcustom inferior-octave-buffer "*Inferior Octave*" ! "*Name of buffer for running an inferior Octave process." ! :type 'string ! :group 'octave-inferior) (defvar inferior-octave-process nil) *************** *** 295,312 **** (modify-syntax-entry ?\n ">" table) (setq octave-mode-syntax-table table))) ! (defvar octave-auto-indent nil ! "*Non-nil means indent line after a semicolon or space in Octave mode.") ! ! (defvar octave-auto-newline nil ! "*Non-nil means insert newline after a semicolon in Octave mode.") ! (defvar octave-blink-matching-block t "*Control the blinking of matching Octave block keywords. Non-nil means show matching begin of block when inserting a space, ! newline or semicolon after an else or end keyword.") ! (defvar octave-block-offset 2 ! "*Extra indentation applied to statements in Octave block structures.") (defvar octave-block-begin-regexp (concat "\\<\\(" --- 306,331 ---- (modify-syntax-entry ?\n ">" table) (setq octave-mode-syntax-table table))) ! (defcustom octave-auto-indent nil ! "*Non-nil means indent line after a semicolon or space in Octave mode." ! :type 'boolean ! :group 'octave) ! ! (defcustom octave-auto-newline nil ! "*Non-nil means automatically newline after a semicolon in Octave mode." ! :type 'boolean ! :group 'octave) ! (defcustom octave-blink-matching-block t "*Control the blinking of matching Octave block keywords. Non-nil means show matching begin of block when inserting a space, ! newline or semicolon after an else or end keyword." ! :type 'boolean ! :group 'octave) ! (defcustom octave-block-offset 2 ! "*Extra indentation applied to statements in Octave block structures." ! :type 'integer ! :group 'octave) (defvar octave-block-begin-regexp (concat "\\<\\(" *************** *** 341,352 **** (concat (make-string 2 octave-comment-char) " ") "String to insert to start a new Octave comment on an empty line.") ! (defvar octave-continuation-offset 4 ! "*Extra indentation applied to Octave continuation lines.") (defvar octave-continuation-regexp "[^#%\n]*\\(\\\\\\|\\.\\.\\.\\)\\s-*\\(\\s<.*\\)?$") ! (defvar octave-continuation-string "\\" ! "*Character string used for Octave continuation lines. Normally \\.") (defvar octave-completion-alist nil "Alist of Octave symbols for completion in Octave mode. --- 360,375 ---- (concat (make-string 2 octave-comment-char) " ") "String to insert to start a new Octave comment on an empty line.") ! (defcustom octave-continuation-offset 4 ! "*Extra indentation applied to Octave continuation lines." ! :type 'integer ! :group 'octave) (defvar octave-continuation-regexp "[^#%\n]*\\(\\\\\\|\\.\\.\\.\\)\\s-*\\(\\s<.*\\)?$") ! (defcustom octave-continuation-string "\\" ! "*Character string used for Octave continuation lines. Normally \\." ! :type 'string ! :group 'octave) (defvar octave-completion-alist nil "Alist of Octave symbols for completion in Octave mode. *************** *** 360,378 **** (list nil octave-function-header-regexp 3)) "Imenu expression for Octave mode. See `imenu-generic-expression'.") ! (defvar octave-mode-startup-message t ! "*Nil means do not display the Octave mode startup message.") ! ! (defvar octave-mode-hook nil ! "*Hook to be run when Octave mode is started.") ! ! (defvar octave-send-show-buffer t ! "*Non-nil means display `inferior-octave-buffer' after sending to it.") ! (defvar octave-send-line-auto-forward t "*Control auto-forward after sending to the inferior Octave process. ! Non-nil means always go to the next Octave code line after sending.") ! (defvar octave-send-echo-input t ! "*Non-nil means echo input sent to the inferior Octave process.") ;;;###autoload --- 383,411 ---- (list nil octave-function-header-regexp 3)) "Imenu expression for Octave mode. See `imenu-generic-expression'.") ! (defcustom octave-mode-startup-message t ! "*Nil means do not display the Octave mode startup message." ! :type 'boolean ! :group 'octave) ! ! (defcustom octave-mode-hook nil ! "*Hook to be run when Octave mode is started." ! :type 'hook ! :group 'octave) ! ! (defcustom octave-send-show-buffer t ! "*Non-nil means display `inferior-octave-buffer' after sending to it." ! :type 'boolean ! :group 'octave) ! (defcustom octave-send-line-auto-forward t "*Control auto-forward after sending to the inferior Octave process. ! Non-nil means always go to the next Octave code line after sending." ! :type 'boolean ! :group 'octave) ! (defcustom octave-send-echo-input t ! "*Non-nil means echo input sent to the inferior Octave process." ! :type 'boolean ! :group 'octave) ;;;###autoload *************** *** 511,520 **** (setq font-lock-defaults '(octave-font-lock-keywords nil nil)) (make-local-variable 'imenu-generic-expression) ! (setq imenu-generic-expression octave-mode-imenu-generic-expression) ! ! (make-local-variable 'comment-multi-line) ! (setq comment-multi-line nil) (octave-add-octave-menu) (octave-initialize-completions) --- 544,551 ---- (setq font-lock-defaults '(octave-font-lock-keywords nil nil)) (make-local-variable 'imenu-generic-expression) ! (setq imenu-generic-expression octave-mode-imenu-generic-expression ! imenu-case-fold-search nil) (octave-add-octave-menu) (octave-initialize-completions) diff -cNr octave-2.0.14/examples/make_int.cc octave-2.0.15/examples/make_int.cc *** octave-2.0.14/examples/make_int.cc Sat Oct 12 14:43:12 1996 --- octave-2.0.15/examples/make_int.cc Thu Sep 2 16:23:17 1999 *************** *** 85,92 **** bool is_defined (void) const { return true; } bool is_real_scalar (void) const { return true; } ! octave_value all (void) const { return (scalar != 0); } ! octave_value any (void) const { return (scalar != 0); } bool is_real_type (void) const { return true; } bool is_scalar_type (void) const { return true; } --- 85,92 ---- bool is_defined (void) const { return true; } bool is_real_scalar (void) const { return true; } ! octave_value all (void) const { return (double) (scalar != 0); } ! octave_value any (void) const { return (double) (scalar != 0); } bool is_real_type (void) const { return true; } bool is_scalar_type (void) const { return true; } *************** *** 111,129 **** ComplexMatrix complex_matrix_value (bool = false) const { return ComplexMatrix (1, 1, Complex (scalar)); } ! octave_value not (void) const { return octave_value (! scalar); } ! octave_value uminus (void) const { return octave_value (- scalar); } ! octave_value transpose (void) const { return octave_value (scalar); } ! octave_value hermitian (void) const { return octave_value (scalar); } void increment (void) { ++scalar; } void decrement (void) { --scalar; } ! void print (ostream& os); int type_id (void) const { return t_id; } --- 111,129 ---- ComplexMatrix complex_matrix_value (bool = false) const { return ComplexMatrix (1, 1, Complex (scalar)); } ! octave_value not (void) const { return octave_value ((double) ! scalar); } ! octave_value uminus (void) const { return new octave_integer (- scalar); } ! octave_value transpose (void) const { return new octave_integer (scalar); } ! octave_value hermitian (void) const { return new octave_integer (scalar); } void increment (void) { ++scalar; } void decrement (void) { --scalar; } ! void print (ostream& os, bool pr_as_read_syntax = false); int type_id (void) const { return t_id; } *************** *** 148,156 **** const string octave_integer::t_name ("integer"); void ! octave_integer::print (ostream& os) { ! octave_print_internal (os, scalar, false); } // integer by integer ops. --- 148,156 ---- const string octave_integer::t_name ("integer"); void ! octave_integer::print (ostream& os, bool pr_as_read_syntax) { ! octave_print_internal (os, scalar, pr_as_read_syntax); } // integer by integer ops. diff -cNr octave-2.0.14/glob/COPYING.LIB octave-2.0.15/glob/COPYING.LIB *** octave-2.0.14/glob/COPYING.LIB Thu Jul 18 21:45:49 1996 --- octave-2.0.15/glob/COPYING.LIB Wed Oct 13 16:32:55 1999 *************** *** 2,8 **** Version 2, June 1991 Copyright (C) 1991 Free Software Foundation, Inc. ! 675 Mass Ave, Cambridge, MA 02139, USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. --- 2,8 ---- Version 2, June 1991 Copyright (C) 1991 Free Software Foundation, Inc. ! 59 Temple Place, Suite 330, Boston, MA 02111 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. *************** *** 464,470 **** You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free ! Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. Also add information on how to contact you by electronic and paper mail. --- 464,470 ---- You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free ! Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA. Also add information on how to contact you by electronic and paper mail. diff -cNr octave-2.0.14/glob/Makefile.in octave-2.0.15/glob/Makefile.in *** octave-2.0.14/glob/Makefile.in Wed Feb 26 13:30:45 1997 --- octave-2.0.15/glob/Makefile.in Thu Sep 2 21:43:54 1999 *************** *** 55,69 **** $(DEFS) $(CPPFLAGS) $(CFLAGS) $< $(OUTPUT_OPTION) .PHONY: clean maintainer-clean glob-clean glob-maintainer-clean distclean ! clean glob-clean distclean glob-maintainer-clean:: -rm -f libglob.a *.o core ! distclean glob-maintainer-clean:: -rm -f TAGS tags Makefile config.status config.cache \ config.h config.log ! maintainer-clean:: ! -rm -f TAGS tags Makefile config.status config.h config.log configure realclean: distclean --- 55,69 ---- $(DEFS) $(CPPFLAGS) $(CFLAGS) $< $(OUTPUT_OPTION) .PHONY: clean maintainer-clean glob-clean glob-maintainer-clean distclean ! clean glob-clean: -rm -f libglob.a *.o core ! distclean glob-maintainer-clean: clean -rm -f TAGS tags Makefile config.status config.cache \ config.h config.log ! maintainer-clean: distclean ! -rm -f configure realclean: distclean diff -cNr octave-2.0.14/glob/configure octave-2.0.15/glob/configure *** octave-2.0.14/glob/configure Wed Apr 14 12:58:11 1999 --- octave-2.0.15/glob/configure Mon Jan 10 18:10:14 2000 *************** *** 1,7 **** #! /bin/sh # Guess values for system-dependent variables and create Makefiles. ! # Generated automatically using autoconf version 2.13 # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. # # This configure script is free software; the Free Software Foundation --- 1,7 ---- #! /bin/sh # Guess values for system-dependent variables and create Makefiles. ! # Generated automatically using autoconf version 2.12 # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. # # This configure script is free software; the Free Software Foundation *************** *** 49,55 **** # Initialize some other variables. subdirs= MFLAGS= MAKEFLAGS= - SHELL=${CONFIG_SHELL-/bin/sh} # Maximum number of lines to put in a shell here document. ac_max_here_lines=12 --- 49,54 ---- *************** *** 333,339 **** verbose=yes ;; -version | --version | --versio | --versi | --vers) ! echo "configure generated by autoconf version 2.13" exit 0 ;; -with-* | --with-*) --- 332,338 ---- verbose=yes ;; -version | --version | --versio | --versi | --vers) ! echo "configure generated by autoconf version 2.12" exit 0 ;; -with-* | --with-*) *************** *** 503,513 **** # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' ! ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_cc_cross - ac_exeext= - ac_objext=o if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu. if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then --- 502,510 ---- # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' ! ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_cc_cross if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu. if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then *************** *** 523,538 **** # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ! echo "configure:527: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else ! IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" ! ac_dummy="$PATH" ! for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then ac_cv_prog_CC="gcc" --- 520,534 ---- # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ! echo "configure:524: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else ! IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" ! for ac_dir in $PATH; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then ac_cv_prog_CC="gcc" *************** *** 553,569 **** # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ! echo "configure:557: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else ! IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" ac_prog_rejected=no ! ac_dummy="$PATH" ! for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then --- 549,564 ---- # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ! echo "configure:553: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else ! IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" ac_prog_rejected=no ! for ac_dir in $PATH; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then *************** *** 598,658 **** echo "$ac_t""no" 1>&6 fi - if test -z "$CC"; then - case "`uname -s`" in - *win32* | *WIN32*) - # Extract the first word of "cl", so it can be a program name with args. - set dummy cl; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 - echo "configure:608: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. - else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_CC="cl" - break - fi - done - IFS="$ac_save_ifs" - fi - fi - CC="$ac_cv_prog_CC" - if test -n "$CC"; then - echo "$ac_t""$CC" 1>&6 - else - echo "$ac_t""no" 1>&6 - fi - ;; - esac - fi test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 ! echo "configure:640: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' ! ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_cc_cross ! cat > conftest.$ac_ext << EOF ! ! #line 651 "configure" #include "confdefs.h" - main(){return(0);} EOF ! if { (eval echo configure:656: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then --- 593,617 ---- echo "$ac_t""no" 1>&6 fi test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 ! echo "configure:601: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' ! ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_cc_cross ! cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then *************** *** 666,689 **** ac_cv_prog_cc_works=no fi rm -fr conftest* - ac_ext=c - # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. - ac_cpp='$CPP $CPPFLAGS' - ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' - ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' - cross_compiling=$ac_cv_prog_cc_cross echo "$ac_t""$ac_cv_prog_cc_works" 1>&6 if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 ! echo "configure:682: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 ! echo "configure:687: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else --- 625,642 ---- ac_cv_prog_cc_works=no fi rm -fr conftest* echo "$ac_t""$ac_cv_prog_cc_works" 1>&6 if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 ! echo "configure:635: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 ! echo "configure:640: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else *************** *** 692,698 **** yes; #endif EOF ! if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:696: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no --- 645,651 ---- yes; #endif EOF ! if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:649: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no *************** *** 703,717 **** if test $ac_cv_prog_gcc = yes; then GCC=yes ! else ! GCC= ! fi ! ! ac_test_CFLAGS="${CFLAGS+set}" ! ac_save_CFLAGS="$CFLAGS" ! CFLAGS= ! echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 ! echo "configure:715: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else --- 656,666 ---- if test $ac_cv_prog_gcc = yes; then GCC=yes ! ac_test_CFLAGS="${CFLAGS+set}" ! ac_save_CFLAGS="$CFLAGS" ! CFLAGS= ! echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 ! echo "configure:664: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else *************** *** 726,760 **** fi echo "$ac_t""$ac_cv_prog_cc_g" 1>&6 ! if test "$ac_test_CFLAGS" = set; then ! CFLAGS="$ac_save_CFLAGS" ! elif test $ac_cv_prog_cc_g = yes; then ! if test "$GCC" = yes; then CFLAGS="-g -O2" else - CFLAGS="-g" - fi - else - if test "$GCC" = yes; then CFLAGS="-O2" - else - CFLAGS= fi fi # Extract the first word of "ar", so it can be a program name with args. set dummy ar; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ! echo "configure:749: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$AR"; then ac_cv_prog_AR="$AR" # Let the user override the test. else ! IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" ! ac_dummy="$PATH" ! for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then ac_cv_prog_AR="ar" --- 675,704 ---- fi echo "$ac_t""$ac_cv_prog_cc_g" 1>&6 ! if test "$ac_test_CFLAGS" = set; then ! CFLAGS="$ac_save_CFLAGS" ! elif test $ac_cv_prog_cc_g = yes; then CFLAGS="-g -O2" else CFLAGS="-O2" fi + else + GCC= + test "${CFLAGS+set}" = set || CFLAGS="-g" fi # Extract the first word of "ar", so it can be a program name with args. set dummy ar; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ! echo "configure:694: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$AR"; then ac_cv_prog_AR="$AR" # Let the user override the test. else ! IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" ! for ac_dir in $PATH; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then ac_cv_prog_AR="ar" *************** *** 775,790 **** # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ! echo "configure:779: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$RANLIB"; then ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. else ! IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" ! ac_dummy="$PATH" ! for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then ac_cv_prog_RANLIB="ranlib" --- 719,733 ---- # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ! echo "configure:723: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$RANLIB"; then ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. else ! IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" ! for ac_dir in $PATH; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then ac_cv_prog_RANLIB="ranlib" *************** *** 803,809 **** fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 ! echo "configure:807: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= --- 746,752 ---- fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 ! echo "configure:750: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= *************** *** 818,831 **** # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo configure:828: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ! ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : else --- 761,774 ---- # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo configure:771: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ! ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : else *************** *** 835,865 **** rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < ! Syntax Error ! EOF ! ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo configure:845: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ! ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ! if test -z "$ac_err"; then ! : ! else ! echo "$ac_err" >&5 ! echo "configure: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ! rm -rf conftest* ! CPP="${CC-cc} -nologo -E" ! cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo configure:862: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ! ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : else --- 778,791 ---- rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo configure:788: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ! ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : else *************** *** 872,879 **** rm -f conftest* fi rm -f conftest* - fi - rm -f conftest* ac_cv_prog_CPP="$CPP" fi CPP="$ac_cv_prog_CPP" --- 798,803 ---- *************** *** 882,890 **** fi echo "$ac_t""$CPP" 1>&6 echo $ac_n "checking for AIX""... $ac_c" 1>&6 ! echo "configure:886: checking for AIX" >&5 cat > conftest.$ac_ext <&6 echo $ac_n "checking for AIX""... $ac_c" 1>&6 ! echo "configure:810: checking for AIX" >&5 cat > conftest.$ac_ext <&6 ! echo "configure:911: checking for minix/config.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo configure:921: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ! ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* eval "ac_cv_header_$ac_safe=yes" --- 831,848 ---- ac_safe=`echo "minix/config.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for minix/config.h""... $ac_c" 1>&6 ! echo "configure:835: checking for minix/config.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo configure:845: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ! ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* eval "ac_cv_header_$ac_safe=yes" *************** *** 955,961 **** fi echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6 ! echo "configure:959: checking for POSIXized ISC" >&5 if test -d /etc/conf/kconfig.d && grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1 then --- 879,885 ---- fi echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6 ! echo "configure:883: checking for POSIXized ISC" >&5 if test -d /etc/conf/kconfig.d && grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1 then *************** *** 976,987 **** fi echo $ac_n "checking for working const""... $ac_c" 1>&6 ! echo "configure:980: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 ! echo "configure:904: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else --- 954,960 ---- ; return 0; } EOF ! if { (eval echo configure:958: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else *************** *** 1051,1062 **** fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 ! echo "configure:1055: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include --- 975,986 ---- fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 ! echo "configure:979: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include *************** *** 1064,1071 **** #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo configure:1068: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ! ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ac_cv_header_stdc=yes --- 988,995 ---- #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo configure:992: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ! ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* ac_cv_header_stdc=yes *************** *** 1081,1087 **** if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF --- 1005,1011 ---- if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF *************** *** 1099,1105 **** if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF --- 1023,1029 ---- if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF *************** *** 1120,1126 **** : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') --- 1044,1050 ---- : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') *************** *** 1131,1137 **** exit (0); } EOF ! if { (eval echo configure:1135: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else --- 1055,1061 ---- exit (0); } EOF ! if { (eval echo configure:1059: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then : else *************** *** 1158,1175 **** do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 ! echo "configure:1162: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo configure:1172: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ! ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* eval "ac_cv_header_$ac_safe=yes" --- 1082,1099 ---- do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 ! echo "configure:1086: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo configure:1096: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ! ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* eval "ac_cv_header_$ac_safe=yes" *************** *** 1199,1210 **** do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6 ! echo "configure:1203: checking for $ac_hdr that defines DIR" >&5 if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include <$ac_hdr> --- 1123,1134 ---- do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6 ! echo "configure:1127: checking for $ac_hdr that defines DIR" >&5 if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include <$ac_hdr> *************** *** 1212,1218 **** DIR *dirp = 0; ; return 0; } EOF ! if { (eval echo configure:1216: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_dirent_$ac_safe=yes" else --- 1136,1142 ---- DIR *dirp = 0; ; return 0; } EOF ! if { (eval echo configure:1140: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_dirent_$ac_safe=yes" else *************** *** 1237,1243 **** # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. if test $ac_header_dirent = dirent.h; then echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6 ! echo "configure:1241: checking for opendir in -ldir" >&5 ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 --- 1161,1167 ---- # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. if test $ac_header_dirent = dirent.h; then echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6 ! echo "configure:1165: checking for opendir in -ldir" >&5 ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 *************** *** 1245,1251 **** ac_save_LIBS="$LIBS" LIBS="-ldir $LIBS" cat > conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else --- 1180,1186 ---- opendir() ; return 0; } EOF ! if { (eval echo configure:1184: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else *************** *** 1278,1284 **** else echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 ! echo "configure:1282: checking for opendir in -lx" >&5 ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 --- 1202,1208 ---- else echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 ! echo "configure:1206: checking for opendir in -lx" >&5 ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 *************** *** 1286,1292 **** ac_save_LIBS="$LIBS" LIBS="-lx $LIBS" cat > conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else --- 1221,1227 ---- opendir() ; return 0; } EOF ! if { (eval echo configure:1225: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else *************** *** 1320,1326 **** fi echo $ac_n "checking whether closedir returns void""... $ac_c" 1>&6 ! echo "configure:1324: checking whether closedir returns void" >&5 if eval "test \"`echo '$''{'ac_cv_func_closedir_void'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else --- 1244,1250 ---- fi echo $ac_n "checking whether closedir returns void""... $ac_c" 1>&6 ! echo "configure:1248: checking whether closedir returns void" >&5 if eval "test \"`echo '$''{'ac_cv_func_closedir_void'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else *************** *** 1328,1340 **** ac_cv_func_closedir_void=yes else cat > conftest.$ac_ext < #include <$ac_header_dirent> int closedir(); main() { exit(closedir(opendir(".")) != 0); } EOF ! if { (eval echo configure:1338: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_closedir_void=no else --- 1252,1264 ---- ac_cv_func_closedir_void=yes else cat > conftest.$ac_ext < #include <$ac_header_dirent> int closedir(); main() { exit(closedir(opendir(".")) != 0); } EOF ! if { (eval echo configure:1262: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_func_closedir_void=no else *************** *** 1359,1377 **** # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 ! echo "configure:1363: checking for working alloca.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { char *p = alloca(2 * sizeof(int)); ; return 0; } EOF ! if { (eval echo configure:1375: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_header_alloca_h=yes else --- 1283,1301 ---- # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 ! echo "configure:1287: checking for working alloca.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { char *p = alloca(2 * sizeof(int)); ; return 0; } EOF ! if { (eval echo configure:1299: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ac_cv_header_alloca_h=yes else *************** *** 1392,1421 **** fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 ! echo "configure:1396: checking for alloca" >&5 if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < ! # define alloca _alloca # else ! # if HAVE_ALLOCA_H ! # include ! # else ! # ifdef _AIX #pragma alloca ! # else ! # ifndef alloca /* predefined by HP cc +Olibcalls */ char *alloca (); - # endif # endif # endif # endif --- 1316,1340 ---- fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 ! echo "configure:1320: checking for alloca" >&5 if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < # else ! # ifdef _AIX #pragma alloca ! # else ! # ifndef alloca /* predefined by HP cc +Olibcalls */ char *alloca (); # endif # endif # endif *************** *** 1425,1431 **** char *p = (char *) alloca(1); ; return 0; } EOF ! if { (eval echo configure:1429: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_func_alloca_works=yes else --- 1344,1350 ---- char *p = (char *) alloca(1); ; return 0; } EOF ! if { (eval echo configure:1348: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ac_cv_func_alloca_works=yes else *************** *** 1450,1468 **** # that cause trouble. Some versions do not even contain alloca or # contain a buggy version. If you still want to use their alloca, # use ar to extract alloca.o from them instead of compiling alloca.c. ! ALLOCA=alloca.${ac_objext} cat >> confdefs.h <<\EOF #define C_ALLOCA 1 EOF echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 ! echo "configure:1461: checking whether alloca needs Cray hooks" >&5 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <> confdefs.h <<\EOF #define C_ALLOCA 1 EOF echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 ! echo "configure:1380: checking whether alloca needs Cray hooks" >&5 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 ! echo "configure:1491: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 ! echo "configure:1410: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else --- 1434,1440 ---- ; return 0; } EOF ! if { (eval echo configure:1438: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else *************** *** 1542,1548 **** fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 ! echo "configure:1546: checking stack direction for C alloca" >&5 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else --- 1461,1467 ---- fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 ! echo "configure:1465: checking stack direction for C alloca" >&5 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else *************** *** 1550,1556 **** ac_cv_c_stack_direction=0 else cat > conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_stack_direction=1 else --- 1488,1494 ---- exit (find_stack_direction() < 0); } EOF ! if { (eval echo configure:1492: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_c_stack_direction=1 else *************** *** 1591,1597 **** fi echo $ac_n "checking for working strcoll""... $ac_c" 1>&6 ! echo "configure:1595: checking for working strcoll" >&5 if eval "test \"`echo '$''{'ac_cv_func_strcoll_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else --- 1510,1516 ---- fi echo $ac_n "checking for working strcoll""... $ac_c" 1>&6 ! echo "configure:1514: checking for working strcoll" >&5 if eval "test \"`echo '$''{'ac_cv_func_strcoll_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else *************** *** 1599,1605 **** ac_cv_func_strcoll_works=no else cat > conftest.$ac_ext < main () --- 1518,1524 ---- ac_cv_func_strcoll_works=no else cat > conftest.$ac_ext < main () *************** *** 1609,1615 **** strcoll ("123", "456") >= 0); } EOF ! if { (eval echo configure:1613: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_strcoll_works=yes else --- 1528,1534 ---- strcoll ("123", "456") >= 0); } EOF ! if { (eval echo configure:1532: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_func_strcoll_works=yes else *************** *** 1654,1660 **** # Ultrix sh set writes to stderr and can't be redirected directly, # and sets the high bit in the cache file unless we assign to the vars. (set) 2>&1 | ! case `(ac_space=' '; set | grep ac_space) 2>&1` in *ac_space=\ *) # `set' does not quote correctly, so add quotes (double-quote substitution # turns \\\\ into \\, and sed turns \\ into \). --- 1573,1579 ---- # Ultrix sh set writes to stderr and can't be redirected directly, # and sets the high bit in the cache file unless we assign to the vars. (set) 2>&1 | ! case `(ac_space=' '; set) 2>&1` in *ac_space=\ *) # `set' does not quote correctly, so add quotes (double-quote substitution # turns \\\\ into \\, and sed turns \\ into \). *************** *** 1733,1739 **** echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion" exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;; -version | --version | --versio | --versi | --vers | --ver | --ve | --v) ! echo "$CONFIG_STATUS generated by autoconf version 2.13" exit 0 ;; -help | --help | --hel | --he | --h) echo "\$ac_cs_usage"; exit 0 ;; --- 1652,1658 ---- echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion" exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;; -version | --version | --versio | --versi | --vers | --ver | --ve | --v) ! echo "$CONFIG_STATUS generated by autoconf version 2.12" exit 0 ;; -help | --help | --hel | --he | --h) echo "\$ac_cs_usage"; exit 0 ;; *************** *** 1752,1762 **** s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF $ac_vpsub $extrasub - s%@SHELL@%$SHELL%g s%@CFLAGS@%$CFLAGS%g s%@CPPFLAGS@%$CPPFLAGS%g s%@CXXFLAGS@%$CXXFLAGS%g - s%@FFLAGS@%$FFLAGS%g s%@DEFS@%$DEFS%g s%@LDFLAGS@%$LDFLAGS%g s%@LIBS@%$LIBS%g --- 1671,1679 ---- diff -cNr octave-2.0.14/kpathsea/configure octave-2.0.15/kpathsea/configure *** octave-2.0.14/kpathsea/configure Wed Apr 14 12:58:09 1999 --- octave-2.0.15/kpathsea/configure Mon Jan 10 18:10:15 2000 *************** *** 1,7 **** #! /bin/sh # Guess values for system-dependent variables and create Makefiles. ! # Generated automatically using autoconf version 2.13 # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. # # This configure script is free software; the Free Software Foundation --- 1,7 ---- #! /bin/sh # Guess values for system-dependent variables and create Makefiles. ! # Generated automatically using autoconf version 2.12 # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. # # This configure script is free software; the Free Software Foundation *************** *** 61,67 **** # Initialize some other variables. subdirs= MFLAGS= MAKEFLAGS= - SHELL=${CONFIG_SHELL-/bin/sh} # Maximum number of lines to put in a shell here document. ac_max_here_lines=12 --- 61,66 ---- *************** *** 345,351 **** verbose=yes ;; -version | --version | --versio | --versi | --vers) ! echo "configure generated by autoconf version 2.13" exit 0 ;; -with-* | --with-*) --- 344,350 ---- verbose=yes ;; -version | --version | --versio | --versi | --vers) ! echo "configure generated by autoconf version 2.12" exit 0 ;; -with-* | --with-*) *************** *** 515,525 **** # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' ! ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_cc_cross - ac_exeext= - ac_objext=o if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu. if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then --- 514,522 ---- # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' ! ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_cc_cross if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu. if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then *************** *** 549,564 **** # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ! echo "configure:553: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else ! IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" ! ac_dummy="$PATH" ! for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then ac_cv_prog_CC="gcc" --- 546,560 ---- # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ! echo "configure:550: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else ! IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" ! for ac_dir in $PATH; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then ac_cv_prog_CC="gcc" *************** *** 579,595 **** # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ! echo "configure:583: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else ! IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" ac_prog_rejected=no ! ac_dummy="$PATH" ! for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then --- 575,590 ---- # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ! echo "configure:579: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else ! IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" ac_prog_rejected=no ! for ac_dir in $PATH; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then *************** *** 624,684 **** echo "$ac_t""no" 1>&6 fi - if test -z "$CC"; then - case "`uname -s`" in - *win32* | *WIN32*) - # Extract the first word of "cl", so it can be a program name with args. - set dummy cl; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 - echo "configure:634: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. - else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_CC="cl" - break - fi - done - IFS="$ac_save_ifs" - fi - fi - CC="$ac_cv_prog_CC" - if test -n "$CC"; then - echo "$ac_t""$CC" 1>&6 - else - echo "$ac_t""no" 1>&6 - fi - ;; - esac - fi test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 ! echo "configure:666: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' ! ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_cc_cross ! cat > conftest.$ac_ext << EOF ! ! #line 677 "configure" #include "confdefs.h" - main(){return(0);} EOF ! if { (eval echo configure:682: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then --- 619,643 ---- echo "$ac_t""no" 1>&6 fi test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 ! echo "configure:627: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' ! ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_cc_cross ! cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then *************** *** 692,715 **** ac_cv_prog_cc_works=no fi rm -fr conftest* - ac_ext=c - # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. - ac_cpp='$CPP $CPPFLAGS' - ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' - ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' - cross_compiling=$ac_cv_prog_cc_cross echo "$ac_t""$ac_cv_prog_cc_works" 1>&6 if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 ! echo "configure:708: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 ! echo "configure:713: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else --- 651,668 ---- ac_cv_prog_cc_works=no fi rm -fr conftest* echo "$ac_t""$ac_cv_prog_cc_works" 1>&6 if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 ! echo "configure:661: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 ! echo "configure:666: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else *************** *** 718,724 **** yes; #endif EOF ! if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:722: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no --- 671,677 ---- yes; #endif EOF ! if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:675: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no *************** *** 729,743 **** if test $ac_cv_prog_gcc = yes; then GCC=yes ! else ! GCC= ! fi ! ! ac_test_CFLAGS="${CFLAGS+set}" ! ac_save_CFLAGS="$CFLAGS" ! CFLAGS= ! echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 ! echo "configure:741: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else --- 682,692 ---- if test $ac_cv_prog_gcc = yes; then GCC=yes ! ac_test_CFLAGS="${CFLAGS+set}" ! ac_save_CFLAGS="$CFLAGS" ! CFLAGS= ! echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 ! echo "configure:690: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else *************** *** 752,771 **** fi echo "$ac_t""$ac_cv_prog_cc_g" 1>&6 ! if test "$ac_test_CFLAGS" = set; then ! CFLAGS="$ac_save_CFLAGS" ! elif test $ac_cv_prog_cc_g = yes; then ! if test "$GCC" = yes; then CFLAGS="-g -O2" else - CFLAGS="-g" - fi - else - if test "$GCC" = yes; then CFLAGS="-O2" - else - CFLAGS= fi fi ac_aux_dir= --- 701,716 ---- fi echo "$ac_t""$ac_cv_prog_cc_g" 1>&6 ! if test "$ac_test_CFLAGS" = set; then ! CFLAGS="$ac_save_CFLAGS" ! elif test $ac_cv_prog_cc_g = yes; then CFLAGS="-g -O2" else CFLAGS="-O2" fi + else + GCC= + test "${CFLAGS+set}" = set || CFLAGS="-g" fi ac_aux_dir= *************** *** 794,823 **** # SunOS /usr/etc/install # IRIX /sbin/install # AIX /bin/install - # AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag # AFS /usr/afsws/bin/install, which mishandles nonexistent args # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 ! echo "configure:803: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ! IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":" for ac_dir in $PATH; do # Account for people who put trailing slashes in PATH elements. case "$ac_dir/" in /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;; *) # OSF1 and SCO ODT 3.0 have their own names for install. ! # Don't use installbsd from OSF since it installs stuff as root ! # by default. ! for ac_prog in ginstall scoinst install; do if test -f $ac_dir/$ac_prog; then if test $ac_prog = install && grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. : else ac_cv_path_install="$ac_dir/$ac_prog -c" --- 739,766 ---- # SunOS /usr/etc/install # IRIX /sbin/install # AIX /bin/install # AFS /usr/afsws/bin/install, which mishandles nonexistent args # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 ! echo "configure:747: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ! IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS="${IFS}:" for ac_dir in $PATH; do # Account for people who put trailing slashes in PATH elements. case "$ac_dir/" in /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;; *) # OSF1 and SCO ODT 3.0 have their own names for install. ! for ac_prog in ginstall installbsd scoinst install; do if test -f $ac_dir/$ac_prog; then if test $ac_prog = install && grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. + # OSF/1 installbsd also uses dspmsg, but is usable. : else ac_cv_path_install="$ac_dir/$ac_prog -c" *************** *** 847,858 **** # It thinks the first close brace ends the variable substitution. test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' - test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' - test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 ! echo "configure:856: checking whether ln -s works" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else --- 790,799 ---- # It thinks the first close brace ends the variable substitution. test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 ! echo "configure:797: checking whether ln -s works" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else *************** *** 873,879 **** fi echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 ! echo "configure:877: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 --- 814,820 ---- fi echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 ! echo "configure:818: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 *************** *** 905,916 **** do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6 ! echo "configure:909: checking for $ac_hdr that defines DIR" >&5 if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include <$ac_hdr> --- 846,857 ---- do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6 ! echo "configure:850: checking for $ac_hdr that defines DIR" >&5 if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include <$ac_hdr> *************** *** 918,924 **** DIR *dirp = 0; ; return 0; } EOF ! if { (eval echo configure:922: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_dirent_$ac_safe=yes" else --- 859,865 ---- DIR *dirp = 0; ; return 0; } EOF ! if { (eval echo configure:863: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_dirent_$ac_safe=yes" else *************** *** 943,949 **** # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. if test $ac_header_dirent = dirent.h; then echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6 ! echo "configure:947: checking for opendir in -ldir" >&5 ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 --- 884,890 ---- # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. if test $ac_header_dirent = dirent.h; then echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6 ! echo "configure:888: checking for opendir in -ldir" >&5 ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 *************** *** 951,957 **** ac_save_LIBS="$LIBS" LIBS="-ldir $LIBS" cat > conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else --- 903,909 ---- opendir() ; return 0; } EOF ! if { (eval echo configure:907: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else *************** *** 984,990 **** else echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 ! echo "configure:988: checking for opendir in -lx" >&5 ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 --- 925,931 ---- else echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 ! echo "configure:929: checking for opendir in -lx" >&5 ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 *************** *** 992,998 **** ac_save_LIBS="$LIBS" LIBS="-lx $LIBS" cat > conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else --- 944,950 ---- opendir() ; return 0; } EOF ! if { (eval echo configure:948: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else *************** *** 1026,1032 **** fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 ! echo "configure:1030: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= --- 967,973 ---- fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 ! echo "configure:971: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= *************** *** 1041,1054 **** # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo configure:1051: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ! ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : else --- 982,995 ---- # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo configure:992: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ! ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : else *************** *** 1058,1088 **** rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < ! Syntax Error ! EOF ! ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo configure:1068: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ! ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ! if test -z "$ac_err"; then ! : ! else ! echo "$ac_err" >&5 ! echo "configure: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ! rm -rf conftest* ! CPP="${CC-cc} -nologo -E" ! cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo configure:1085: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ! ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : else --- 999,1012 ---- rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo configure:1009: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ! ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : else *************** *** 1095,1102 **** rm -f conftest* fi rm -f conftest* - fi - rm -f conftest* ac_cv_prog_CPP="$CPP" fi CPP="$ac_cv_prog_CPP" --- 1019,1024 ---- *************** *** 1106,1117 **** echo "$ac_t""$CPP" 1>&6 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 ! echo "configure:1110: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include --- 1028,1039 ---- echo "$ac_t""$CPP" 1>&6 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 ! echo "configure:1032: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include *************** *** 1119,1126 **** #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo configure:1123: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ! ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ac_cv_header_stdc=yes --- 1041,1048 ---- #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo configure:1045: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ! ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* ac_cv_header_stdc=yes *************** *** 1136,1142 **** if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF --- 1058,1064 ---- if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF *************** *** 1154,1160 **** if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF --- 1076,1082 ---- if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF *************** *** 1175,1181 **** : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') --- 1097,1103 ---- : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') *************** *** 1186,1192 **** exit (0); } EOF ! if { (eval echo configure:1190: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else --- 1108,1114 ---- exit (0); } EOF ! if { (eval echo configure:1112: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then : else *************** *** 1210,1216 **** fi echo $ac_n "checking whether closedir returns void""... $ac_c" 1>&6 ! echo "configure:1214: checking whether closedir returns void" >&5 if eval "test \"`echo '$''{'ac_cv_func_closedir_void'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else --- 1132,1138 ---- fi echo $ac_n "checking whether closedir returns void""... $ac_c" 1>&6 ! echo "configure:1136: checking whether closedir returns void" >&5 if eval "test \"`echo '$''{'ac_cv_func_closedir_void'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else *************** *** 1218,1230 **** ac_cv_func_closedir_void=yes else cat > conftest.$ac_ext < #include <$ac_header_dirent> int closedir(); main() { exit(closedir(opendir(".")) != 0); } EOF ! if { (eval echo configure:1228: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_closedir_void=no else --- 1140,1152 ---- ac_cv_func_closedir_void=yes else cat > conftest.$ac_ext < #include <$ac_header_dirent> int closedir(); main() { exit(closedir(opendir(".")) != 0); } EOF ! if { (eval echo configure:1150: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_func_closedir_void=no else *************** *** 1251,1268 **** do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 ! echo "configure:1255: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo configure:1265: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ! ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* eval "ac_cv_header_$ac_safe=yes" --- 1173,1190 ---- do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 ! echo "configure:1177: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo configure:1187: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ! ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* eval "ac_cv_header_$ac_safe=yes" *************** *** 1293,1308 **** # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ! echo "configure:1297: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$RANLIB"; then ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. else ! IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" ! ac_dummy="$PATH" ! for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then ac_cv_prog_RANLIB="ranlib" --- 1215,1229 ---- # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ! echo "configure:1219: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$RANLIB"; then ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. else ! IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" ! for ac_dir in $PATH; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then ac_cv_prog_RANLIB="ranlib" *************** *** 1322,1347 **** # Make sure we can run config.sub. ! if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then : else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } fi echo $ac_n "checking host system type""... $ac_c" 1>&6 ! echo "configure:1331: checking host system type" >&5 host_alias=$host case "$host_alias" in NONE) case $nonopt in NONE) ! if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then : else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; } fi ;; *) host_alias=$nonopt ;; esac ;; esac ! host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias` host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` --- 1243,1268 ---- # Make sure we can run config.sub. ! if $ac_config_sub sun4 >/dev/null 2>&1; then : else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } fi echo $ac_n "checking host system type""... $ac_c" 1>&6 ! echo "configure:1252: checking host system type" >&5 host_alias=$host case "$host_alias" in NONE) case $nonopt in NONE) ! if host_alias=`$ac_config_guess`; then : else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; } fi ;; *) host_alias=$nonopt ;; esac ;; esac ! host=`$ac_config_sub $host_alias` host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` *************** *** 1351,1357 **** # echo $ac_n "checking for libtool object types""... $ac_c" 1>&6 ! echo "configure:1355: checking for libtool object types" >&5 # ## Check that the klibtool script is in ac_aux_dir. Don't bother to # scan PATH. For one thing, if we found it somewhere there, we couldn't --- 1272,1278 ---- # echo $ac_n "checking for libtool object types""... $ac_c" 1>&6 ! echo "configure:1276: checking for libtool object types" >&5 # ## Check that the klibtool script is in ac_aux_dir. Don't bother to # scan PATH. For one thing, if we found it somewhere there, we couldn't *************** *** 1397,1408 **** for ac_func in basename putenv strcasecmp strtol strstr do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 ! echo "configure:1401: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 ! echo "configure:1322: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else --- 1346,1352 ---- ; return 0; } EOF ! if { (eval echo configure:1350: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else *************** *** 1455,1466 **** for ac_func in bcopy getcwd getwd do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 ! echo "configure:1459: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 ! echo "configure:1380: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else --- 1404,1410 ---- ; return 0; } EOF ! if { (eval echo configure:1408: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else *************** *** 1509,1520 **** echo $ac_n "checking for working const""... $ac_c" 1>&6 ! echo "configure:1513: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 ! echo "configure:1434: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else --- 1484,1490 ---- ; return 0; } EOF ! if { (eval echo configure:1488: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else *************** *** 1586,1604 **** # Check whether prototypes work. echo $ac_n "checking whether the compiler accepts prototypes""... $ac_c" 1>&6 ! echo "configure:1590: checking whether the compiler accepts prototypes" >&5 if eval "test \"`echo '$''{'kb_cv_c_prototypes'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { extern void foo(int i,...); ; return 0; } EOF ! if { (eval echo configure:1602: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* kb_cv_c_prototypes=yes else --- 1507,1525 ---- # Check whether prototypes work. echo $ac_n "checking whether the compiler accepts prototypes""... $ac_c" 1>&6 ! echo "configure:1511: checking whether the compiler accepts prototypes" >&5 if eval "test \"`echo '$''{'kb_cv_c_prototypes'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { extern void foo(int i,...); ; return 0; } EOF ! if { (eval echo configure:1523: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* kb_cv_c_prototypes=yes else *************** *** 1619,1637 **** # This is a GNU libc invention. echo $ac_n "checking whether program_invocation_name is predefined""... $ac_c" 1>&6 ! echo "configure:1623: checking whether program_invocation_name is predefined" >&5 if eval "test \"`echo '$''{'kb_cv_var_program_inv_name'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* kb_cv_var_program_inv_name=yes else --- 1540,1558 ---- # This is a GNU libc invention. echo $ac_n "checking whether program_invocation_name is predefined""... $ac_c" 1>&6 ! echo "configure:1544: checking whether program_invocation_name is predefined" >&5 if eval "test \"`echo '$''{'kb_cv_var_program_inv_name'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* kb_cv_var_program_inv_name=yes else *************** *** 1655,1661 **** # We don't actually need to run this if we don't have putenv, but it # doesn't hurt. echo $ac_n "checking whether putenv uses malloc""... $ac_c" 1>&6 ! echo "configure:1659: checking whether putenv uses malloc" >&5 if eval "test \"`echo '$''{'kb_cv_func_putenv_malloc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else --- 1576,1582 ---- # We don't actually need to run this if we don't have putenv, but it # doesn't hurt. echo $ac_n "checking whether putenv uses malloc""... $ac_c" 1>&6 ! echo "configure:1580: checking whether putenv uses malloc" >&5 if eval "test \"`echo '$''{'kb_cv_func_putenv_malloc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else *************** *** 1663,1669 **** kb_cv_func_putenv_malloc=no else cat > conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then kb_cv_func_putenv_malloc=yes else --- 1637,1643 ---- exit (rstr1 == rstr2 ? 0 : 1); } EOF ! if { (eval echo configure:1641: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then kb_cv_func_putenv_malloc=yes else *************** *** 1740,1746 **** if test $ac_cv_func_getcwd = yes; then # We only need to run this if we have getcwd. echo $ac_n "checking whether getcwd uses fork or vfork""... $ac_c" 1>&6 ! echo "configure:1744: checking whether getcwd uses fork or vfork" >&5 if eval "test \"`echo '$''{'kb_cv_func_getcwd_forks'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else --- 1661,1667 ---- if test $ac_cv_func_getcwd = yes; then # We only need to run this if we have getcwd. echo $ac_n "checking whether getcwd uses fork or vfork""... $ac_c" 1>&6 ! echo "configure:1665: checking whether getcwd uses fork or vfork" >&5 if eval "test \"`echo '$''{'kb_cv_func_getcwd_forks'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else *************** *** 1748,1754 **** kb_cv_func_getcwd_forks=no else cat > conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then kb_cv_func_getcwd_forks=no else --- 1681,1687 ---- return 0; } EOF ! if { (eval echo configure:1685: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then kb_cv_func_getcwd_forks=no else *************** *** 1857,1882 **** # Make sure we can run config.sub. ! if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then : else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } fi echo $ac_n "checking host system type""... $ac_c" 1>&6 ! echo "configure:1866: checking host system type" >&5 host_alias=$host case "$host_alias" in NONE) case $nonopt in NONE) ! if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then : else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; } fi ;; *) host_alias=$nonopt ;; esac ;; esac ! host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias` host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` --- 1778,1803 ---- # Make sure we can run config.sub. ! if $ac_config_sub sun4 >/dev/null 2>&1; then : else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } fi echo $ac_n "checking host system type""... $ac_c" 1>&6 ! echo "configure:1787: checking host system type" >&5 host_alias=$host case "$host_alias" in NONE) case $nonopt in NONE) ! if host_alias=`$ac_config_guess`; then : else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; } fi ;; *) host_alias=$nonopt ;; esac ;; esac ! host=`$ac_config_sub $host_alias` host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` *************** *** 1894,1900 **** echo $ac_n "checking where the main texmf tree is located""... $ac_c" 1>&6 ! echo "configure:1898: checking where the main texmf tree is located" >&5 texmfmain= if test "x$datadir" != 'x${prefix}/share'; then # First case, datadir is defined... --- 1815,1821 ---- echo $ac_n "checking where the main texmf tree is located""... $ac_c" 1>&6 ! echo "configure:1819: checking where the main texmf tree is located" >&5 texmfmain= if test "x$datadir" != 'x${prefix}/share'; then # First case, datadir is defined... *************** *** 1949,1955 **** # Ultrix sh set writes to stderr and can't be redirected directly, # and sets the high bit in the cache file unless we assign to the vars. (set) 2>&1 | ! case `(ac_space=' '; set | grep ac_space) 2>&1` in *ac_space=\ *) # `set' does not quote correctly, so add quotes (double-quote substitution # turns \\\\ into \\, and sed turns \\ into \). --- 1870,1876 ---- # Ultrix sh set writes to stderr and can't be redirected directly, # and sets the high bit in the cache file unless we assign to the vars. (set) 2>&1 | ! case `(ac_space=' '; set) 2>&1` in *ac_space=\ *) # `set' does not quote correctly, so add quotes (double-quote substitution # turns \\\\ into \\, and sed turns \\ into \). *************** *** 2016,2022 **** echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion" exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;; -version | --version | --versio | --versi | --vers | --ver | --ve | --v) ! echo "$CONFIG_STATUS generated by autoconf version 2.13" exit 0 ;; -help | --help | --hel | --he | --h) echo "\$ac_cs_usage"; exit 0 ;; --- 1937,1943 ---- echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion" exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;; -version | --version | --versio | --versi | --vers | --ver | --ve | --v) ! echo "$CONFIG_STATUS generated by autoconf version 2.12" exit 0 ;; -help | --help | --hel | --he | --h) echo "\$ac_cs_usage"; exit 0 ;; *************** *** 2036,2046 **** s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF $ac_vpsub $extrasub - s%@SHELL@%$SHELL%g s%@CFLAGS@%$CFLAGS%g s%@CPPFLAGS@%$CPPFLAGS%g s%@CXXFLAGS@%$CXXFLAGS%g - s%@FFLAGS@%$FFLAGS%g s%@DEFS@%$DEFS%g s%@LDFLAGS@%$LDFLAGS%g s%@LIBS@%$LIBS%g --- 1957,1965 ---- *************** *** 2062,2068 **** s%@KPSEVERSION@%$KPSEVERSION%g s%@CC@%$CC%g s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g - s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g s%@INSTALL_DATA@%$INSTALL_DATA%g s%@LN_S@%$LN_S%g s%@SET_MAKE@%$SET_MAKE%g --- 1981,1986 ---- diff -cNr octave-2.0.14/kpathsea/stamp-auto octave-2.0.15/kpathsea/stamp-auto *** octave-2.0.14/kpathsea/stamp-auto Fri Jan 22 21:50:35 1999 --- octave-2.0.15/kpathsea/stamp-auto Mon Jan 10 18:11:09 2000 *************** *** 1 **** ! Fri Jan 22 21:50:35 CST 1999 --- 1 ---- ! Mon Jan 10 18:11:09 CST 2000 diff -cNr octave-2.0.14/kpathsea/strtol.c octave-2.0.15/kpathsea/strtol.c *** octave-2.0.14/kpathsea/strtol.c Mon Aug 7 16:06:06 1995 --- octave-2.0.15/kpathsea/strtol.c Wed Oct 13 16:36:59 1999 *************** *** 14,21 **** You should have received a copy of the GNU Library General Public License along with the GNU C Library; see the file COPYING.LIB. If ! not, write to the Free Software Foundation, Inc., 675 Mass Ave, ! Cambridge, MA 02139, USA. */ #ifdef HAVE_CONFIG_H # include --- 14,21 ---- You should have received a copy of the GNU Library General Public License along with the GNU C Library; see the file COPYING.LIB. If ! not, write to the Free Software Foundation, Inc., 59 Temple Place, ! Suite 330, Boston, MA 02111 USA. */ #ifdef HAVE_CONFIG_H # include diff -cNr octave-2.0.14/kpathsea/win32lib.h octave-2.0.15/kpathsea/win32lib.h *** octave-2.0.14/kpathsea/win32lib.h Fri Mar 13 16:50:42 1998 --- octave-2.0.15/kpathsea/win32lib.h Wed Oct 13 16:32:55 1999 *************** *** 15,21 **** You should have received a copy of the GNU General Public License along with Web2C; see the file COPYING. If not, write to ! the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ #ifndef KPATHSEA_WIN32LIB_H #define KPATHSEA_WIN32LIB_H --- 15,21 ---- You should have received a copy of the GNU General Public License along with Web2C; see the file COPYING. If not, write to ! the Free Software Foundation, 59 Temple Place, Suite 330, Boston, MA 02111 USA. */ #ifndef KPATHSEA_WIN32LIB_H #define KPATHSEA_WIN32LIB_H diff -cNr octave-2.0.14/libcruft/ChangeLog octave-2.0.15/libcruft/ChangeLog *** octave-2.0.14/libcruft/ChangeLog Wed Apr 14 12:55:57 1999 --- octave-2.0.15/libcruft/ChangeLog Mon Jan 10 18:04:02 2000 *************** *** 1,3 **** --- 1,7 ---- + 2000-01-10 John W. Eaton + + * Version 2.0.15 released. + Wed Apr 14 12:55:42 1999 John W. Eaton * Version 2.0.14 released. diff -cNr octave-2.0.14/libcruft/Makerules.in octave-2.0.15/libcruft/Makerules.in *** octave-2.0.14/libcruft/Makerules.in Fri Mar 26 01:21:19 1999 --- octave-2.0.15/libcruft/Makerules.in Wed Nov 3 21:47:56 1999 *************** *** 14,26 **** DISTFILES = Makefile.in $(SOURCES) $(SPECIAL) ! CRUFT_FSRC = $(wildcard $(srcdir)/*.f) ! CRUFT_BASE = $(notdir $(CRUFT_FSRC)) ! CRUFT_OBJ = $(patsubst %.f, %.o, $(CRUFT_BASE)) ifeq ($(SHARED_LIBS), true) ifdef FPICFLAG CRUFT_PICOBJ := $(addprefix pic/, $(CRUFT_OBJ)) endif endif --- 14,30 ---- DISTFILES = Makefile.in $(SOURCES) $(SPECIAL) ! CRUFT_SRC = $(wildcard $(srcdir)/*.f) \ ! $(wildcard $(srcdir)/*.c) \ ! $(wildcard $(srcdir)/*.cc) ! CRUFT_BASE = $(basename $(notdir $(CRUFT_SRC)) ) ! CRUFT_OBJ = $(addsuffix .o, $(CRUFT_BASE) ) ifeq ($(SHARED_LIBS), true) ifdef FPICFLAG CRUFT_PICOBJ := $(addprefix pic/, $(CRUFT_OBJ)) + else + CRUFT_PICOBJ := $(CRUFT_OBJ) endif endif *************** *** 71,79 **** -rmdir pic .PHONY: distclean ! maintainer-clean:: ! rm -f tags TAGS stamp-picdir Makefile ! -rmdir pic .PHONY: maintainer-clean dist: --- 75,82 ---- -rmdir pic .PHONY: distclean ! maintainer-clean:: distclean ! rm -f tags TAGS .PHONY: maintainer-clean dist: diff -cNr octave-2.0.14/liboctave/Array2-idx.h octave-2.0.15/liboctave/Array2-idx.h *** octave-2.0.14/liboctave/Array2-idx.h Wed Aug 26 15:01:14 1998 --- octave-2.0.15/liboctave/Array2-idx.h Mon Jun 7 11:42:33 1999 *************** *** 84,93 **** } else if (nr == 1 || nc == 1) { ! int result_is_column_vector = (nc == 1); ! ! if (liboctave_dfi_flag && idx.is_colon ()) ! result_is_column_vector = 1; Array tmp = Array::index (idx); --- 84,90 ---- } else if (nr == 1 || nc == 1) { ! int result_is_column_vector = (nc == 1 || idx.is_colon ()); Array tmp = Array::index (idx); diff -cNr octave-2.0.14/liboctave/CMatrix.cc octave-2.0.15/liboctave/CMatrix.cc *** octave-2.0.14/liboctave/CMatrix.cc Tue Jan 19 09:34:54 1999 --- octave-2.0.15/liboctave/CMatrix.cc Tue Nov 2 00:16:35 1999 *************** *** 55,60 **** --- 55,69 ---- extern "C" { + int F77_FCN (zgebal, ZGEBAL) (const char*, const int&, Complex*, + const int&, int&, int&, double*, int&, + long, long); + + int F77_FCN (dgebak, DGEBAK) (const char*, const char*, const int&, + const int&, const int&, double*, + const int&, double*, const int&, + int&, long, long); + int F77_FCN (zgemm, ZGEMM) (const char*, const char*, const int&, const int&, const int&, const Complex&, const Complex*, const int&, *************** *** 1576,1597 **** m.elem (i, i) -= trshift; // Preconditioning step 2: eigenvalue balancing. ! ComplexAEPBALANCE mbal (m, "B"); ! m = mbal.balanced_matrix (); ! ComplexMatrix d = mbal.balancing_matrix (); // Preconditioning step 3: scaling. ColumnVector work (nc); double inf_norm; ! F77_FCN (xzlange, XZLANGE) ("I", nc, nc, m.fortran_vec (), nc, ! work.fortran_vec (), inf_norm); ! int sqpow = (int) (inf_norm > 0.0 ! ? (1.0 + log (inf_norm) / log (2.0)) ! : 0.0); // Check whether we need to square at all. --- 1585,1656 ---- m.elem (i, i) -= trshift; // Preconditioning step 2: eigenvalue balancing. + // code follows development in AEPBAL + + Complex *mp = m.fortran_vec (); + int ilo, ihi, info; + + // FIXME: should pass job as a parameter in expm + char job = 'B'; + + Array scale(nc); + double *pscale = scale.fortran_vec (); + + F77_XFCN (zgebal, ZGEBAL, (&job, nc, mp, nc, ilo, ihi, pscale, info, + 1L, 1L)); + + if (f77_exception_encountered) + { + (*current_liboctave_error_handler) ("unrecoverable error in zgebal"); + return retval; + } + + // construct balancing matrices dmat, dinv + + Matrix dmat = Matrix (nc, nc, 0.0); + Matrix dinv = Matrix (nc, nc, 0.0); + + for (int i = 0; i < nc; i++) + dmat(i,i) = dinv(i,i) = 1.0; ! // pscale contains real data, so just use dgebak, dside=R => dmat := D*dmat ! char dside = 'R'; ! F77_XFCN (dgebak, DGEBAK, (&job, &dside, nc, ilo, ihi, pscale, nc, ! dmat.fortran_vec(), nc, info, 1L, 1L)); ! ! if (f77_exception_encountered) ! { ! (*current_liboctave_error_handler) ("unrecoverable error in dgebak"); ! return retval; ! } ! ! // dgebak, dside=L => dinv := dinv*D^{-1} ! dside = 'L'; ! F77_XFCN (dgebak, DGEBAK, (&job, &dside, nc, ilo, ihi, pscale, nc, ! dinv.fortran_vec(), nc, info, 1L, 1L)); ! ! if (f77_exception_encountered) ! { ! (*current_liboctave_error_handler) ("unrecoverable error in dgebak"); ! return retval; ! } // Preconditioning step 3: scaling. ColumnVector work (nc); double inf_norm; ! F77_XFCN (xzlange, XZLANGE, ("I", nc, nc, m.fortran_vec (), nc, ! work.fortran_vec (), inf_norm)); ! if (f77_exception_encountered) ! { ! (*current_liboctave_error_handler) ("unrecoverable error in zlange"); ! return retval; ! } ! ! int sqpow = (inf_norm > 0.0 ! ? static_cast (1.0 + log (inf_norm) / log (2.0)) : 0); // Check whether we need to square at all. *************** *** 1644,1657 **** } // Reverse preconditioning step 2: inverse balancing. ! // XXX FIXME XXX -- should probably do this with Lapack calls ! // instead of a complete matrix inversion. ! ! retval = retval.transpose (); ! d = d.transpose (); ! retval = retval * d; ! retval = d.solve (retval); ! retval = retval.transpose (); // Reverse preconditioning step 1: fix trace normalization. --- 1703,1712 ---- } // Reverse preconditioning step 2: inverse balancing. ! // FIXME: need to figure out how to get dgebak to do ! // dmat*retval*dinv instead of dinv*retval*dmat ! // This works for now ! retval = dmat*retval*dinv; // Reverse preconditioning step 1: fix trace normalization. diff -cNr octave-2.0.14/liboctave/ChangeLog octave-2.0.15/liboctave/ChangeLog *** octave-2.0.14/liboctave/ChangeLog Wed Apr 14 12:55:56 1999 --- octave-2.0.15/liboctave/ChangeLog Mon Jan 10 18:04:01 2000 *************** *** 1,3 **** --- 1,58 ---- + 2000-01-10 John W. Eaton + + * Version 2.0.15 released. + + 2000-01-10 John W. Eaton + + * pathsearch.cc (dir_path::all_directories): Avoid dereferencing + NULL directory list returned from kpse_element_dirs + + 1999-11-03 John W. Eaton + + * dbleSCHUR.cc (SCHUR::init): IWORK is always referenced by dgeesx. + Don't forget to pass length of third string argument to dgeesx. + + * CmplxSCHUR.cc (ComplexSCHUR::init): Don't forget to pass length + of third string argument to zgeesx. + + 1999-10-21 John W. Eaton + + * DASSL.cc (DASSL::do_integrate (double)): If we have a function + to evaluate the Jacobian, set info(4), not iwork(4). + Set rwork(1) to the maximum step size, not rwork(2). + + Tue Sep 7 08:43:34 1999 John W. Eaton + + * cmd-hist.cc: Deal with bad readline prototypes (they need to + have some const qualifiers added in the appropriate places). + + Fri Sep 3 12:39:17 1999 John W. Eaton + + * lo-mappers.cc: Include ieeefp.h and sunmath.h if we have them. + * lo-ieee.c: Likewise. + Delete extern "C" declarations for infinity and quiet_nan. + + Fri Aug 20 07:58:00 1999 John W. Eaton + + * idx-vector.cc (intcmp): Declare args as const void *, not int *, + then cast to const int * to compare. + + Mon Jun 7 11:39:52 1999 John W. Eaton + + * Array2-idx.h (Array2index (idx_vector& idx)): Always return a + column vector for A(:), for compatibility with Matlab. + + Mon May 10 07:45:11 1999 John W. Eaton + + * MArray-defs.h (DO_VV_OP2): Fix macro definition to use arg. + + Fri Apr 23 11:52:23 1999 John W. Eaton + + * LSODE.cc (LSODE::do_integrate (double)): Don't forget to set + iopt when there are optional inputs in rwork or iwork. + + * LSODE.h (LSODE_options::copy): Don't forget to copy step limit too. + Wed Apr 14 12:55:42 1999 John W. Eaton * Version 2.0.14 released. diff -cNr octave-2.0.14/liboctave/CmplxSCHUR.cc octave-2.0.15/liboctave/CmplxSCHUR.cc *** octave-2.0.14/liboctave/CmplxSCHUR.cc Sat Mar 2 19:16:15 1996 --- octave-2.0.15/liboctave/CmplxSCHUR.cc Wed Nov 3 22:09:56 1999 *************** *** 41,47 **** const int&, int&, Complex*, Complex*, const int&, double&, double&, Complex*, const int&, double*, int*, ! int&, long, long); } static int --- 41,47 ---- const int&, int&, Complex*, Complex*, const int&, double&, double&, Complex*, const int&, double*, int*, ! int&, long, long, long); } static int *************** *** 118,124 **** F77_XFCN (zgeesx, ZGEESX, (&jobvs, &sort, selector, &sense, n, s, n, sdim, pw, q, n, rconde, rcondv, pwork, ! lwork, prwork, pbwork, info, 1L, 1L)); if (f77_exception_encountered) (*current_liboctave_error_handler) ("unrecoverable error in zgeesx"); --- 118,124 ---- F77_XFCN (zgeesx, ZGEESX, (&jobvs, &sort, selector, &sense, n, s, n, sdim, pw, q, n, rconde, rcondv, pwork, ! lwork, prwork, pbwork, info, 1L, 1L, 1L)); if (f77_exception_encountered) (*current_liboctave_error_handler) ("unrecoverable error in zgeesx"); diff -cNr octave-2.0.14/liboctave/DASSL.cc octave-2.0.15/liboctave/DASSL.cc *** octave-2.0.14/liboctave/DASSL.cc Thu Jun 18 23:48:56 1998 --- octave-2.0.15/liboctave/DASSL.cc Thu Oct 21 04:38:32 1999 *************** *** 208,216 **** integration_error = 0; if (DAEFunc::jacobian_function ()) ! iwork.elem (4) = 1; else ! iwork.elem (4) = 0; double *px = x.fortran_vec (); double *pxdot = xdot.fortran_vec (); --- 208,216 ---- integration_error = 0; if (DAEFunc::jacobian_function ()) ! info.elem (4) = 1; else ! info.elem (4) = 0; double *px = x.fortran_vec (); double *pxdot = xdot.fortran_vec (); *************** *** 237,244 **** if (stop_time_set) { - info.elem (3) = 1; rwork.elem (0) = stop_time; } else info.elem (3) = 0; --- 237,244 ---- if (stop_time_set) { rwork.elem (0) = stop_time; + info.elem (3) = 1; } else info.elem (3) = 0; *************** *** 256,262 **** if (maximum_step_size () >= 0.0) { ! rwork.elem (2) = maximum_step_size (); info.elem (6) = 1; } else --- 256,262 ---- if (maximum_step_size () >= 0.0) { ! rwork.elem (1) = maximum_step_size (); info.elem (6) = 1; } else diff -cNr octave-2.0.14/liboctave/LSODE.cc octave-2.0.15/liboctave/LSODE.cc *** octave-2.0.14/liboctave/LSODE.cc Thu Oct 8 22:27:32 1998 --- octave-2.0.15/liboctave/LSODE.cc Fri Apr 23 12:22:29 1999 *************** *** 218,229 **** sanity_checked = 1; } ! iwork.elem (5) = step_limit (); if (stop_time_set) { itask = 4; rwork.elem (0) = stop_time; } else { --- 218,234 ---- sanity_checked = 1; } ! if (step_limit () > 0) ! { ! iwork.elem (5) = step_limit (); ! iopt = 1; ! } if (stop_time_set) { itask = 4; rwork.elem (0) = stop_time; + iopt = 1; } else { *************** *** 233,241 **** double abs_tol = absolute_tolerance (); double rel_tol = relative_tolerance (); ! rwork.elem (4) = (initial_step_size () >= 0.0) ? initial_step_size () : 0.0; ! rwork.elem (5) = (maximum_step_size () >= 0.0) ? maximum_step_size () : 0.0; ! rwork.elem (6) = (minimum_step_size () >= 0.0) ? minimum_step_size () : 0.0; int *piwork = iwork.fortran_vec (); double *prwork = rwork.fortran_vec (); --- 238,260 ---- double abs_tol = absolute_tolerance (); double rel_tol = relative_tolerance (); ! if (initial_step_size () >= 0.0) ! { ! rwork.elem (4) = initial_step_size (); ! iopt = 1; ! } ! ! if (maximum_step_size () >= 0.0) ! { ! rwork.elem (5) = maximum_step_size (); ! iopt = 1; ! } ! ! if (minimum_step_size () >= 0.0) ! { ! rwork.elem (6) = minimum_step_size (); ! iopt = 1; ! } int *piwork = iwork.fortran_vec (); double *prwork = rwork.fortran_vec (); diff -cNr octave-2.0.14/liboctave/LSODE.h octave-2.0.15/liboctave/LSODE.h *** octave-2.0.14/liboctave/LSODE.h Thu Oct 8 22:27:44 1998 --- octave-2.0.15/liboctave/LSODE.h Fri Apr 23 11:52:48 1999 *************** *** 78,83 **** --- 78,85 ---- x_maximum_step_size = opt.x_maximum_step_size; x_minimum_step_size = opt.x_minimum_step_size; x_relative_tolerance = opt.x_relative_tolerance; + + x_step_limit = opt.x_step_limit; } void set_default_options (void) { init (); } *************** *** 119,124 **** --- 121,127 ---- double x_maximum_step_size; double x_minimum_step_size; double x_relative_tolerance; + int x_step_limit; }; diff -cNr octave-2.0.14/liboctave/MArray-defs.h octave-2.0.15/liboctave/MArray-defs.h *** octave-2.0.14/liboctave/MArray-defs.h Fri Mar 1 18:33:22 1996 --- octave-2.0.15/liboctave/MArray-defs.h Mon May 10 07:38:32 1999 *************** *** 61,67 **** T *a_tmp = a.fortran_vec (); \ const T *b_tmp = b.data (); \ for (int i = 0; i < l; i++) \ ! a_tmp[i] += b_tmp[i]; \ } \ while (0) --- 61,67 ---- T *a_tmp = a.fortran_vec (); \ const T *b_tmp = b.data (); \ for (int i = 0; i < l; i++) \ ! a_tmp[i] OP b_tmp[i]; \ } \ while (0) diff -cNr octave-2.0.14/liboctave/cmd-hist.cc octave-2.0.15/liboctave/cmd-hist.cc *** octave-2.0.14/liboctave/cmd-hist.cc Sun Feb 2 22:59:24 1997 --- octave-2.0.15/liboctave/cmd-hist.cc Tue Sep 7 08:43:20 1999 *************** *** 64,70 **** { xfile = f; ! ::read_history (f.c_str ()); lines_in_file = where (); --- 64,74 ---- { xfile = f; ! char *FIX_READLINE_PROTOS = ::strdup (f.c_str ()); ! ! ::read_history (FIX_READLINE_PROTOS); ! ! ::free (FIX_READLINE_PROTOS); lines_in_file = where (); *************** *** 123,129 **** || (s.length () == 1 && (s[0] == '\r' || s[0] == '\n'))) return; ! ::add_history (s.c_str ()); lines_this_session++; } } --- 127,138 ---- || (s.length () == 1 && (s[0] == '\r' || s[0] == '\n'))) return; ! char *FIX_READLINE_PROTOS = ::strdup (s.c_str ()); ! ! ::add_history (FIX_READLINE_PROTOS); ! ! ::free (FIX_READLINE_PROTOS); ! lines_this_session++; } } *************** *** 189,195 **** { if (! f.empty ()) { ! int status = ::read_history (f.c_str ()); if (status != 0 && must_exist) error (status); --- 198,208 ---- { if (! f.empty ()) { ! char *FIX_READLINE_PROTOS = ::strdup (f.c_str ()); ! ! int status = ::read_history (FIX_READLINE_PROTOS); ! ! ::free (FIX_READLINE_PROTOS); if (status != 0 && must_exist) error (status); *************** *** 219,225 **** if (! f.empty ()) { ! int status = ::read_history_range (f.c_str (), from, to); if (status != 0 && must_exist) error (status); --- 232,242 ---- if (! f.empty ()) { ! char *FIX_READLINE_PROTOS = ::strdup (f.c_str ()); ! ! int status = ::read_history_range (FIX_READLINE_PROTOS, from, to); ! ! ::free (FIX_READLINE_PROTOS); if (status != 0 && must_exist) error (status); *************** *** 244,250 **** if (! f.empty ()) { ! int status = ::write_history (f.c_str ()); if (status != 0) error (status); --- 261,271 ---- if (! f.empty ()) { ! char *FIX_READLINE_PROTOS = ::strdup (f.c_str ()); ! ! int status = ::write_history (FIX_READLINE_PROTOS); ! ! ::free (FIX_READLINE_PROTOS); if (status != 0) error (status); *************** *** 279,285 **** close (tem); } ! int status = ::append_history (lines_this_session, f.c_str ()); if (status != 0) error (status); --- 300,311 ---- close (tem); } ! char *FIX_READLINE_PROTOS = ::strdup (f.c_str ()); ! ! int status ! = ::append_history (lines_this_session, FIX_READLINE_PROTOS); ! ! ::free (FIX_READLINE_PROTOS); if (status != 0) error (status); *************** *** 303,309 **** f = xfile; if (! f.empty ()) ! ::history_truncate_file (f.c_str (), n); else error ("command_history::truncate_file: missing file name"); } --- 329,341 ---- f = xfile; if (! f.empty ()) ! { ! char *FIX_READLINE_PROTOS = ::strdup (f.c_str ()); ! ! ::history_truncate_file (FIX_READLINE_PROTOS, n); ! ! ::free (FIX_READLINE_PROTOS); ! } else error ("command_history::truncate_file: missing file name"); } *************** *** 366,372 **** void command_history::replace_entry (int which, const string& line) { ! HIST_ENTRY *discard = ::replace_history_entry (which, line.c_str (), 0); if (discard) { --- 398,409 ---- void command_history::replace_entry (int which, const string& line) { ! char *FIX_READLINE_PROTOS = ::strdup (line.c_str ()); ! ! HIST_ENTRY *discard ! = ::replace_history_entry (which, FIX_READLINE_PROTOS, 0); ! ! ::free (FIX_READLINE_PROTOS); if (discard) { *************** *** 392,398 **** stifle (n); ! ::write_history (f.c_str ()); } else error ("command_history::clean_up_and_save: missing file name"); --- 429,439 ---- stifle (n); ! char *FIX_READLINE_PROTOS = ::strdup (f.c_str ()); ! ! ::write_history (FIX_READLINE_PROTOS); ! ! ::free (FIX_READLINE_PROTOS); } else error ("command_history::clean_up_and_save: missing file name"); diff -cNr octave-2.0.14/liboctave/dMatrix.cc octave-2.0.15/liboctave/dMatrix.cc *** octave-2.0.14/liboctave/dMatrix.cc Sat Feb 20 01:57:14 1999 --- octave-2.0.15/liboctave/dMatrix.cc Tue Nov 2 00:14:08 1999 *************** *** 51,56 **** --- 51,65 ---- extern "C" { + int F77_FCN (dgebal, DGEBAL) (const char*, const int&, double*, + const int&, int&, int&, double*, + int&, long, long); + + int F77_FCN (dgebak, DGEBAK) (const char*, const char*, const int&, + const int&, const int&, double*, + const int&, double*, const int&, + int&, long, long); + int F77_FCN (dgemm, DGEMM) (const char*, const char*, const int&, const int&, const int&, const double&, const double*, const int&, *************** *** 1328,1334 **** // range of poles, but avoid making stable eigenvalues unstable. // trace shift value ! double trshift = 0.0; for (int i = 0; i < nc; i++) trshift += m.elem (i, i); --- 1337,1343 ---- // range of poles, but avoid making stable eigenvalues unstable. // trace shift value ! volatile double trshift = 0.0; for (int i = 0; i < nc; i++) trshift += m.elem (i, i); *************** *** 1341,1385 **** m.elem (i, i) -= trshift; } ! // Preconditioning step 2: balancing. ! AEPBALANCE mbal (m, "B"); ! m = mbal.balanced_matrix (); ! Matrix d = mbal.balancing_matrix (); ! // Preconditioning step 3: scaling. ColumnVector work(nc); double inf_norm; ! ! F77_FCN (xdlange, XDLANGE) ("I", nc, nc, m.fortran_vec (), nc, ! work.fortran_vec (), inf_norm); int sqpow = (int) (inf_norm > 0.0 ? (1.0 + log (inf_norm) / log (2.0)) : 0.0); ! // Check whether we need to square at all. ! if (sqpow < 0) sqpow = 0; ! if (sqpow > 0) { double scale_factor = 1.0; for (int i = 0; i < sqpow; i++) scale_factor *= 2.0; ! m = m / scale_factor; } ! // npp, dpp: pade' approx polynomial matrices. ! Matrix npp (nc, nc, 0.0); Matrix dpp = npp; ! // Now powers a^8 ... a^1. ! int minus_one_j = -1; for (int j = 7; j >= 0; j--) { --- 1350,1446 ---- m.elem (i, i) -= trshift; } ! // Preconditioning step 2: balancing; code follows development ! // in AEPBAL ! double *p_m = m.fortran_vec (); ! Array scale(nc); ! double *pscale = scale.fortran_vec (); ! ! int info, ilo, ihi; + // both scale and permute + char job = 'B'; + + F77_XFCN (dgebal, DGEBAL, (&job, nc, p_m, nc, ilo, ihi, pscale, info, + 1L, 1L)); + + if (f77_exception_encountered) + { + (*current_liboctave_error_handler) ("unrecoverable error in dgebal"); + return retval; + } + + // construct balancing matrices D, Dinv + + Matrix dmat = Matrix (nc, nc, 0.0); + Matrix dinv = Matrix (nc, nc, 0.0); + + for (int i = 0; i < nc; i++) + dmat(i,i) = dinv(i,i) = 1.0; + + // dgebak, dside=R => dmat := D*dmat + char dside = 'R'; + F77_XFCN (dgebak, DGEBAK, (&job, &dside, nc, ilo, ihi, pscale, nc, + dmat.fortran_vec(), nc, info, 1L, 1L)); + + if (f77_exception_encountered) + { + (*current_liboctave_error_handler) ("unrecoverable error in dgebak"); + return retval; + } + + // dgebak, dside=L => dinv := dinv*D^{-1} + dside = 'L'; + F77_XFCN (dgebak, DGEBAK, (&job, &dside, nc, ilo, ihi, pscale, nc, + dinv.fortran_vec(), nc, info, 1L, 1L)); + + if (f77_exception_encountered) + { + (*current_liboctave_error_handler) ("unrecoverable error in dgebak"); + return retval; + } + + // Preconditioning step 3: scaling. + ColumnVector work(nc); double inf_norm; ! ! F77_XFCN (xdlange, XDLANGE, ("I", nc, nc, m.fortran_vec (), nc, ! work.fortran_vec (), inf_norm)); ! ! if (f77_exception_encountered) ! { ! (*current_liboctave_error_handler) ("unrecoverable error in dlange"); ! return retval; ! } int sqpow = (int) (inf_norm > 0.0 ? (1.0 + log (inf_norm) / log (2.0)) : 0.0); ! // Check whether we need to square at all. ! if (sqpow < 0) sqpow = 0; ! if (sqpow > 0) { double scale_factor = 1.0; for (int i = 0; i < sqpow; i++) scale_factor *= 2.0; ! m = m / scale_factor; } ! // npp, dpp: pade' approx polynomial matrices. ! Matrix npp (nc, nc, 0.0); Matrix dpp = npp; ! // Now powers a^8 ... a^1. ! int minus_one_j = -1; for (int j = 7; j >= 0; j--) { *************** *** 1387,1424 **** dpp = m * dpp + m * (minus_one_j * padec[j]); minus_one_j *= -1; } ! // Zero power. ! dpp = -dpp; for (int j = 0; j < nc; j++) { npp.elem (j, j) += 1.0; dpp.elem (j, j) += 1.0; } ! // Compute pade approximation = inverse (dpp) * npp. ! retval = dpp.solve (npp); ! // Reverse preconditioning step 3: repeated squaring. ! while (sqpow) { retval = retval * retval; sqpow--; } ! // Reverse preconditioning step 2: inverse balancing. ! ! retval = retval.transpose(); ! d = d.transpose (); ! retval = retval * d; ! retval = d.solve (retval); ! retval = retval.transpose (); ! // Reverse preconditioning step 1: fix trace normalization. ! if (trshift > 0.0) retval = exp (trshift) * retval; --- 1448,1480 ---- dpp = m * dpp + m * (minus_one_j * padec[j]); minus_one_j *= -1; } ! // Zero power. ! dpp = -dpp; for (int j = 0; j < nc; j++) { npp.elem (j, j) += 1.0; dpp.elem (j, j) += 1.0; } ! // Compute pade approximation = inverse (dpp) * npp. ! retval = dpp.solve (npp, info); ! // Reverse preconditioning step 3: repeated squaring. ! while (sqpow) { retval = retval * retval; sqpow--; } ! // Reverse preconditioning step 2: inverse balancing. ! retval = dmat*retval*dinv; ! // Reverse preconditioning step 1: fix trace normalization. ! if (trshift > 0.0) retval = exp (trshift) * retval; diff -cNr octave-2.0.14/liboctave/dbleSCHUR.cc octave-2.0.15/liboctave/dbleSCHUR.cc *** octave-2.0.14/liboctave/dbleSCHUR.cc Sat Mar 2 19:16:15 1996 --- octave-2.0.15/liboctave/dbleSCHUR.cc Wed Nov 3 22:09:37 1999 *************** *** 43,49 **** int&, double*, double*, double*, const int&, double&, double&, double*, const int&, int*, const int&, int*, ! int&, long, long); } static int --- 43,49 ---- int&, double*, double*, double*, const int&, double&, double&, double*, const int&, int*, const int&, int*, ! int&, long, long, long); } static int *************** *** 127,133 **** F77_XFCN (dgeesx, DGEESX, (&jobvs, &sort, selector, &sense, n, s, n, sdim, pwr, pwi, q, n, rconde, rcondv, pwork, lwork, piwork, liwork, pbwork, ! info, 1L, 1L)); if (f77_exception_encountered) (*current_liboctave_error_handler) ("unrecoverable error in dgeesx"); --- 127,133 ---- F77_XFCN (dgeesx, DGEESX, (&jobvs, &sort, selector, &sense, n, s, n, sdim, pwr, pwi, q, n, rconde, rcondv, pwork, lwork, piwork, liwork, pbwork, ! info, 1L, 1L, 1L)); if (f77_exception_encountered) (*current_liboctave_error_handler) ("unrecoverable error in dgeesx"); diff -cNr octave-2.0.14/liboctave/filemode.c octave-2.0.15/liboctave/filemode.c *** octave-2.0.14/liboctave/filemode.c Wed Oct 30 12:48:28 1996 --- octave-2.0.15/liboctave/filemode.c Wed Oct 13 16:30:52 1999 *************** *** 13,19 **** You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software ! Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #ifdef HAVE_CONFIG_H #include --- 13,19 ---- You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software ! Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #ifdef HAVE_CONFIG_H #include diff -cNr octave-2.0.14/liboctave/getopt.c octave-2.0.15/liboctave/getopt.c *** octave-2.0.14/liboctave/getopt.c Sun Jun 25 14:56:32 1995 --- octave-2.0.15/liboctave/getopt.c Wed Oct 13 17:06:36 1999 *************** *** 1,6 **** /* Getopt for GNU. NOTE: getopt is now part of the C library, so if you don't know what ! "Keep this file name-space clean" means, talk to roland@gnu.ai.mit.edu before changing it! Copyright (C) 1987, 88, 89, 90, 91, 92, 1993 --- 1,6 ---- /* Getopt for GNU. NOTE: getopt is now part of the C library, so if you don't know what ! "Keep this file name-space clean" means, talk to roland@gnu.org before changing it! Copyright (C) 1987, 88, 89, 90, 91, 92, 1993 diff -cNr octave-2.0.14/liboctave/idx-vector.cc octave-2.0.15/liboctave/idx-vector.cc *** octave-2.0.14/liboctave/idx-vector.cc Thu Dec 18 16:01:15 1997 --- octave-2.0.15/liboctave/idx-vector.cc Fri Aug 20 08:47:14 1999 *************** *** 402,410 **** } static inline int ! intcmp (int *ii, int *jj) { ! return (*ii - *jj); } static inline void --- 402,410 ---- } static inline int ! intcmp (const void *ii, const void *jj) { ! return (*((const int *) ii) - *((const int *) jj)); } static inline void diff -cNr octave-2.0.14/liboctave/lo-ieee.cc octave-2.0.15/liboctave/lo-ieee.cc *** octave-2.0.14/liboctave/lo-ieee.cc Thu Mar 4 01:51:17 1999 --- octave-2.0.15/liboctave/lo-ieee.cc Fri Sep 3 12:57:18 1999 *************** *** 31,36 **** --- 31,44 ---- #include #endif + #if defined (HAVE_IEEEFP_H) + #include + #endif + + #if defined (HAVE_SUNMATH_H) + #include + #endif + #if defined (HAVE_NAN_H) #if defined (SCO) #define _IEEE 1 *************** *** 39,52 **** #if defined (SCO) #undef _IEEE #endif - #endif - - #if defined (HAVE_INFINITY) - extern "C" double infinity (); - #endif - - #if defined (HAVE_QUIET_NAN) - extern "C" double quiet_nan (long); #endif #include "lo-ieee.h" --- 47,52 ---- diff -cNr octave-2.0.14/liboctave/lo-mappers.cc octave-2.0.15/liboctave/lo-mappers.cc *** octave-2.0.14/liboctave/lo-mappers.cc Sun Nov 1 10:04:17 1998 --- octave-2.0.15/liboctave/lo-mappers.cc Fri Sep 3 12:41:53 1999 *************** *** 27,32 **** --- 27,40 ---- #include #include + #if defined (HAVE_IEEEFP_H) + #include + #endif + + #if defined (HAVE_SUNMATH_H) + #include + #endif + #include "lo-error.h" #include "lo-ieee.h" #include "lo-mappers.h" diff -cNr octave-2.0.14/liboctave/mkdir.c octave-2.0.15/liboctave/mkdir.c *** octave-2.0.14/liboctave/mkdir.c Wed Oct 30 12:48:27 1996 --- octave-2.0.15/liboctave/mkdir.c Wed Oct 13 16:34:26 1999 *************** *** 13,19 **** You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software ! Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #ifdef HAVE_CONFIG_H #include --- 13,19 ---- You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software ! Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #ifdef HAVE_CONFIG_H #include diff -cNr octave-2.0.14/liboctave/pathsearch.cc octave-2.0.15/liboctave/pathsearch.cc *** octave-2.0.14/liboctave/pathsearch.cc Fri Oct 23 22:15:27 1998 --- octave-2.0.15/liboctave/pathsearch.cc Mon Jan 10 13:14:03 2000 *************** *** 75,93 **** { str_llist_type *elt_dirs = kpse_element_dirs (pv[i].c_str ()); ! str_llist_elt_type *dir; ! for (dir = *elt_dirs; dir; dir = STR_LLIST_NEXT (*dir)) { ! char *elt_dir = STR_LLIST (*dir); ! if (elt_dir) { ! if (count == nmax) ! nmax *= 2; ! retval.resize (nmax); ! retval[count++] = elt_dir; } } } --- 75,97 ---- { str_llist_type *elt_dirs = kpse_element_dirs (pv[i].c_str ()); ! if (elt_dirs) { ! str_llist_elt_type *dir; ! for (dir = *elt_dirs; dir; dir = STR_LLIST_NEXT (*dir)) { ! char *elt_dir = STR_LLIST (*dir); ! if (elt_dir) ! { ! if (count == nmax) ! nmax *= 2; ! retval.resize (nmax); ! ! retval[count++] = elt_dir; ! } } } } diff -cNr octave-2.0.14/liboctave/rename.c octave-2.0.15/liboctave/rename.c *** octave-2.0.14/liboctave/rename.c Wed Oct 30 12:48:24 1996 --- octave-2.0.15/liboctave/rename.c Wed Oct 13 16:32:54 1999 *************** *** 13,19 **** You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software ! Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #ifdef HAVE_CONFIG_H #include --- 13,19 ---- You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software ! Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA. */ #ifdef HAVE_CONFIG_H #include diff -cNr octave-2.0.14/liboctave/rmdir.c octave-2.0.15/liboctave/rmdir.c *** octave-2.0.14/liboctave/rmdir.c Wed Oct 30 12:48:22 1996 --- octave-2.0.15/liboctave/rmdir.c Wed Oct 13 16:30:52 1999 *************** *** 13,19 **** You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software ! Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #ifdef HAVE_CONFIG_H #include --- 13,19 ---- You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software ! Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #ifdef HAVE_CONFIG_H #include diff -cNr octave-2.0.14/mkinstalldirs octave-2.0.15/mkinstalldirs *** octave-2.0.14/mkinstalldirs Thu Jul 18 20:43:13 1996 --- octave-2.0.15/mkinstalldirs Wed Oct 13 17:05:17 1999 *************** *** 1,6 **** #!/bin/sh # mkinstalldirs --- make directory hierarchy ! # Author: Noah Friedman # Created: 1993-05-16 # Last modified: Wed Jan 25 09:35:21 1995 # Public domain --- 1,6 ---- #!/bin/sh # mkinstalldirs --- make directory hierarchy ! # Author: Noah Friedman # Created: 1993-05-16 # Last modified: Wed Jan 25 09:35:21 1995 # Public domain diff -cNr octave-2.0.14/octMakefile.in octave-2.0.15/octMakefile.in *** octave-2.0.14/octMakefile.in Mon May 18 16:28:35 1998 --- octave-2.0.15/octMakefile.in Thu Aug 19 16:13:57 1999 *************** *** 24,31 **** acconfig.h config.h.bot install-sh DISTFILES = $(CONF_DISTFILES) \ ! BUGS COPYING INSTALL INSTALL.OCTAVE NEWS NEWS.[0-9] PROJECTS \ ! README README.Linux README.Windows README.MachTen ROADMAP \ SENDING-PATCHES THANKS move-if-change octave-sh octave-bug.in \ install-octave.in mkinstalldirs mkoctfile.in texi2dvi \ ChangeLog ChangeLog.[0-9] --- 24,31 ---- acconfig.h config.h.bot install-sh DISTFILES = $(CONF_DISTFILES) \ ! BUGS COPYING FLEX.patch INSTALL INSTALL.OCTAVE NEWS NEWS.[0-9] \ ! PROJECTS README README.Linux README.Windows README.MachTen ROADMAP \ SENDING-PATCHES THANKS move-if-change octave-sh octave-bug.in \ install-octave.in mkinstalldirs mkoctfile.in texi2dvi \ ChangeLog ChangeLog.[0-9] diff -cNr octave-2.0.14/readline/COPYING octave-2.0.15/readline/COPYING *** octave-2.0.14/readline/COPYING Wed Aug 10 13:46:06 1994 --- octave-2.0.15/readline/COPYING Wed Oct 13 16:34:26 1999 *************** *** 2,8 **** Version 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc. ! 675 Mass Ave, Cambridge, MA 02139, USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. --- 2,8 ---- Version 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc. ! 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. *************** *** 305,311 **** You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software ! Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. Also add information on how to contact you by electronic and paper mail. --- 305,311 ---- You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software ! Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. Also add information on how to contact you by electronic and paper mail. diff -cNr octave-2.0.14/readline/ChangeLog octave-2.0.15/readline/ChangeLog *** octave-2.0.14/readline/ChangeLog Mon Aug 31 12:07:31 1998 --- octave-2.0.15/readline/ChangeLog Wed Oct 13 01:36:50 1999 *************** *** 1,3 **** --- 1,7 ---- + 1999-10-13 John W. Eaton + + * terminal.c: (rl_resize_terminal): Import from readline 4.0. + Mon Aug 31 12:07:02 1998 John W. Eaton * config.sub: Accept armv4 everywhere arm is allowed. diff -cNr octave-2.0.14/readline/Makefile.in octave-2.0.15/readline/Makefile.in *** octave-2.0.14/readline/Makefile.in Fri Jan 16 21:02:57 1998 --- octave-2.0.15/readline/Makefile.in Wed Oct 13 16:30:52 1999 *************** *** 14,20 **** # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software ! # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. RL_LIBRARY_VERSION = @LIBVERSION@ RL_LIBRARY_NAME = readline --- 14,20 ---- # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software ! # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. RL_LIBRARY_VERSION = @LIBVERSION@ RL_LIBRARY_NAME = readline diff -cNr octave-2.0.14/readline/README octave-2.0.15/readline/README *** octave-2.0.14/readline/README Fri Mar 14 10:01:47 1997 --- octave-2.0.15/readline/README Wed Oct 13 17:06:13 1999 *************** *** 89,95 **** Bug reports for Readline should be sent to: ! bug-readline@prep.ai.mit.edu When reporting a bug, please include the following information: --- 89,95 ---- Bug reports for Readline should be sent to: ! bug-readline@gnu.org When reporting a bug, please include the following information: *************** *** 102,110 **** * a fix for the bug if you have one! If you would like to contact the Readline maintainer directly, send mail ! to bash-maintainers@prep.ai.mit.edu. ! Since Readline is developed along with bash, the bug-bash@prep.ai.mit.edu mailing list (mirrored to the Usenet newsgroup gnu.bash.bug) often contains Readline bug reports and fixes. --- 102,110 ---- * a fix for the bug if you have one! If you would like to contact the Readline maintainer directly, send mail ! to bash-maintainers@gnu.org. ! Since Readline is developed along with bash, the bug-bash@gnu.org mailing list (mirrored to the Usenet newsgroup gnu.bash.bug) often contains Readline bug reports and fixes. diff -cNr octave-2.0.14/readline/ansi_stdlib.h octave-2.0.15/readline/ansi_stdlib.h *** octave-2.0.14/readline/ansi_stdlib.h Sun Dec 19 14:06:41 1993 --- octave-2.0.15/readline/ansi_stdlib.h Wed Oct 13 16:32:54 1999 *************** *** 18,24 **** You should have received a copy of the GNU General Public License along with Bash; see the file COPYING. If not, write to the Free Software ! Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ #if !defined (_STDLIB_H_) #define _STDLIB_H_ 1 --- 18,24 ---- You should have received a copy of the GNU General Public License along with Bash; see the file COPYING. If not, write to the Free Software ! Foundation, 59 Temple Place, Suite 330, Boston, MA 02111 USA. */ #if !defined (_STDLIB_H_) #define _STDLIB_H_ 1 diff -cNr octave-2.0.14/readline/bind.c octave-2.0.15/readline/bind.c *** octave-2.0.14/readline/bind.c Wed Apr 2 11:11:45 1997 --- octave-2.0.15/readline/bind.c Wed Oct 13 16:34:26 1999 *************** *** 18,24 **** The GNU General Public License is often shipped with GNU software, and is generally kept in a file called COPYING or LICENSE. If you do not have a copy of the license, write to the Free Software Foundation, ! 675 Mass Ave, Cambridge, MA 02139, USA. */ #define READLINE_LIBRARY #if defined (HAVE_CONFIG_H) --- 18,24 ---- The GNU General Public License is often shipped with GNU software, and is generally kept in a file called COPYING or LICENSE. If you do not have a copy of the license, write to the Free Software Foundation, ! 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #define READLINE_LIBRARY #if defined (HAVE_CONFIG_H) diff -cNr octave-2.0.14/readline/callback.c octave-2.0.15/readline/callback.c *** octave-2.0.14/readline/callback.c Mon Mar 3 15:04:40 1997 --- octave-2.0.15/readline/callback.c Wed Oct 13 16:30:52 1999 *************** *** 18,24 **** The GNU General Public License is often shipped with GNU software, and is generally kept in a file called COPYING or LICENSE. If you do not have a copy of the license, write to the Free Software Foundation, ! 675 Mass Ave, Cambridge, MA 02139, USA. */ #define READLINE_LIBRARY #if defined (HAVE_CONFIG_H) --- 18,24 ---- The GNU General Public License is often shipped with GNU software, and is generally kept in a file called COPYING or LICENSE. If you do not have a copy of the license, write to the Free Software Foundation, ! 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #define READLINE_LIBRARY #if defined (HAVE_CONFIG_H) diff -cNr octave-2.0.14/readline/chardefs.h octave-2.0.15/readline/chardefs.h *** octave-2.0.14/readline/chardefs.h Tue Sep 10 10:05:16 1996 --- octave-2.0.15/readline/chardefs.h Wed Oct 13 16:34:26 1999 *************** *** 18,24 **** The GNU General Public License is often shipped with GNU software, and is generally kept in a file called COPYING or LICENSE. If you do not have a copy of the license, write to the Free Software Foundation, ! 675 Mass Ave, Cambridge, MA 02139, USA. */ #ifndef _CHARDEFS_H_ #define _CHARDEFS_H_ --- 18,24 ---- The GNU General Public License is often shipped with GNU software, and is generally kept in a file called COPYING or LICENSE. If you do not have a copy of the license, write to the Free Software Foundation, ! 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #ifndef _CHARDEFS_H_ #define _CHARDEFS_H_ diff -cNr octave-2.0.14/readline/complete.c octave-2.0.15/readline/complete.c *** octave-2.0.14/readline/complete.c Mon May 19 11:09:05 1997 --- octave-2.0.15/readline/complete.c Wed Oct 13 16:32:54 1999 *************** *** 18,24 **** The GNU General Public License is often shipped with GNU software, and is generally kept in a file called COPYING or LICENSE. If you do not have a copy of the license, write to the Free Software Foundation, ! 675 Mass Ave, Cambridge, MA 02139, USA. */ #define READLINE_LIBRARY #if defined (HAVE_CONFIG_H) --- 18,24 ---- The GNU General Public License is often shipped with GNU software, and is generally kept in a file called COPYING or LICENSE. If you do not have a copy of the license, write to the Free Software Foundation, ! 59 Temple Place, Suite 330, Boston, MA 02111 USA. */ #define READLINE_LIBRARY #if defined (HAVE_CONFIG_H) diff -cNr octave-2.0.14/readline/configure octave-2.0.15/readline/configure *** octave-2.0.14/readline/configure Wed Apr 14 12:58:11 1999 --- octave-2.0.15/readline/configure Mon Jan 10 18:10:18 2000 *************** *** 1,6 **** #! /bin/sh ! # From configure.in for Readline 2.1, version 2.04, from autoconf version 2.13 LIBVERSION=2.1 --- 1,6 ---- #! /bin/sh ! # From configure.in for Readline 2.1, version 2.04, from autoconf version 2.12 LIBVERSION=2.1 *************** *** 77,83 **** # Guess values for system-dependent variables and create Makefiles. ! # Generated automatically using autoconf version 2.13 # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. # # This configure script is free software; the Free Software Foundation --- 77,83 ---- # Guess values for system-dependent variables and create Makefiles. ! # Generated automatically using autoconf version 2.12 # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. # # This configure script is free software; the Free Software Foundation *************** *** 125,131 **** # Initialize some other variables. subdirs= MFLAGS= MAKEFLAGS= - SHELL=${CONFIG_SHELL-/bin/sh} # Maximum number of lines to put in a shell here document. ac_max_here_lines=12 --- 125,130 ---- *************** *** 409,415 **** verbose=yes ;; -version | --version | --versio | --versi | --vers) ! echo "configure generated by autoconf version 2.13" exit 0 ;; -with-* | --with-*) --- 408,414 ---- verbose=yes ;; -version | --version | --versio | --versi | --vers) ! echo "configure generated by autoconf version 2.12" exit 0 ;; -with-* | --with-*) *************** *** 579,589 **** # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' ! ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_cc_cross - ac_exeext= - ac_objext=o if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu. if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then --- 578,586 ---- # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' ! ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_cc_cross if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu. if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then *************** *** 623,648 **** # Make sure we can run config.sub. ! if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then : else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } fi echo $ac_n "checking host system type""... $ac_c" 1>&6 ! echo "configure:632: checking host system type" >&5 host_alias=$host case "$host_alias" in NONE) case $nonopt in NONE) ! if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then : else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; } fi ;; *) host_alias=$nonopt ;; esac ;; esac ! host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias` host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` --- 620,645 ---- # Make sure we can run config.sub. ! if $ac_config_sub sun4 >/dev/null 2>&1; then : else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } fi echo $ac_n "checking host system type""... $ac_c" 1>&6 ! echo "configure:629: checking host system type" >&5 host_alias=$host case "$host_alias" in NONE) case $nonopt in NONE) ! if host_alias=`$ac_config_guess`; then : else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; } fi ;; *) host_alias=$nonopt ;; esac ;; esac ! host=`$ac_config_sub $host_alias` host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` *************** *** 655,670 **** # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ! echo "configure:659: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else ! IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" ! ac_dummy="$PATH" ! for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then ac_cv_prog_CC="gcc" --- 652,666 ---- # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ! echo "configure:656: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else ! IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" ! for ac_dir in $PATH; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then ac_cv_prog_CC="gcc" *************** *** 685,701 **** # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ! echo "configure:689: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else ! IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" ac_prog_rejected=no ! ac_dummy="$PATH" ! for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then --- 681,696 ---- # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ! echo "configure:685: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else ! IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" ac_prog_rejected=no ! for ac_dir in $PATH; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then *************** *** 730,790 **** echo "$ac_t""no" 1>&6 fi - if test -z "$CC"; then - case "`uname -s`" in - *win32* | *WIN32*) - # Extract the first word of "cl", so it can be a program name with args. - set dummy cl; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 - echo "configure:740: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. - else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_CC="cl" - break - fi - done - IFS="$ac_save_ifs" - fi - fi - CC="$ac_cv_prog_CC" - if test -n "$CC"; then - echo "$ac_t""$CC" 1>&6 - else - echo "$ac_t""no" 1>&6 - fi - ;; - esac - fi test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 ! echo "configure:772: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' ! ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_cc_cross ! cat > conftest.$ac_ext << EOF ! ! #line 783 "configure" #include "confdefs.h" - main(){return(0);} EOF ! if { (eval echo configure:788: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then --- 725,749 ---- echo "$ac_t""no" 1>&6 fi test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 ! echo "configure:733: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' ! ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_cc_cross ! cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then *************** *** 798,821 **** ac_cv_prog_cc_works=no fi rm -fr conftest* - ac_ext=c - # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. - ac_cpp='$CPP $CPPFLAGS' - ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' - ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' - cross_compiling=$ac_cv_prog_cc_cross echo "$ac_t""$ac_cv_prog_cc_works" 1>&6 if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 ! echo "configure:814: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 ! echo "configure:819: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else --- 757,774 ---- ac_cv_prog_cc_works=no fi rm -fr conftest* echo "$ac_t""$ac_cv_prog_cc_works" 1>&6 if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 ! echo "configure:767: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 ! echo "configure:772: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else *************** *** 824,830 **** yes; #endif EOF ! if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:828: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no --- 777,783 ---- yes; #endif EOF ! if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:781: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no *************** *** 835,849 **** if test $ac_cv_prog_gcc = yes; then GCC=yes ! else ! GCC= ! fi ! ! ac_test_CFLAGS="${CFLAGS+set}" ! ac_save_CFLAGS="$CFLAGS" ! CFLAGS= ! echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 ! echo "configure:847: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else --- 788,798 ---- if test $ac_cv_prog_gcc = yes; then GCC=yes ! ac_test_CFLAGS="${CFLAGS+set}" ! ac_save_CFLAGS="$CFLAGS" ! CFLAGS= ! echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 ! echo "configure:796: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else *************** *** 858,877 **** fi echo "$ac_t""$ac_cv_prog_cc_g" 1>&6 ! if test "$ac_test_CFLAGS" = set; then ! CFLAGS="$ac_save_CFLAGS" ! elif test $ac_cv_prog_cc_g = yes; then ! if test "$GCC" = yes; then CFLAGS="-g -O2" else - CFLAGS="-g" - fi - else - if test "$GCC" = yes; then CFLAGS="-O2" - else - CFLAGS= fi fi --- 807,822 ---- fi echo "$ac_t""$ac_cv_prog_cc_g" 1>&6 ! if test "$ac_test_CFLAGS" = set; then ! CFLAGS="$ac_save_CFLAGS" ! elif test $ac_cv_prog_cc_g = yes; then CFLAGS="-g -O2" else CFLAGS="-O2" fi + else + GCC= + test "${CFLAGS+set}" = set || CFLAGS="-g" fi *************** *** 879,885 **** test -n "$GCC" && test -n "$auto_cflags" && CFLAGS="$CFLAGS -O" echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 ! echo "configure:883: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= --- 824,830 ---- test -n "$GCC" && test -n "$auto_cflags" && CFLAGS="$CFLAGS -O" echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 ! echo "configure:828: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= *************** *** 894,907 **** # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo configure:904: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ! ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : else --- 839,852 ---- # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo configure:849: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ! ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : else *************** *** 911,941 **** rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo configure:921: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ! ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ! if test -z "$ac_err"; then ! : ! else ! echo "$ac_err" >&5 ! echo "configure: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ! rm -rf conftest* ! CPP="${CC-cc} -nologo -E" ! cat > conftest.$ac_ext < ! Syntax Error ! EOF ! ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo configure:938: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ! ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : else --- 856,869 ---- rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo configure:866: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ! ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : else *************** *** 948,955 **** rm -f conftest* fi rm -f conftest* - fi - rm -f conftest* ac_cv_prog_CPP="$CPP" fi CPP="$ac_cv_prog_CPP" --- 876,881 ---- *************** *** 960,972 **** if test $ac_cv_prog_gcc = yes; then echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6 ! echo "configure:964: checking whether ${CC-cc} needs -traditional" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_pattern="Autoconf.*'x'" cat > conftest.$ac_ext < Autoconf TIOCGETP --- 886,898 ---- if test $ac_cv_prog_gcc = yes; then echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6 ! echo "configure:890: checking whether ${CC-cc} needs -traditional" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_pattern="Autoconf.*'x'" cat > conftest.$ac_ext < Autoconf TIOCGETP *************** *** 984,990 **** if test $ac_cv_prog_gcc_traditional = no; then cat > conftest.$ac_ext < Autoconf TCGETA --- 910,916 ---- if test $ac_cv_prog_gcc_traditional = no; then cat > conftest.$ac_ext < Autoconf TCGETA *************** *** 1012,1041 **** # SunOS /usr/etc/install # IRIX /sbin/install # AIX /bin/install - # AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag # AFS /usr/afsws/bin/install, which mishandles nonexistent args # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 ! echo "configure:1021: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ! IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":" for ac_dir in $PATH; do # Account for people who put trailing slashes in PATH elements. case "$ac_dir/" in /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;; *) # OSF1 and SCO ODT 3.0 have their own names for install. ! # Don't use installbsd from OSF since it installs stuff as root ! # by default. ! for ac_prog in ginstall scoinst install; do if test -f $ac_dir/$ac_prog; then if test $ac_prog = install && grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. : else ac_cv_path_install="$ac_dir/$ac_prog -c" --- 938,965 ---- # SunOS /usr/etc/install # IRIX /sbin/install # AIX /bin/install # AFS /usr/afsws/bin/install, which mishandles nonexistent args # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 ! echo "configure:946: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ! IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS="${IFS}:" for ac_dir in $PATH; do # Account for people who put trailing slashes in PATH elements. case "$ac_dir/" in /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;; *) # OSF1 and SCO ODT 3.0 have their own names for install. ! for ac_prog in ginstall installbsd scoinst install; do if test -f $ac_dir/$ac_prog; then if test $ac_prog = install && grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. + # OSF/1 installbsd also uses dspmsg, but is usable. : else ac_cv_path_install="$ac_dir/$ac_prog -c" *************** *** 1065,1087 **** # It thinks the first close brace ends the variable substitution. test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' - test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' - test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ! echo "configure:1076: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$RANLIB"; then ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. else ! IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" ! ac_dummy="$PATH" ! for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then ac_cv_prog_RANLIB="ranlib" --- 989,1008 ---- # It thinks the first close brace ends the variable substitution. test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ! echo "configure:998: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$RANLIB"; then ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. else ! IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" ! for ac_dir in $PATH; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then ac_cv_prog_RANLIB="ranlib" *************** *** 1101,1112 **** echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 ! echo "configure:1105: checking return type of signal handlers" >&5 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include --- 1022,1033 ---- echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 ! echo "configure:1026: checking return type of signal handlers" >&5 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include *************** *** 1123,1129 **** int i; ; return 0; } EOF ! if { (eval echo configure:1127: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else --- 1044,1050 ---- int i; ; return 0; } EOF ! if { (eval echo configure:1048: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else *************** *** 1143,1154 **** echo $ac_n "checking whether stat file-mode macros are broken""... $ac_c" 1>&6 ! echo "configure:1147: checking whether stat file-mode macros are broken" >&5 if eval "test \"`echo '$''{'ac_cv_header_stat_broken'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include --- 1064,1075 ---- echo $ac_n "checking whether stat file-mode macros are broken""... $ac_c" 1>&6 ! echo "configure:1068: checking whether stat file-mode macros are broken" >&5 if eval "test \"`echo '$''{'ac_cv_header_stat_broken'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include *************** *** 1203,1214 **** do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6 ! echo "configure:1207: checking for $ac_hdr that defines DIR" >&5 if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include <$ac_hdr> --- 1124,1135 ---- do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6 ! echo "configure:1128: checking for $ac_hdr that defines DIR" >&5 if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include <$ac_hdr> *************** *** 1216,1222 **** DIR *dirp = 0; ; return 0; } EOF ! if { (eval echo configure:1220: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_dirent_$ac_safe=yes" else --- 1137,1143 ---- DIR *dirp = 0; ; return 0; } EOF ! if { (eval echo configure:1141: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_dirent_$ac_safe=yes" else *************** *** 1241,1247 **** # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. if test $ac_header_dirent = dirent.h; then echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6 ! echo "configure:1245: checking for opendir in -ldir" >&5 ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 --- 1162,1168 ---- # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. if test $ac_header_dirent = dirent.h; then echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6 ! echo "configure:1166: checking for opendir in -ldir" >&5 ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 *************** *** 1249,1255 **** ac_save_LIBS="$LIBS" LIBS="-ldir $LIBS" cat > conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else --- 1181,1187 ---- opendir() ; return 0; } EOF ! if { (eval echo configure:1185: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else *************** *** 1282,1288 **** else echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 ! echo "configure:1286: checking for opendir in -lx" >&5 ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 --- 1203,1209 ---- else echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 ! echo "configure:1207: checking for opendir in -lx" >&5 ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 *************** *** 1290,1296 **** ac_save_LIBS="$LIBS" LIBS="-lx $LIBS" cat > conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else --- 1222,1228 ---- opendir() ; return 0; } EOF ! if { (eval echo configure:1226: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else *************** *** 1327,1338 **** for ac_func in strcasecmp select setenv putenv tcgetattr setlocale lstat do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 ! echo "configure:1331: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 ! echo "configure:1252: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else --- 1276,1282 ---- ; return 0; } EOF ! if { (eval echo configure:1280: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else *************** *** 1381,1387 **** echo $ac_n "checking for working strcoll""... $ac_c" 1>&6 ! echo "configure:1385: checking for working strcoll" >&5 if eval "test \"`echo '$''{'ac_cv_func_strcoll_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else --- 1302,1308 ---- echo $ac_n "checking for working strcoll""... $ac_c" 1>&6 ! echo "configure:1306: checking for working strcoll" >&5 if eval "test \"`echo '$''{'ac_cv_func_strcoll_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else *************** *** 1389,1395 **** ac_cv_func_strcoll_works=no else cat > conftest.$ac_ext < main () --- 1310,1316 ---- ac_cv_func_strcoll_works=no else cat > conftest.$ac_ext < main () *************** *** 1399,1405 **** strcoll ("123", "456") >= 0); } EOF ! if { (eval echo configure:1403: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_strcoll_works=yes else --- 1320,1326 ---- strcoll ("123", "456") >= 0); } EOF ! if { (eval echo configure:1324: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_func_strcoll_works=yes else *************** *** 1428,1445 **** do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 ! echo "configure:1432: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo configure:1442: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ! ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* eval "ac_cv_header_$ac_safe=yes" --- 1349,1366 ---- do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 ! echo "configure:1353: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo configure:1363: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ! ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* eval "ac_cv_header_$ac_safe=yes" *************** *** 1467,1479 **** echo $ac_n "checking for type of signal functions""... $ac_c" 1>&6 ! echo "configure:1471: checking for type of signal functions" >&5 if eval "test \"`echo '$''{'bash_cv_signal_vintage'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { --- 1388,1400 ---- echo $ac_n "checking for type of signal functions""... $ac_c" 1>&6 ! echo "configure:1392: checking for type of signal functions" >&5 if eval "test \"`echo '$''{'bash_cv_signal_vintage'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { *************** *** 1486,1492 **** ; return 0; } EOF ! if { (eval echo configure:1490: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* bash_cv_signal_vintage=posix else --- 1407,1413 ---- ; return 0; } EOF ! if { (eval echo configure:1411: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* bash_cv_signal_vintage=posix else *************** *** 1495,1501 **** rm -rf conftest* cat > conftest.$ac_ext < int main() { --- 1416,1422 ---- rm -rf conftest* cat > conftest.$ac_ext < int main() { *************** *** 1505,1511 **** ; return 0; } EOF ! if { (eval echo configure:1509: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* bash_cv_signal_vintage=4.2bsd else --- 1426,1432 ---- ; return 0; } EOF ! if { (eval echo configure:1430: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* bash_cv_signal_vintage=4.2bsd else *************** *** 1514,1520 **** rm -rf conftest* cat > conftest.$ac_ext < --- 1435,1441 ---- rm -rf conftest* cat > conftest.$ac_ext < *************** *** 1527,1533 **** ; return 0; } EOF ! if { (eval echo configure:1531: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* bash_cv_signal_vintage=svr3 else --- 1448,1454 ---- ; return 0; } EOF ! if { (eval echo configure:1452: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* bash_cv_signal_vintage=svr3 else *************** *** 1568,1574 **** echo $ac_n "checking if signal handlers must be reinstalled when invoked""... $ac_c" 1>&6 ! echo "configure:1572: checking if signal handlers must be reinstalled when invoked" >&5 if eval "test \"`echo '$''{'bash_cv_must_reinstall_sighandlers'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else --- 1489,1495 ---- echo $ac_n "checking if signal handlers must be reinstalled when invoked""... $ac_c" 1>&6 ! echo "configure:1493: checking if signal handlers must be reinstalled when invoked" >&5 if eval "test \"`echo '$''{'bash_cv_must_reinstall_sighandlers'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else *************** *** 1580,1586 **** fi else cat > conftest.$ac_ext < --- 1501,1507 ---- fi else cat > conftest.$ac_ext < *************** *** 1627,1633 **** } EOF ! if { (eval echo configure:1631: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then bash_cv_must_reinstall_sighandlers=no else --- 1548,1554 ---- } EOF ! if { (eval echo configure:1552: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then bash_cv_must_reinstall_sighandlers=no else *************** *** 1656,1662 **** echo $ac_n "checking for presence of POSIX-style sigsetjmp/siglongjmp""... $ac_c" 1>&6 ! echo "configure:1660: checking for presence of POSIX-style sigsetjmp/siglongjmp" >&5 if eval "test \"`echo '$''{'bash_cv_func_sigsetjmp'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else --- 1577,1583 ---- echo $ac_n "checking for presence of POSIX-style sigsetjmp/siglongjmp""... $ac_c" 1>&6 ! echo "configure:1581: checking for presence of POSIX-style sigsetjmp/siglongjmp" >&5 if eval "test \"`echo '$''{'bash_cv_func_sigsetjmp'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else *************** *** 1664,1670 **** bash_cv_func_sigsetjmp=present else cat > conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then bash_cv_func_sigsetjmp=present else --- 1626,1632 ---- #endif } EOF ! if { (eval echo configure:1630: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then bash_cv_func_sigsetjmp=present else *************** *** 1733,1744 **** fi echo $ac_n "checking for lstat""... $ac_c" 1>&6 ! echo "configure:1737: checking for lstat" >&5 if eval "test \"`echo '$''{'bash_cv_func_lstat'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < --- 1654,1665 ---- fi echo $ac_n "checking for lstat""... $ac_c" 1>&6 ! echo "configure:1658: checking for lstat" >&5 if eval "test \"`echo '$''{'bash_cv_func_lstat'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < *************** *** 1748,1754 **** lstat("",(struct stat *)0); ; return 0; } EOF ! if { (eval echo configure:1752: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* bash_cv_func_lstat=yes else --- 1669,1675 ---- lstat("",(struct stat *)0); ; return 0; } EOF ! if { (eval echo configure:1673: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* bash_cv_func_lstat=yes else *************** *** 1769,1780 **** fi echo $ac_n "checking whether programs are able to redeclare getpw functions""... $ac_c" 1>&6 ! echo "configure:1773: checking whether programs are able to redeclare getpw functions" >&5 if eval "test \"`echo '$''{'bash_cv_can_redecl_getpw'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include --- 1690,1701 ---- fi echo $ac_n "checking whether programs are able to redeclare getpw functions""... $ac_c" 1>&6 ! echo "configure:1694: checking whether programs are able to redeclare getpw functions" >&5 if eval "test \"`echo '$''{'bash_cv_can_redecl_getpw'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include *************** *** 1783,1789 **** struct passwd *z; z = getpwent(); ; return 0; } EOF ! if { (eval echo configure:1787: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* bash_cv_can_redecl_getpw=yes else --- 1704,1710 ---- struct passwd *z; z = getpwent(); ; return 0; } EOF ! if { (eval echo configure:1708: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* bash_cv_can_redecl_getpw=yes else *************** *** 1805,1811 **** echo $ac_n "checking whether or not strcoll and strcmp differ""... $ac_c" 1>&6 ! echo "configure:1809: checking whether or not strcoll and strcmp differ" >&5 if eval "test \"`echo '$''{'bash_cv_func_strcoll_broken'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else --- 1726,1732 ---- echo $ac_n "checking whether or not strcoll and strcmp differ""... $ac_c" 1>&6 ! echo "configure:1730: checking whether or not strcoll and strcmp differ" >&5 if eval "test \"`echo '$''{'bash_cv_func_strcoll_broken'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else *************** *** 1813,1819 **** bash_cv_func_strcoll_broken=no else cat > conftest.$ac_ext < --- 1734,1740 ---- bash_cv_func_strcoll_broken=no else cat > conftest.$ac_ext < *************** *** 1852,1858 **** } EOF ! if { (eval echo configure:1856: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then bash_cv_func_strcoll_broken=yes else --- 1773,1779 ---- } EOF ! if { (eval echo configure:1777: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then bash_cv_func_strcoll_broken=yes else *************** *** 1881,1892 **** echo $ac_n "checking whether signal handlers are of type void""... $ac_c" 1>&6 ! echo "configure:1885: checking whether signal handlers are of type void" >&5 if eval "test \"`echo '$''{'bash_cv_void_sighandler'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include --- 1802,1813 ---- echo $ac_n "checking whether signal handlers are of type void""... $ac_c" 1>&6 ! echo "configure:1806: checking whether signal handlers are of type void" >&5 if eval "test \"`echo '$''{'bash_cv_void_sighandler'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include *************** *** 1901,1907 **** int i; ; return 0; } EOF ! if { (eval echo configure:1905: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* bash_cv_void_sighandler=yes else --- 1822,1828 ---- int i; ; return 0; } EOF ! if { (eval echo configure:1826: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* bash_cv_void_sighandler=yes else *************** *** 1921,1932 **** fi echo $ac_n "checking for TIOCGWINSZ in sys/ioctl.h""... $ac_c" 1>&6 ! echo "configure:1925: checking for TIOCGWINSZ in sys/ioctl.h" >&5 if eval "test \"`echo '$''{'bash_cv_tiocgwinsz_in_ioctl'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include --- 1842,1853 ---- fi echo $ac_n "checking for TIOCGWINSZ in sys/ioctl.h""... $ac_c" 1>&6 ! echo "configure:1846: checking for TIOCGWINSZ in sys/ioctl.h" >&5 if eval "test \"`echo '$''{'bash_cv_tiocgwinsz_in_ioctl'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include *************** *** 1934,1940 **** int x = TIOCGWINSZ; ; return 0; } EOF ! if { (eval echo configure:1938: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* bash_cv_tiocgwinsz_in_ioctl=yes else --- 1855,1861 ---- int x = TIOCGWINSZ; ; return 0; } EOF ! if { (eval echo configure:1859: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* bash_cv_tiocgwinsz_in_ioctl=yes else *************** *** 1955,1966 **** fi echo $ac_n "checking for TIOCSTAT in sys/ioctl.h""... $ac_c" 1>&6 ! echo "configure:1959: checking for TIOCSTAT in sys/ioctl.h" >&5 if eval "test \"`echo '$''{'bash_cv_tiocstat_in_ioctl'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include --- 1876,1887 ---- fi echo $ac_n "checking for TIOCSTAT in sys/ioctl.h""... $ac_c" 1>&6 ! echo "configure:1880: checking for TIOCSTAT in sys/ioctl.h" >&5 if eval "test \"`echo '$''{'bash_cv_tiocstat_in_ioctl'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include *************** *** 1968,1974 **** int x = TIOCSTAT; ; return 0; } EOF ! if { (eval echo configure:1972: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* bash_cv_tiocstat_in_ioctl=yes else --- 1889,1895 ---- int x = TIOCSTAT; ; return 0; } EOF ! if { (eval echo configure:1893: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* bash_cv_tiocstat_in_ioctl=yes else *************** *** 1989,2000 **** fi echo $ac_n "checking for FIONREAD in sys/ioctl.h""... $ac_c" 1>&6 ! echo "configure:1993: checking for FIONREAD in sys/ioctl.h" >&5 if eval "test \"`echo '$''{'bash_cv_fionread_in_ioctl'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include --- 1910,1921 ---- fi echo $ac_n "checking for FIONREAD in sys/ioctl.h""... $ac_c" 1>&6 ! echo "configure:1914: checking for FIONREAD in sys/ioctl.h" >&5 if eval "test \"`echo '$''{'bash_cv_fionread_in_ioctl'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include *************** *** 2002,2008 **** int x = FIONREAD; ; return 0; } EOF ! if { (eval echo configure:2006: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* bash_cv_fionread_in_ioctl=yes else --- 1923,1929 ---- int x = FIONREAD; ; return 0; } EOF ! if { (eval echo configure:1927: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* bash_cv_fionread_in_ioctl=yes else *************** *** 2023,2041 **** fi echo $ac_n "checking for speed_t in sys/types.h""... $ac_c" 1>&6 ! echo "configure:2027: checking for speed_t in sys/types.h" >&5 if eval "test \"`echo '$''{'bash_cv_speed_t_in_sys_types'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { speed_t x; ; return 0; } EOF ! if { (eval echo configure:2039: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* bash_cv_speed_t_in_sys_types=yes else --- 1944,1962 ---- fi echo $ac_n "checking for speed_t in sys/types.h""... $ac_c" 1>&6 ! echo "configure:1948: checking for speed_t in sys/types.h" >&5 if eval "test \"`echo '$''{'bash_cv_speed_t_in_sys_types'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { speed_t x; ; return 0; } EOF ! if { (eval echo configure:1960: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* bash_cv_speed_t_in_sys_types=yes else *************** *** 2057,2068 **** echo $ac_n "checking if struct dirent has a d_ino member""... $ac_c" 1>&6 ! echo "configure:2061: checking if struct dirent has a d_ino member" >&5 if eval "test \"`echo '$''{'bash_cv_dirent_has_dino'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < --- 1978,1989 ---- echo $ac_n "checking if struct dirent has a d_ino member""... $ac_c" 1>&6 ! echo "configure:1982: checking if struct dirent has a d_ino member" >&5 if eval "test \"`echo '$''{'bash_cv_dirent_has_dino'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < *************** *** 2091,2097 **** ; return 0; } EOF ! if { (eval echo configure:2095: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* bash_cv_dirent_has_dino=yes else --- 2012,2018 ---- ; return 0; } EOF ! if { (eval echo configure:2016: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* bash_cv_dirent_has_dino=yes else *************** *** 2113,2124 **** echo $ac_n "checking if struct dirent has a d_fileno member""... $ac_c" 1>&6 ! echo "configure:2117: checking if struct dirent has a d_fileno member" >&5 if eval "test \"`echo '$''{'bash_cv_dirent_has_d_fileno'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < --- 2034,2045 ---- echo $ac_n "checking if struct dirent has a d_fileno member""... $ac_c" 1>&6 ! echo "configure:2038: checking if struct dirent has a d_fileno member" >&5 if eval "test \"`echo '$''{'bash_cv_dirent_has_d_fileno'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < *************** *** 2147,2153 **** ; return 0; } EOF ! if { (eval echo configure:2151: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* bash_cv_dirent_has_d_fileno=yes else --- 2068,2074 ---- ; return 0; } EOF ! if { (eval echo configure:2072: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* bash_cv_dirent_has_d_fileno=yes else *************** *** 2208,2214 **** # Ultrix sh set writes to stderr and can't be redirected directly, # and sets the high bit in the cache file unless we assign to the vars. (set) 2>&1 | ! case `(ac_space=' '; set | grep ac_space) 2>&1` in *ac_space=\ *) # `set' does not quote correctly, so add quotes (double-quote substitution # turns \\\\ into \\, and sed turns \\ into \). --- 2129,2135 ---- # Ultrix sh set writes to stderr and can't be redirected directly, # and sets the high bit in the cache file unless we assign to the vars. (set) 2>&1 | ! case `(ac_space=' '; set) 2>&1` in *ac_space=\ *) # `set' does not quote correctly, so add quotes (double-quote substitution # turns \\\\ into \\, and sed turns \\ into \). *************** *** 2275,2281 **** echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion" exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;; -version | --version | --versio | --versi | --vers | --ver | --ve | --v) ! echo "$CONFIG_STATUS generated by autoconf version 2.13" exit 0 ;; -help | --help | --hel | --he | --h) echo "\$ac_cs_usage"; exit 0 ;; --- 2196,2202 ---- echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion" exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;; -version | --version | --versio | --versi | --vers | --ver | --ve | --v) ! echo "$CONFIG_STATUS generated by autoconf version 2.12" exit 0 ;; -help | --help | --hel | --he | --h) echo "\$ac_cs_usage"; exit 0 ;; *************** *** 2295,2305 **** s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF $ac_vpsub $extrasub - s%@SHELL@%$SHELL%g s%@CFLAGS@%$CFLAGS%g s%@CPPFLAGS@%$CPPFLAGS%g s%@CXXFLAGS@%$CXXFLAGS%g - s%@FFLAGS@%$FFLAGS%g s%@DEFS@%$DEFS%g s%@LDFLAGS@%$LDFLAGS%g s%@LIBS@%$LIBS%g --- 2216,2224 ---- *************** *** 2326,2332 **** s%@CC@%$CC%g s%@CPP@%$CPP%g s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g - s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g s%@INSTALL_DATA@%$INSTALL_DATA%g s%@RANLIB@%$RANLIB%g s%@LOCAL_CFLAGS@%$LOCAL_CFLAGS%g --- 2245,2250 ---- diff -cNr octave-2.0.14/readline/display.c octave-2.0.15/readline/display.c *** octave-2.0.14/readline/display.c Wed Mar 5 15:37:32 1997 --- octave-2.0.15/readline/display.c Wed Oct 13 16:30:51 1999 *************** *** 18,24 **** The GNU General Public License is often shipped with GNU software, and is generally kept in a file called COPYING or LICENSE. If you do not have a copy of the license, write to the Free Software Foundation, ! 675 Mass Ave, Cambridge, MA 02139, USA. */ #define READLINE_LIBRARY #if defined (HAVE_CONFIG_H) --- 18,24 ---- The GNU General Public License is often shipped with GNU software, and is generally kept in a file called COPYING or LICENSE. If you do not have a copy of the license, write to the Free Software Foundation, ! 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #define READLINE_LIBRARY #if defined (HAVE_CONFIG_H) diff -cNr octave-2.0.14/readline/doc/hist.texinfo octave-2.0.15/readline/doc/hist.texinfo *** octave-2.0.14/readline/doc/hist.texinfo Thu Mar 21 15:07:55 1996 --- octave-2.0.15/readline/doc/hist.texinfo Wed Oct 13 16:36:33 1999 *************** *** 57,64 **** typed input. Published by the Free Software Foundation @* ! 675 Massachusetts Avenue, @* ! Cambridge, MA 02139 USA Permission is granted to make and distribute verbatim copies of this manual provided the copyright notice and this permission notice --- 57,64 ---- typed input. Published by the Free Software Foundation @* ! 59 Temple Place, Suite 330, @* ! Boston, MA 02111 USA Permission is granted to make and distribute verbatim copies of this manual provided the copyright notice and this permission notice diff -cNr octave-2.0.14/readline/doc/rlman.texinfo octave-2.0.15/readline/doc/rlman.texinfo *** octave-2.0.14/readline/doc/rlman.texinfo Thu Mar 21 15:07:03 1996 --- octave-2.0.15/readline/doc/rlman.texinfo Wed Oct 13 16:36:19 1999 *************** *** 57,64 **** to provide a command line interface. Published by the Free Software Foundation @* ! 675 Massachusetts Avenue, @* ! Cambridge, MA 02139 USA Permission is granted to make and distribute verbatim copies of this manual provided the copyright notice and this permission notice --- 57,64 ---- to provide a command line interface. Published by the Free Software Foundation @* ! 59 Temple Place, Suite 330, @* ! Boston, MA 02111 USA Permission is granted to make and distribute verbatim copies of this manual provided the copyright notice and this permission notice diff -cNr octave-2.0.14/readline/doc/texi2dvi octave-2.0.15/readline/doc/texi2dvi *** octave-2.0.14/readline/doc/texi2dvi Thu May 22 15:59:04 1997 --- octave-2.0.15/readline/doc/texi2dvi Wed Oct 13 17:06:30 1999 *************** *** 22,30 **** # Commentary: ! # Author: Noah Friedman ! # Please send bug reports, etc. to bug-texinfo@prep.ai.mit.edu # If possible, please send a copy of the output of the script called with # the `--debug' option when making a bug report. --- 22,30 ---- # Commentary: ! # Author: Noah Friedman ! # Please send bug reports, etc. to bug-texinfo@gnu.org. # If possible, please send a copy of the output of the script called with # the `--debug' option when making a bug report. diff -cNr octave-2.0.14/readline/doc/texinfo.tex octave-2.0.15/readline/doc/texinfo.tex *** octave-2.0.14/readline/doc/texinfo.tex Thu May 22 15:59:05 1997 --- octave-2.0.15/readline/doc/texinfo.tex Wed Oct 13 17:06:22 1999 *************** *** 14,21 **** %You should have received a copy of the GNU General Public License %along with this texinfo.tex file; see the file COPYING. If not, write ! %to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, ! %USA. %In other words, you are welcome to use, share and improve this program. --- 14,21 ---- %You should have received a copy of the GNU General Public License %along with this texinfo.tex file; see the file COPYING. If not, write ! %to the Free Software Foundation, 59 Temple Place, Suite 330, Boston, ! %MA 02111 USA. %In other words, you are welcome to use, share and improve this program. *************** *** 23,29 **** %what you give them. Help stamp out software-hoarding! ! % Send bug reports to bug-texinfo@prep.ai.mit.edu. % Please include a *precise* test case in each bug report. --- 23,29 ---- %what you give them. Help stamp out software-hoarding! ! % Send bug reports to bug-texinfo@gnu.org. % Please include a *precise* test case in each bug report. *************** *** 123,129 **** \newdimen\cornerlong \newdimen\cornerthick \newdimen \topandbottommargin \newdimen \outerhsize \newdimen \outervsize ! \cornerlong=1pc\cornerthick=.3pt % These set size of cropmarks \outerhsize=7in %\outervsize=9.5in % Alternative @smallbook page size is 9.25in --- 123,129 ---- \newdimen\cornerlong \newdimen\cornerthick \newdimen \topandbottommargin \newdimen \outerhsize \newdimen \outervsize ! \cornerlong=1pc\cornerthick=.3pt % These set size of cropmarks \outerhsize=7in %\outervsize=9.5in % Alternative @smallbook page size is 9.25in *************** *** 153,160 **** % \def\croppageout#1{\hoffset=0pt % make sure this doesn't mess things up {\escapechar=`\\\relax % makes sure backslash is used in output files. ! \shipout ! \vbox to \outervsize{\hsize=\outerhsize \vbox{\line{\ewtop\hfill\ewtop}} \nointerlineskip \line{\vbox{\moveleft\cornerthick\nstop} --- 153,160 ---- % \def\croppageout#1{\hoffset=0pt % make sure this doesn't mess things up {\escapechar=`\\\relax % makes sure backslash is used in output files. ! \shipout ! \vbox to \outervsize{\hsize=\outerhsize \vbox{\line{\ewtop\hfill\ewtop}} \nointerlineskip \line{\vbox{\moveleft\cornerthick\nstop} *************** *** 162,180 **** \vbox{\moveright\cornerthick\nstop}} \vskip \topandbottommargin \centerline{\ifodd\pageno\hskip\bindingoffset\fi ! \vbox{ ! {\let\hsize=\pagewidth \makeheadline} ! \pagebody{#1} ! {\let\hsize=\pagewidth \makefootline}} ! \ifodd\pageno\else\hskip\bindingoffset\fi} ! \vskip \topandbottommargin plus1fill minus1fill \boxmaxdepth\cornerthick \line{\vbox{\moveleft\cornerthick\nsbot} \hfill \vbox{\moveright\cornerthick\nsbot}} \nointerlineskip \vbox{\line{\ewbot\hfill\ewbot}} ! }} \advancepageno \ifnum\outputpenalty>-20000 \else\dosupereject\fi} % --- 162,180 ---- \vbox{\moveright\cornerthick\nstop}} \vskip \topandbottommargin \centerline{\ifodd\pageno\hskip\bindingoffset\fi ! \vbox{ ! {\let\hsize=\pagewidth \makeheadline} ! \pagebody{#1} ! {\let\hsize=\pagewidth \makefootline}} ! \ifodd\pageno\else\hskip\bindingoffset\fi} ! \vskip \topandbottommargin plus1fill minus1fill \boxmaxdepth\cornerthick \line{\vbox{\moveleft\cornerthick\nsbot} \hfill \vbox{\moveright\cornerthick\nsbot}} \nointerlineskip \vbox{\line{\ewbot\hfill\ewbot}} ! }} \advancepageno \ifnum\outputpenalty>-20000 \else\dosupereject\fi} % *************** *** 785,793 **** % @value{foo} gets the text saved in variable foo. % \def\value#1{\expandafter ! \ifx\csname SET#1\endcsname\relax ! {\{No value for ``#1''\}} ! \else \csname SET#1\endcsname \fi} % @ifset VAR ... @end ifset reads the `...' iff VAR has been defined % with @set. --- 785,793 ---- % @value{foo} gets the text saved in variable foo. % \def\value#1{\expandafter ! \ifx\csname SET#1\endcsname\relax ! {\{No value for ``#1''\}} ! \else \csname SET#1\endcsname \fi} % @ifset VAR ... @end ifset reads the `...' iff VAR has been defined % with @set. *************** *** 998,1006 **** % \setfont\ssectt{tt10 scaled \magstep1} % \setfont\ssecsf{ss10 scaled \magstep1} ! %\setfont\ssecrm{b10 scaled 1315} % Note the use of cmb rather than cmbx. ! %\setfont\ssecit{ti10 scaled 1315} % Also, the size is a little larger than ! %\setfont\ssecsl{sl10 scaled 1315} % being scaled magstep1. %\setfont\ssectt{tt10 scaled 1315} %\setfont\ssecsf{ss10 scaled 1315} --- 998,1006 ---- % \setfont\ssectt{tt10 scaled \magstep1} % \setfont\ssecsf{ss10 scaled \magstep1} ! %\setfont\ssecrm{b10 scaled 1315} % Note the use of cmb rather than cmbx. ! %\setfont\ssecit{ti10 scaled 1315} % Also, the size is a little larger than ! %\setfont\ssecsl{sl10 scaled 1315} % being scaled magstep1. %\setfont\ssectt{tt10 scaled 1315} %\setfont\ssecsf{ss10 scaled 1315} *************** *** 1182,1193 **** \def\kbd#1{\def\look{#1}\expandafter\kbdfoo\look??\par} ! \def\l#1{{\li #1}\null} % ! \def\r#1{{\rm #1}} % roman font % Use of \lowercase was suggested. ! \def\sc#1{{\smallcaps#1}} % smallcaps font ! \def\ii#1{{\it #1}} % italic font \message{page headings,} --- 1182,1193 ---- \def\kbd#1{\def\look{#1}\expandafter\kbdfoo\look??\par} ! \def\l#1{{\li #1}\null} % ! \def\r#1{{\rm #1}} % roman font % Use of \lowercase was suggested. ! \def\sc#1{{\smallcaps#1}} % smallcaps font ! \def\ii#1{{\it #1}} % italic font \message{page headings,} *************** *** 1202,1208 **** \def\shorttitlepage{\parsearg\shorttitlepagezzz} \def\shorttitlepagezzz #1{\begingroup\hbox{}\vskip 1.5in \chaprm \centerline{#1}% ! \endgroup\page\hbox{}\page} \def\titlepage{\begingroup \parindent=0pt \textfonts \let\subtitlerm=\tenrm --- 1202,1208 ---- \def\shorttitlepage{\parsearg\shorttitlepagezzz} \def\shorttitlepagezzz #1{\begingroup\hbox{}\vskip 1.5in \chaprm \centerline{#1}% ! \endgroup\page\hbox{}\page} \def\titlepage{\begingroup \parindent=0pt \textfonts \let\subtitlerm=\tenrm *************** *** 1219,1227 **** % Now you can print the title using @title. \def\title{\parsearg\titlezzz}% \def\titlezzz##1{\leftline{\titlefont{##1}} ! % print a rule at the page bottom also. ! \finishedtitlepagefalse ! \vskip4pt \hrule height 4pt width \hsize \vskip4pt}% % No rule at page bottom unless we print one at the top with @title. \finishedtitlepagetrue % --- 1219,1227 ---- % Now you can print the title using @title. \def\title{\parsearg\titlezzz}% \def\titlezzz##1{\leftline{\titlefont{##1}} ! % print a rule at the page bottom also. ! \finishedtitlepagefalse ! \vskip4pt \hrule height 4pt width \hsize \vskip4pt}% % No rule at page bottom unless we print one at the top with @title. \finishedtitlepagetrue % *************** *** 1239,1245 **** \let\oldpage = \page \def\page{% \iffinishedtitlepage\else ! \finishtitlepage \fi \oldpage \let\page = \oldpage --- 1239,1245 ---- \let\oldpage = \page \def\page{% \iffinishedtitlepage\else ! \finishtitlepage \fi \oldpage \let\page = \oldpage *************** *** 1327,1338 **** % }% unbind the catcode of @. ! % @headings double turns headings on for double-sided printing. ! % @headings single turns headings on for single-sided printing. ! % @headings off turns them off. ! % @headings on same as @headings double, retained for compatibility. ! % @headings after turns on double-sided headings after this page. ! % @headings doubleafter turns on double-sided headings after this page. % @headings singleafter turns on single-sided headings after this page. % By default, they are off. --- 1327,1338 ---- % }% unbind the catcode of @. ! % @headings double turns headings on for double-sided printing. ! % @headings single turns headings on for single-sided printing. ! % @headings off turns them off. ! % @headings on same as @headings double, retained for compatibility. ! % @headings after turns on double-sided headings after this page. ! % @headings doubleafter turns on double-sided headings after this page. % @headings singleafter turns on single-sided headings after this page. % By default, they are off. *************** *** 1872,1885 **** % It automatically defines \fooindex such that % \fooindex ...rest of line... puts an entry in the index foo. % It also defines \fooindfile to be the number of the output channel for ! % the file that accumulates this index. The file's extension is foo. % The name of an index should be no more than 2 characters long % for the sake of vms. \def\newindex #1{ \expandafter\newwrite \csname#1indfile\endcsname% Define number for output file ! \openout \csname#1indfile\endcsname \jobname.#1 % Open the file ! \expandafter\xdef\csname#1index\endcsname{% % Define \xxxindex \noexpand\doindex {#1}} } --- 1872,1885 ---- % It automatically defines \fooindex such that % \fooindex ...rest of line... puts an entry in the index foo. % It also defines \fooindfile to be the number of the output channel for ! % the file that accumulates this index. The file's extension is foo. % The name of an index should be no more than 2 characters long % for the sake of vms. \def\newindex #1{ \expandafter\newwrite \csname#1indfile\endcsname% Define number for output file ! \openout \csname#1indfile\endcsname \jobname.#1 % Open the file ! \expandafter\xdef\csname#1index\endcsname{% % Define \xxxindex \noexpand\doindex {#1}} } *************** *** 1891,1898 **** \def\newcodeindex #1{ \expandafter\newwrite \csname#1indfile\endcsname% Define number for output file ! \openout \csname#1indfile\endcsname \jobname.#1 % Open the file ! \expandafter\xdef\csname#1index\endcsname{% % Define \xxxindex \noexpand\docodeindex {#1}} } --- 1891,1898 ---- \def\newcodeindex #1{ \expandafter\newwrite \csname#1indfile\endcsname% Define number for output file ! \openout \csname#1indfile\endcsname \jobname.#1 % Open the file ! \expandafter\xdef\csname#1index\endcsname{% % Define \xxxindex \noexpand\docodeindex {#1}} } *************** *** 1903,1909 **** \def\synindex #1 #2 {% \expandafter\let\expandafter\synindexfoo\expandafter=\csname#2indfile\endcsname \expandafter\let\csname#1indfile\endcsname=\synindexfoo ! \expandafter\xdef\csname#1index\endcsname{% % Define \xxxindex \noexpand\doindex {#2}}% } --- 1903,1909 ---- \def\synindex #1 #2 {% \expandafter\let\expandafter\synindexfoo\expandafter=\csname#2indfile\endcsname \expandafter\let\csname#1indfile\endcsname=\synindexfoo ! \expandafter\xdef\csname#1index\endcsname{% % Define \xxxindex \noexpand\doindex {#2}}% } *************** *** 1912,1918 **** \def\syncodeindex #1 #2 {% \expandafter\let\expandafter\synindexfoo\expandafter=\csname#2indfile\endcsname \expandafter\let\csname#1indfile\endcsname=\synindexfoo ! \expandafter\xdef\csname#1index\endcsname{% % Define \xxxindex \noexpand\docodeindex {#2}}% } --- 1912,1918 ---- \def\syncodeindex #1 #2 {% \expandafter\let\expandafter\synindexfoo\expandafter=\csname#2indfile\endcsname \expandafter\let\csname#1indfile\endcsname=\synindexfoo ! \expandafter\xdef\csname#1index\endcsname{% % Define \xxxindex \noexpand\docodeindex {#2}}% } *************** *** 2349,2355 **** \dimen@=\ht0 \advance\dimen@ by\topskip \advance\dimen@ by-\baselineskip \divide\dimen@ by2 \splittopskip=\topskip \splitmaxdepth=\maxdepth {\vbadness=10000 ! \loop \global\setbox5=\copy0 \setbox1=\vsplit5 to\dimen@ \setbox3=\vsplit5 to\dimen@ \ifvbox5 \global\advance\dimen@ by1pt \repeat --- 2349,2355 ---- \dimen@=\ht0 \advance\dimen@ by\topskip \advance\dimen@ by-\baselineskip \divide\dimen@ by2 \splittopskip=\topskip \splitmaxdepth=\maxdepth {\vbadness=10000 ! \loop \global\setbox5=\copy0 \setbox1=\vsplit5 to\dimen@ \setbox3=\vsplit5 to\dimen@ \ifvbox5 \global\advance\dimen@ by1pt \repeat *************** *** 2719,2728 **** % NOTE on use of \vbox for chapter headings, section headings, and % such: ! % 1) We use \vbox rather than the earlier \line to permit ! % overlong headings to fold. ! % 2) \hyphenpenalty is set to 10000 because hyphenation in a ! % heading is obnoxious; this forbids it. % 3) Likewise, headings look best if no \parindent is used, and % if justification is not attempted. Hence \raggedright. --- 2719,2728 ---- % NOTE on use of \vbox for chapter headings, section headings, and % such: ! % 1) We use \vbox rather than the earlier \line to permit ! % overlong headings to fold. ! % 2) \hyphenpenalty is set to 10000 because hyphenation in a ! % heading is obnoxious; this forbids it. % 3) Likewise, headings look best if no \parindent is used, and % if justification is not attempted. Hence \raggedright. *************** *** 2856,2863 **** \ifdim \parskip<10pt \kern 10pt\kern -\parskip\fi \penalty 10000 } \def\subsubsecfonts{\subsecfonts} % Maybe this should change: ! % Perhaps make sssec fonts scaled ! % magstep half \def\subsubsecheading #1#2#3#4#5{\subsubsecheadingi {#2.#3.#4.#5\enspace #1}} \def\subsubsecheadingi #1{{\advance \subsecheadingskip by \parskip % \subsecheadingbreak}% --- 2856,2863 ---- \ifdim \parskip<10pt \kern 10pt\kern -\parskip\fi \penalty 10000 } \def\subsubsecfonts{\subsecfonts} % Maybe this should change: ! % Perhaps make sssec fonts scaled ! % magstep half \def\subsubsecheading #1#2#3#4#5{\subsubsecheadingi {#2.#3.#4.#5\enspace #1}} \def\subsubsecheadingi #1{{\advance \subsecheadingskip by \parskip % \subsecheadingbreak}% *************** *** 2877,2888 **** \pagealignmacro \immediate\closeout \contentsfile \ifnum \pageno>0 ! \pageno = -1 % Request roman numbered pages. \fi % Don't need to put `Contents' or `Short Contents' in the headline. % It is abundantly clear what they are. \unnumbchapmacro{#1}\def\thischapter{}% ! \begingroup % Set up to handle contents files properly. \catcode`\\=0 \catcode`\{=1 \catcode`\}=2 \catcode`\@=11 \catcode`\^=7 % to see ^^e4 as \"a etc. juha@piuha.ydi.vtt.fi \raggedbottom % Worry more about breakpoints than the bottom. --- 2877,2888 ---- \pagealignmacro \immediate\closeout \contentsfile \ifnum \pageno>0 ! \pageno = -1 % Request roman numbered pages. \fi % Don't need to put `Contents' or `Short Contents' in the headline. % It is abundantly clear what they are. \unnumbchapmacro{#1}\def\thischapter{}% ! \begingroup % Set up to handle contents files properly. \catcode`\\=0 \catcode`\{=1 \catcode`\}=2 \catcode`\@=11 \catcode`\^=7 % to see ^^e4 as \"a etc. juha@piuha.ydi.vtt.fi \raggedbottom % Worry more about breakpoints than the bottom. *************** *** 3161,3210 **** \def\cbl{{\circle\char'012\hskip -6pt}} \def\cbr{{\hskip 6pt\circle\char'011}} \def\carttop{\hbox to \cartouter{\hskip\lskip ! \ctl\leaders\hrule height\circthick\hfil\ctr ! \hskip\rskip}} \def\cartbot{\hbox to \cartouter{\hskip\lskip ! \cbl\leaders\hrule height\circthick\hfil\cbr ! \hskip\rskip}} % \newskip\lskip\newskip\rskip \long\def\cartouche{% \begingroup ! \lskip=\leftskip \rskip=\rightskip ! \leftskip=0pt\rightskip=0pt %we want these *outside*. ! \cartinner=\hsize \advance\cartinner by-\lskip ! \advance\cartinner by-\rskip ! \cartouter=\hsize ! \advance\cartouter by 18pt % allow for 3pt kerns on either ! % side, and for 6pt waste from ! % each corner char ! \normbskip=\baselineskip \normpskip=\parskip \normlskip=\lineskip ! % Flag to tell @lisp, etc., not to narrow margin. ! \let\nonarrowing=\comment ! \vbox\bgroup ! \baselineskip=0pt\parskip=0pt\lineskip=0pt ! \carttop ! \hbox\bgroup ! \hskip\lskip ! \vrule\kern3pt ! \vbox\bgroup ! \hsize=\cartinner ! \kern3pt ! \begingroup ! \baselineskip=\normbskip ! \lineskip=\normlskip ! \parskip=\normpskip ! \vskip -\parskip \def\Ecartouche{% ! \endgroup ! \kern3pt ! \egroup ! \kern3pt\vrule ! \hskip\rskip ! \egroup ! \cartbot ! \egroup \endgroup }} --- 3161,3210 ---- \def\cbl{{\circle\char'012\hskip -6pt}} \def\cbr{{\hskip 6pt\circle\char'011}} \def\carttop{\hbox to \cartouter{\hskip\lskip ! \ctl\leaders\hrule height\circthick\hfil\ctr ! \hskip\rskip}} \def\cartbot{\hbox to \cartouter{\hskip\lskip ! \cbl\leaders\hrule height\circthick\hfil\cbr ! \hskip\rskip}} % \newskip\lskip\newskip\rskip \long\def\cartouche{% \begingroup ! \lskip=\leftskip \rskip=\rightskip ! \leftskip=0pt\rightskip=0pt %we want these *outside*. ! \cartinner=\hsize \advance\cartinner by-\lskip ! \advance\cartinner by-\rskip ! \cartouter=\hsize ! \advance\cartouter by 18pt % allow for 3pt kerns on either ! % side, and for 6pt waste from ! % each corner char ! \normbskip=\baselineskip \normpskip=\parskip \normlskip=\lineskip ! % Flag to tell @lisp, etc., not to narrow margin. ! \let\nonarrowing=\comment ! \vbox\bgroup ! \baselineskip=0pt\parskip=0pt\lineskip=0pt ! \carttop ! \hbox\bgroup ! \hskip\lskip ! \vrule\kern3pt ! \vbox\bgroup ! \hsize=\cartinner ! \kern3pt ! \begingroup ! \baselineskip=\normbskip ! \lineskip=\normlskip ! \parskip=\normpskip ! \vskip -\parskip \def\Ecartouche{% ! \endgroup ! \kern3pt ! \egroup ! \kern3pt\vrule ! \hskip\rskip ! \egroup ! \cartbot ! \egroup \endgroup }} diff -cNr octave-2.0.14/readline/emacs_keymap.c octave-2.0.15/readline/emacs_keymap.c *** octave-2.0.14/readline/emacs_keymap.c Wed Dec 21 15:52:10 1994 --- octave-2.0.15/readline/emacs_keymap.c Wed Oct 13 16:34:25 1999 *************** *** 18,24 **** The GNU General Public License is often shipped with GNU software, and is generally kept in a file called COPYING or LICENSE. If you do not have a copy of the license, write to the Free Software Foundation, ! 675 Mass Ave, Cambridge, MA 02139, USA. */ #if !defined (BUFSIZ) #include --- 18,24 ---- The GNU General Public License is often shipped with GNU software, and is generally kept in a file called COPYING or LICENSE. If you do not have a copy of the license, write to the Free Software Foundation, ! 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #if !defined (BUFSIZ) #include diff -cNr octave-2.0.14/readline/funmap.c octave-2.0.15/readline/funmap.c *** octave-2.0.14/readline/funmap.c Mon Mar 3 14:50:48 1997 --- octave-2.0.15/readline/funmap.c Wed Oct 13 16:34:25 1999 *************** *** 18,24 **** The GNU General Public License is often shipped with GNU software, and is generally kept in a file called COPYING or LICENSE. If you do not have a copy of the license, write to the Free Software Foundation, ! 675 Mass Ave, Cambridge, MA 02139, USA. */ #define READLINE_LIBRARY #if defined (HAVE_CONFIG_H) --- 18,24 ---- The GNU General Public License is often shipped with GNU software, and is generally kept in a file called COPYING or LICENSE. If you do not have a copy of the license, write to the Free Software Foundation, ! 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #define READLINE_LIBRARY #if defined (HAVE_CONFIG_H) diff -cNr octave-2.0.14/readline/histexpand.c octave-2.0.15/readline/histexpand.c *** octave-2.0.14/readline/histexpand.c Wed Mar 26 12:17:27 1997 --- octave-2.0.15/readline/histexpand.c Wed Oct 13 16:30:51 1999 *************** *** 18,24 **** The GNU General Public License is often shipped with GNU software, and is generally kept in a file called COPYING or LICENSE. If you do not have a copy of the license, write to the Free Software Foundation, ! 675 Mass Ave, Cambridge, MA 02139, USA. */ #define READLINE_LIBRARY --- 18,24 ---- The GNU General Public License is often shipped with GNU software, and is generally kept in a file called COPYING or LICENSE. If you do not have a copy of the license, write to the Free Software Foundation, ! 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #define READLINE_LIBRARY diff -cNr octave-2.0.14/readline/histfile.c octave-2.0.15/readline/histfile.c *** octave-2.0.14/readline/histfile.c Wed Mar 26 13:20:19 1997 --- octave-2.0.15/readline/histfile.c Wed Oct 13 16:32:54 1999 *************** *** 18,24 **** The GNU General Public License is often shipped with GNU software, and is generally kept in a file called COPYING or LICENSE. If you do not have a copy of the license, write to the Free Software Foundation, ! 675 Mass Ave, Cambridge, MA 02139, USA. */ /* The goal is to make the implementation transparent, so that you don't have to know what data types are used, just what functions --- 18,24 ---- The GNU General Public License is often shipped with GNU software, and is generally kept in a file called COPYING or LICENSE. If you do not have a copy of the license, write to the Free Software Foundation, ! 59 Temple Place, Suite 330, Boston, MA 02111 USA. */ /* The goal is to make the implementation transparent, so that you don't have to know what data types are used, just what functions diff -cNr octave-2.0.14/readline/histlib.h octave-2.0.15/readline/histlib.h *** octave-2.0.14/readline/histlib.h Thu Nov 21 07:54:24 1996 --- octave-2.0.15/readline/histlib.h Wed Oct 13 16:34:25 1999 *************** *** 17,23 **** The GNU General Public License is often shipped with GNU software, and is generally kept in a file called COPYING or LICENSE. If you do not have a copy of the license, write to the Free Software Foundation, ! 675 Mass Ave, Cambridge, MA 02139, USA. */ #if !defined (_HISTLIB_H_) #define _HISTLIB_H_ --- 17,23 ---- The GNU General Public License is often shipped with GNU software, and is generally kept in a file called COPYING or LICENSE. If you do not have a copy of the license, write to the Free Software Foundation, ! 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #if !defined (_HISTLIB_H_) #define _HISTLIB_H_ diff -cNr octave-2.0.14/readline/history.c octave-2.0.15/readline/history.c *** octave-2.0.14/readline/history.c Thu Jun 27 16:19:11 1996 --- octave-2.0.15/readline/history.c Wed Oct 13 16:30:51 1999 *************** *** 18,24 **** The GNU General Public License is often shipped with GNU software, and is generally kept in a file called COPYING or LICENSE. If you do not have a copy of the license, write to the Free Software Foundation, ! 675 Mass Ave, Cambridge, MA 02139, USA. */ /* The goal is to make the implementation transparent, so that you don't have to know what data types are used, just what functions --- 18,24 ---- The GNU General Public License is often shipped with GNU software, and is generally kept in a file called COPYING or LICENSE. If you do not have a copy of the license, write to the Free Software Foundation, ! 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* The goal is to make the implementation transparent, so that you don't have to know what data types are used, just what functions diff -cNr octave-2.0.14/readline/history.h octave-2.0.15/readline/history.h *** octave-2.0.14/readline/history.h Thu May 22 16:37:53 1997 --- octave-2.0.15/readline/history.h Wed Oct 13 16:34:25 1999 *************** *** 17,23 **** The GNU General Public License is often shipped with GNU software, and is generally kept in a file called COPYING or LICENSE. If you do not have a copy of the license, write to the Free Software Foundation, ! 675 Mass Ave, Cambridge, MA 02139, USA. */ #ifndef _HISTORY_H_ #define _HISTORY_H_ --- 17,23 ---- The GNU General Public License is often shipped with GNU software, and is generally kept in a file called COPYING or LICENSE. If you do not have a copy of the license, write to the Free Software Foundation, ! 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #ifndef _HISTORY_H_ #define _HISTORY_H_ diff -cNr octave-2.0.14/readline/histsearch.c octave-2.0.15/readline/histsearch.c *** octave-2.0.14/readline/histsearch.c Fri Sep 29 09:57:05 1995 --- octave-2.0.15/readline/histsearch.c Wed Oct 13 16:32:54 1999 *************** *** 18,24 **** The GNU General Public License is often shipped with GNU software, and is generally kept in a file called COPYING or LICENSE. If you do not have a copy of the license, write to the Free Software Foundation, ! 675 Mass Ave, Cambridge, MA 02139, USA. */ #define READLINE_LIBRARY --- 18,24 ---- The GNU General Public License is often shipped with GNU software, and is generally kept in a file called COPYING or LICENSE. If you do not have a copy of the license, write to the Free Software Foundation, ! 59 Temple Place, Suite 330, Boston, MA 02111 USA. */ #define READLINE_LIBRARY diff -cNr octave-2.0.14/readline/input.c octave-2.0.15/readline/input.c *** octave-2.0.14/readline/input.c Wed Dec 11 10:59:34 1996 --- octave-2.0.15/readline/input.c Wed Oct 13 16:30:51 1999 *************** *** 18,24 **** The GNU General Public License is often shipped with GNU software, and is generally kept in a file called COPYING or LICENSE. If you do not have a copy of the license, write to the Free Software Foundation, ! 675 Mass Ave, Cambridge, MA 02139, USA. */ #define READLINE_LIBRARY #if defined (HAVE_CONFIG_H) --- 18,24 ---- The GNU General Public License is often shipped with GNU software, and is generally kept in a file called COPYING or LICENSE. If you do not have a copy of the license, write to the Free Software Foundation, ! 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #define READLINE_LIBRARY #if defined (HAVE_CONFIG_H) diff -cNr octave-2.0.14/readline/isearch.c octave-2.0.15/readline/isearch.c *** octave-2.0.14/readline/isearch.c Fri Apr 25 14:35:14 1997 --- octave-2.0.15/readline/isearch.c Wed Oct 13 16:34:25 1999 *************** *** 23,29 **** The GNU General Public License is often shipped with GNU software, and is generally kept in a file called COPYING or LICENSE. If you do not have a copy of the license, write to the Free Software Foundation, ! 675 Mass Ave, Cambridge, MA 02139, USA. */ #define READLINE_LIBRARY #if defined (HAVE_CONFIG_H) --- 23,29 ---- The GNU General Public License is often shipped with GNU software, and is generally kept in a file called COPYING or LICENSE. If you do not have a copy of the license, write to the Free Software Foundation, ! 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #define READLINE_LIBRARY #if defined (HAVE_CONFIG_H) diff -cNr octave-2.0.14/readline/keymaps.c octave-2.0.15/readline/keymaps.c *** octave-2.0.14/readline/keymaps.c Mon Mar 27 13:56:38 1995 --- octave-2.0.15/readline/keymaps.c Wed Oct 13 16:34:25 1999 *************** *** 17,23 **** You should have received a copy of the GNU General Public License along with Readline; see the file COPYING. If not, write to the Free ! Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ #define READLINE_LIBRARY #if defined (HAVE_CONFIG_H) --- 17,23 ---- You should have received a copy of the GNU General Public License along with Readline; see the file COPYING. If not, write to the Free ! Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #define READLINE_LIBRARY #if defined (HAVE_CONFIG_H) diff -cNr octave-2.0.14/readline/keymaps.h octave-2.0.15/readline/keymaps.h *** octave-2.0.14/readline/keymaps.h Tue Aug 16 11:01:00 1994 --- octave-2.0.15/readline/keymaps.h Wed Oct 13 16:30:51 1999 *************** *** 18,24 **** The GNU General Public License is often shipped with GNU software, and is generally kept in a file called COPYING or LICENSE. If you do not have a copy of the license, write to the Free Software Foundation, ! 675 Mass Ave, Cambridge, MA 02139, USA. */ #ifndef _KEYMAPS_H_ #define _KEYMAPS_H_ --- 18,24 ---- The GNU General Public License is often shipped with GNU software, and is generally kept in a file called COPYING or LICENSE. If you do not have a copy of the license, write to the Free Software Foundation, ! 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #ifndef _KEYMAPS_H_ #define _KEYMAPS_H_ diff -cNr octave-2.0.14/readline/kill.c octave-2.0.15/readline/kill.c *** octave-2.0.14/readline/kill.c Wed Apr 2 14:20:55 1997 --- octave-2.0.15/readline/kill.c Wed Oct 13 16:32:53 1999 *************** *** 18,24 **** The GNU General Public License is often shipped with GNU software, and is generally kept in a file called COPYING or LICENSE. If you do not have a copy of the license, write to the Free Software Foundation, ! 675 Mass Ave, Cambridge, MA 02139, USA. */ #define READLINE_LIBRARY #if defined (HAVE_CONFIG_H) --- 18,24 ---- The GNU General Public License is often shipped with GNU software, and is generally kept in a file called COPYING or LICENSE. If you do not have a copy of the license, write to the Free Software Foundation, ! 59 Temple Place, Suite 330, Boston, MA 02111 USA. */ #define READLINE_LIBRARY #if defined (HAVE_CONFIG_H) diff -cNr octave-2.0.14/readline/macro.c octave-2.0.15/readline/macro.c *** octave-2.0.14/readline/macro.c Thu Jun 27 16:23:31 1996 --- octave-2.0.15/readline/macro.c Wed Oct 13 16:34:25 1999 *************** *** 18,24 **** The GNU General Public License is often shipped with GNU software, and is generally kept in a file called COPYING or LICENSE. If you do not have a copy of the license, write to the Free Software Foundation, ! 675 Mass Ave, Cambridge, MA 02139, USA. */ #define READLINE_LIBRARY #if defined (HAVE_CONFIG_H) --- 18,24 ---- The GNU General Public License is often shipped with GNU software, and is generally kept in a file called COPYING or LICENSE. If you do not have a copy of the license, write to the Free Software Foundation, ! 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #define READLINE_LIBRARY #if defined (HAVE_CONFIG_H) diff -cNr octave-2.0.14/readline/nls.c octave-2.0.15/readline/nls.c *** octave-2.0.14/readline/nls.c Fri May 2 11:05:47 1997 --- octave-2.0.15/readline/nls.c Wed Oct 13 16:30:51 1999 *************** *** 18,24 **** The GNU General Public License is often shipped with GNU software, and is generally kept in a file called COPYING or LICENSE. If you do not have a copy of the license, write to the Free Software Foundation, ! 675 Mass Ave, Cambridge, MA 02139, USA. */ #define READLINE_LIBRARY #if defined (HAVE_CONFIG_H) --- 18,24 ---- The GNU General Public License is often shipped with GNU software, and is generally kept in a file called COPYING or LICENSE. If you do not have a copy of the license, write to the Free Software Foundation, ! 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #define READLINE_LIBRARY #if defined (HAVE_CONFIG_H) diff -cNr octave-2.0.14/readline/parens.c octave-2.0.15/readline/parens.c *** octave-2.0.14/readline/parens.c Wed Mar 4 15:02:06 1998 --- octave-2.0.15/readline/parens.c Wed Oct 13 16:34:25 1999 *************** *** 18,24 **** The GNU General Public License is often shipped with GNU software, and is generally kept in a file called COPYING or LICENSE. If you do not have a copy of the license, write to the Free Software Foundation, ! 675 Mass Ave, Cambridge, MA 02139, USA. */ #define READLINE_LIBRARY #include "rlconf.h" --- 18,24 ---- The GNU General Public License is often shipped with GNU software, and is generally kept in a file called COPYING or LICENSE. If you do not have a copy of the license, write to the Free Software Foundation, ! 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #define READLINE_LIBRARY #include "rlconf.h" diff -cNr octave-2.0.14/readline/posixdir.h octave-2.0.15/readline/posixdir.h *** octave-2.0.14/readline/posixdir.h Thu Jan 2 13:10:32 1997 --- octave-2.0.15/readline/posixdir.h Wed Oct 13 16:32:53 1999 *************** *** 16,22 **** You should have received a copy of the GNU General Public License along with Bash; see the file COPYING. If not, write to the Free ! Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ /* This file should be included instead of or . */ --- 16,22 ---- You should have received a copy of the GNU General Public License along with Bash; see the file COPYING. If not, write to the Free ! Software Foundation, 59 Temple Place, Suite 330, Boston, MA 02111 USA. */ /* This file should be included instead of or . */ diff -cNr octave-2.0.14/readline/posixstat.h octave-2.0.15/readline/posixstat.h *** octave-2.0.14/readline/posixstat.h Mon Jul 22 13:43:28 1996 --- octave-2.0.15/readline/posixstat.h Wed Oct 13 16:30:51 1999 *************** *** 17,23 **** You should have received a copy of the GNU General Public License along with Bash; see the file COPYING. If not, write to the Free ! Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ /* This file should be included instead of . It relies on the local sys/stat.h to work though. */ --- 17,23 ---- You should have received a copy of the GNU General Public License along with Bash; see the file COPYING. If not, write to the Free ! Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* This file should be included instead of . It relies on the local sys/stat.h to work though. */ diff -cNr octave-2.0.14/readline/readline.c octave-2.0.15/readline/readline.c *** octave-2.0.14/readline/readline.c Wed Apr 2 14:22:39 1997 --- octave-2.0.15/readline/readline.c Wed Oct 13 16:37:57 1999 *************** *** 19,25 **** The GNU General Public License is often shipped with GNU software, and is generally kept in a file called COPYING or LICENSE. If you do not have a copy of the license, write to the Free Software Foundation, ! 675 Mass Ave, Cambridge, MA 02139, USA. */ #define READLINE_LIBRARY #if defined (HAVE_CONFIG_H) --- 19,26 ---- The GNU General Public License is often shipped with GNU software, and is generally kept in a file called COPYING or LICENSE. If you do not have a copy of the license, write to the Free Software Foundation, ! 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ ! #define READLINE_LIBRARY #if defined (HAVE_CONFIG_H) diff -cNr octave-2.0.14/readline/readline.h octave-2.0.15/readline/readline.h *** octave-2.0.14/readline/readline.h Tue Jan 13 14:59:56 1998 --- octave-2.0.15/readline/readline.h Wed Oct 13 16:34:25 1999 *************** *** 18,24 **** The GNU General Public License is often shipped with GNU software, and is generally kept in a file called COPYING or LICENSE. If you do not have a copy of the license, write to the Free Software Foundation, ! 675 Mass Ave, Cambridge, MA 02139, USA. */ #if !defined (_READLINE_H_) #define _READLINE_H_ --- 18,24 ---- The GNU General Public License is often shipped with GNU software, and is generally kept in a file called COPYING or LICENSE. If you do not have a copy of the license, write to the Free Software Foundation, ! 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #if !defined (_READLINE_H_) #define _READLINE_H_ *************** *** 207,212 **** --- 207,213 ---- /* `Public' utility functions. */ extern int rl_reset_terminal (); + extern void rl_resize_terminal (); extern int rl_stuff_char (); extern int rl_read_key (), rl_getc (); diff -cNr octave-2.0.14/readline/rlconf.h octave-2.0.15/readline/rlconf.h *** octave-2.0.14/readline/rlconf.h Thu May 22 15:59:53 1997 --- octave-2.0.15/readline/rlconf.h Wed Oct 13 16:30:51 1999 *************** *** 19,25 **** The GNU General Public License is often shipped with GNU software, and is generally kept in a file called COPYING or LICENSE. If you do not have a copy of the license, write to the Free Software Foundation, ! 675 Mass Ave, Cambridge, MA 02139, USA. */ #if !defined (_RLCONF_H_) #define _RLCONF_H_ --- 19,25 ---- The GNU General Public License is often shipped with GNU software, and is generally kept in a file called COPYING or LICENSE. If you do not have a copy of the license, write to the Free Software Foundation, ! 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #if !defined (_RLCONF_H_) #define _RLCONF_H_ diff -cNr octave-2.0.14/readline/rldefs.h octave-2.0.15/readline/rldefs.h *** octave-2.0.14/readline/rldefs.h Fri Apr 11 12:18:28 1997 --- octave-2.0.15/readline/rldefs.h Wed Oct 13 16:32:53 1999 *************** *** 21,27 **** The GNU General Public License is often shipped with GNU software, and is generally kept in a file called COPYING or LICENSE. If you do not have a copy of the license, write to the Free Software Foundation, ! 675 Mass Ave, Cambridge, MA 02139, USA. */ #if !defined (_RLDEFS_H_) #define _RLDEFS_H_ --- 21,27 ---- The GNU General Public License is often shipped with GNU software, and is generally kept in a file called COPYING or LICENSE. If you do not have a copy of the license, write to the Free Software Foundation, ! 59 Temple Place, Suite 330, Boston, MA 02111 USA. */ #if !defined (_RLDEFS_H_) #define _RLDEFS_H_ diff -cNr octave-2.0.14/readline/rltty.c octave-2.0.15/readline/rltty.c *** octave-2.0.14/readline/rltty.c Thu Feb 6 08:14:13 1997 --- octave-2.0.15/readline/rltty.c Wed Oct 13 16:34:25 1999 *************** *** 19,25 **** The GNU General Public License is often shipped with GNU software, and is generally kept in a file called COPYING or LICENSE. If you do not have a copy of the license, write to the Free Software Foundation, ! 675 Mass Ave, Cambridge, MA 02139, USA. */ #define READLINE_LIBRARY #if defined (HAVE_CONFIG_H) --- 19,25 ---- The GNU General Public License is often shipped with GNU software, and is generally kept in a file called COPYING or LICENSE. If you do not have a copy of the license, write to the Free Software Foundation, ! 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #define READLINE_LIBRARY #if defined (HAVE_CONFIG_H) diff -cNr octave-2.0.14/readline/rltty.h octave-2.0.15/readline/rltty.h *** octave-2.0.14/readline/rltty.h Fri Apr 11 12:19:09 1997 --- octave-2.0.15/readline/rltty.h Wed Oct 13 16:30:51 1999 *************** *** 19,25 **** The GNU General Public License is often shipped with GNU software, and is generally kept in a file called COPYING or LICENSE. If you do not have a copy of the license, write to the Free Software Foundation, ! 675 Mass Ave, Cambridge, MA 02139, USA. */ #if !defined (_RLTTY_H_) #define _RLTTY_H --- 19,25 ---- The GNU General Public License is often shipped with GNU software, and is generally kept in a file called COPYING or LICENSE. If you do not have a copy of the license, write to the Free Software Foundation, ! 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #if !defined (_RLTTY_H_) #define _RLTTY_H diff -cNr octave-2.0.14/readline/search.c octave-2.0.15/readline/search.c *** octave-2.0.14/readline/search.c Thu Mar 6 15:26:16 1997 --- octave-2.0.15/readline/search.c Wed Oct 13 16:34:25 1999 *************** *** 19,25 **** The GNU General Public License is often shipped with GNU software, and is generally kept in a file called COPYING or LICENSE. If you do not have a copy of the license, write to the Free Software Foundation, ! 675 Mass Ave, Cambridge, MA 02139, USA. */ #define READLINE_LIBRARY #if defined (HAVE_CONFIG_H) --- 19,25 ---- The GNU General Public License is often shipped with GNU software, and is generally kept in a file called COPYING or LICENSE. If you do not have a copy of the license, write to the Free Software Foundation, ! 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #define READLINE_LIBRARY #if defined (HAVE_CONFIG_H) diff -cNr octave-2.0.14/readline/shell.c octave-2.0.15/readline/shell.c *** octave-2.0.14/readline/shell.c Wed Apr 16 14:35:33 1997 --- octave-2.0.15/readline/shell.c Wed Oct 13 16:32:53 1999 *************** *** 19,25 **** The GNU General Public License is often shipped with GNU software, and is generally kept in a file called COPYING or LICENSE. If you do not have a copy of the license, write to the Free Software Foundation, ! 675 Mass Ave, Cambridge, MA 02139, USA. */ #define READLINE_LIBRARY #if defined (HAVE_CONFIG_H) --- 19,25 ---- The GNU General Public License is often shipped with GNU software, and is generally kept in a file called COPYING or LICENSE. If you do not have a copy of the license, write to the Free Software Foundation, ! 59 Temple Place, Suite 330, Boston, MA 02111 USA. */ #define READLINE_LIBRARY #if defined (HAVE_CONFIG_H) diff -cNr octave-2.0.14/readline/signals.c octave-2.0.15/readline/signals.c *** octave-2.0.14/readline/signals.c Wed Mar 26 12:47:06 1997 --- octave-2.0.15/readline/signals.c Wed Oct 13 16:30:48 1999 *************** *** 18,24 **** The GNU General Public License is often shipped with GNU software, and is generally kept in a file called COPYING or LICENSE. If you do not have a copy of the license, write to the Free Software Foundation, ! 675 Mass Ave, Cambridge, MA 02139, USA. */ #define READLINE_LIBRARY #if defined (HAVE_CONFIG_H) --- 18,24 ---- The GNU General Public License is often shipped with GNU software, and is generally kept in a file called COPYING or LICENSE. If you do not have a copy of the license, write to the Free Software Foundation, ! 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #define READLINE_LIBRARY #if defined (HAVE_CONFIG_H) diff -cNr octave-2.0.14/readline/tcap.h octave-2.0.15/readline/tcap.h *** octave-2.0.14/readline/tcap.h Mon Feb 3 09:11:36 1997 --- octave-2.0.15/readline/tcap.h Wed Oct 13 16:34:25 1999 *************** *** 19,25 **** The GNU General Public License is often shipped with GNU software, and is generally kept in a file called COPYING or LICENSE. If you do not have a copy of the license, write to the Free Software Foundation, ! 675 Mass Ave, Cambridge, MA 02139, USA. */ #if !defined (_RLTCAP_H_) #define _RLTCAP_H_ --- 19,25 ---- The GNU General Public License is often shipped with GNU software, and is generally kept in a file called COPYING or LICENSE. If you do not have a copy of the license, write to the Free Software Foundation, ! 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #if !defined (_RLTCAP_H_) #define _RLTCAP_H_ diff -cNr octave-2.0.14/readline/terminal.c octave-2.0.15/readline/terminal.c *** octave-2.0.14/readline/terminal.c Wed Apr 16 15:28:12 1997 --- octave-2.0.15/readline/terminal.c Wed Oct 13 16:34:25 1999 *************** *** 18,24 **** The GNU General Public License is often shipped with GNU software, and is generally kept in a file called COPYING or LICENSE. If you do not have a copy of the license, write to the Free Software Foundation, ! 675 Mass Ave, Cambridge, MA 02139, USA. */ #define READLINE_LIBRARY #if defined (HAVE_CONFIG_H) --- 18,24 ---- The GNU General Public License is often shipped with GNU software, and is generally kept in a file called COPYING or LICENSE. If you do not have a copy of the license, write to the Free Software Foundation, ! 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #define READLINE_LIBRARY #if defined (HAVE_CONFIG_H) *************** *** 230,235 **** --- 230,245 ---- screenwidth--; screenchars = screenwidth * screenheight; + } + + void + rl_resize_terminal () + { + if (readline_echoing_p) + { + _rl_get_screen_size (fileno (rl_instream), 1); + _rl_redisplay_after_sigwinch (); + } } struct _tc_string { diff -cNr octave-2.0.14/readline/tilde.c octave-2.0.15/readline/tilde.c *** octave-2.0.14/readline/tilde.c Thu Apr 10 13:54:41 1997 --- octave-2.0.15/readline/tilde.c Wed Oct 13 16:30:47 1999 *************** *** 17,23 **** You should have received a copy of the GNU General Public License along with Readline; see the file COPYING. If not, write to the Free ! Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ #if defined (HAVE_CONFIG_H) # include --- 17,23 ---- You should have received a copy of the GNU General Public License along with Readline; see the file COPYING. If not, write to the Free ! Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #if defined (HAVE_CONFIG_H) # include diff -cNr octave-2.0.14/readline/tilde.h octave-2.0.15/readline/tilde.h *** octave-2.0.14/readline/tilde.h Tue Apr 8 13:08:15 1997 --- octave-2.0.15/readline/tilde.h Wed Oct 13 16:32:53 1999 *************** *** 19,25 **** The GNU General Public License is often shipped with GNU software, and is generally kept in a file called COPYING or LICENSE. If you do not have a copy of the license, write to the Free Software Foundation, ! 675 Mass Ave, Cambridge, MA 02139, USA. */ #if !defined (_TILDE_H_) # define _TILDE_H_ --- 19,25 ---- The GNU General Public License is often shipped with GNU software, and is generally kept in a file called COPYING or LICENSE. If you do not have a copy of the license, write to the Free Software Foundation, ! 59 Temple Place, Suite 330, Boston, MA 02111 USA. */ #if !defined (_TILDE_H_) # define _TILDE_H_ diff -cNr octave-2.0.14/readline/undo.c octave-2.0.15/readline/undo.c *** octave-2.0.14/readline/undo.c Fri Jan 24 11:51:09 1997 --- octave-2.0.15/readline/undo.c Wed Oct 13 16:34:21 1999 *************** *** 19,25 **** The GNU General Public License is often shipped with GNU software, and is generally kept in a file called COPYING or LICENSE. If you do not have a copy of the license, write to the Free Software Foundation, ! 675 Mass Ave, Cambridge, MA 02139, USA. */ #define READLINE_LIBRARY #if defined (HAVE_CONFIG_H) --- 19,25 ---- The GNU General Public License is often shipped with GNU software, and is generally kept in a file called COPYING or LICENSE. If you do not have a copy of the license, write to the Free Software Foundation, ! 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #define READLINE_LIBRARY #if defined (HAVE_CONFIG_H) diff -cNr octave-2.0.14/readline/util.c octave-2.0.15/readline/util.c *** octave-2.0.14/readline/util.c Wed Mar 26 12:16:40 1997 --- octave-2.0.15/readline/util.c Wed Oct 13 16:30:46 1999 *************** *** 18,24 **** The GNU General Public License is often shipped with GNU software, and is generally kept in a file called COPYING or LICENSE. If you do not have a copy of the license, write to the Free Software Foundation, ! 675 Mass Ave, Cambridge, MA 02139, USA. */ #define READLINE_LIBRARY #if defined (HAVE_CONFIG_H) --- 18,24 ---- The GNU General Public License is often shipped with GNU software, and is generally kept in a file called COPYING or LICENSE. If you do not have a copy of the license, write to the Free Software Foundation, ! 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #define READLINE_LIBRARY #if defined (HAVE_CONFIG_H) diff -cNr octave-2.0.14/readline/vi_keymap.c octave-2.0.15/readline/vi_keymap.c *** octave-2.0.14/readline/vi_keymap.c Wed Dec 21 14:59:54 1994 --- octave-2.0.15/readline/vi_keymap.c Wed Oct 13 16:32:47 1999 *************** *** 18,24 **** The GNU General Public License is often shipped with GNU software, and is generally kept in a file called COPYING or LICENSE. If you do not have a copy of the license, write to the Free Software Foundation, ! 675 Mass Ave, Cambridge, MA 02139, USA. */ #if !defined (BUFSIZ) #include --- 18,24 ---- The GNU General Public License is often shipped with GNU software, and is generally kept in a file called COPYING or LICENSE. If you do not have a copy of the license, write to the Free Software Foundation, ! 59 Temple Place, Suite 330, Boston, MA 02111 USA. */ #if !defined (BUFSIZ) #include diff -cNr octave-2.0.14/readline/vi_mode.c octave-2.0.15/readline/vi_mode.c *** octave-2.0.14/readline/vi_mode.c Fri Nov 15 15:29:26 1996 --- octave-2.0.15/readline/vi_mode.c Wed Oct 13 16:30:31 1999 *************** *** 19,25 **** The GNU General Public License is often shipped with GNU software, and is generally kept in a file called COPYING or LICENSE. If you do not have a copy of the license, write to the Free Software Foundation, ! 675 Mass Ave, Cambridge, MA 02139, USA. */ #define READLINE_LIBRARY /* **************************************************************** */ --- 19,25 ---- The GNU General Public License is often shipped with GNU software, and is generally kept in a file called COPYING or LICENSE. If you do not have a copy of the license, write to the Free Software Foundation, ! 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #define READLINE_LIBRARY /* **************************************************************** */ diff -cNr octave-2.0.14/readline/xmalloc.c octave-2.0.15/readline/xmalloc.c *** octave-2.0.14/readline/xmalloc.c Thu Feb 15 14:25:16 1996 --- octave-2.0.15/readline/xmalloc.c Wed Oct 13 16:34:24 1999 *************** *** 17,23 **** You should have received a copy of the GNU General Public License along with Readline; see the file COPYING. If not, write to the Free ! Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ #if defined (HAVE_CONFIG_H) #include --- 17,23 ---- You should have received a copy of the GNU General Public License along with Readline; see the file COPYING. If not, write to the Free ! Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #if defined (HAVE_CONFIG_H) #include diff -cNr octave-2.0.14/scripts/ChangeLog octave-2.0.15/scripts/ChangeLog *** octave-2.0.14/scripts/ChangeLog Wed Apr 14 12:55:54 1999 --- octave-2.0.15/scripts/ChangeLog Mon Jan 10 18:04:00 2000 *************** *** 1,3 **** --- 1,71 ---- + 2000-01-10 John W. Eaton + + * Version 2.0.15 released. + + 1999-10-22 John W. Eaton + + * strings/split.m: If the string to be split is empty, just return + an empty string. + + Mon Sep 20 23:19:29 1999 John W. Eaton + + * general/linspace.m, linear-algebra/pinv.m: Delete. + + * statistics/base/statistics.m: Likewise. + * statistics/tests/anova.m: Likewise. + * statistics/tests/chisquare_test_homogeneity.m: Likewise. + * statistics/tests/kruskal_wallis_test.m: Likewise. + * statistics/tests/manova.m: Likewise. + * statistics/tests/u_test.m: Likewise. + * statistics/tests/t_test_regression.m: Likewise. + * strings/dec2hex.m: Likewise. + * image/saveimage.m: Likewise. + * signal/arch_fit.m: Likewise. + * signal/autoreg_matrix.m: Likewise. + * signal/triangle_lw.m: Likewise. + + Thu Sep 9 19:31:58 1999 John W. Eaton + + * image/saveimage.m: Initialize scale. + + Sun Sep 5 22:13:47 1999 John W. Eaton + + * general/reshape.m: Allow reshape (a, size (b)). + + Fri Sep 3 00:01:38 1999 John W. Eaton + + * specfun/erfinv.m: Improve stopping criterion. + Add iteration count as second return value. + + Mon Aug 30 12:07:00 1999 John W. Eaton + + * statistics/base/mean.m: Use .', not ' to reorient row vectors. + + Tue Aug 17 11:11:27 1999 John W. Eaton + + * miscellaneous/pack.m: New function. + + Mon Aug 16 07:46:57 1999 John W. Eaton + + * plot/figure.m: Always return figure number. With no args, + figure now creates a new figure window and returns its number. + Accept figure (property, value) syntax, but do nothing. + + Mon Aug 2 16:39:04 1999 John W. Eaton + + * plot/bar.m: Compute bar widths correctly when x-values are not + evenly spaced. + + Mon Jul 12 22:48:34 1999 John W. Eaton + + * linear-algebra/cond.m: Avoid returning NaN for matrices that + contain only zeros. + + Sun Jun 20 22:24:27 1999 Eduardo Gallestey + + * linear-algebra/kron.m: Create result matrix and insert blocks + instead of appending them. + Wed Apr 14 12:55:42 1999 John W. Eaton * Version 2.0.14 released. diff -cNr octave-2.0.14/scripts/configure octave-2.0.15/scripts/configure *** octave-2.0.14/scripts/configure Wed Apr 14 12:58:13 1999 --- octave-2.0.15/scripts/configure Mon Jan 10 18:10:19 2000 *************** *** 3,9 **** # From configure.in # Guess values for system-dependent variables and create Makefiles. ! # Generated automatically using autoconf version 2.13 # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. # # This configure script is free software; the Free Software Foundation --- 3,9 ---- # From configure.in # Guess values for system-dependent variables and create Makefiles. ! # Generated automatically using autoconf version 2.12 # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. # # This configure script is free software; the Free Software Foundation *************** *** 51,57 **** # Initialize some other variables. subdirs= MFLAGS= MAKEFLAGS= - SHELL=${CONFIG_SHELL-/bin/sh} # Maximum number of lines to put in a shell here document. ac_max_here_lines=12 --- 51,56 ---- *************** *** 335,341 **** verbose=yes ;; -version | --version | --versio | --versi | --vers) ! echo "configure generated by autoconf version 2.13" exit 0 ;; -with-* | --with-*) --- 334,340 ---- verbose=yes ;; -version | --version | --versio | --versi | --vers) ! echo "configure generated by autoconf version 2.12" exit 0 ;; -with-* | --with-*) *************** *** 505,515 **** # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' ! ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_cc_cross - ac_exeext= - ac_objext=o if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu. if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then --- 504,512 ---- # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' ! ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_cc_cross if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu. if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then *************** *** 550,579 **** # SunOS /usr/etc/install # IRIX /sbin/install # AIX /bin/install - # AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag # AFS /usr/afsws/bin/install, which mishandles nonexistent args # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 ! echo "configure:559: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ! IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":" for ac_dir in $PATH; do # Account for people who put trailing slashes in PATH elements. case "$ac_dir/" in /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;; *) # OSF1 and SCO ODT 3.0 have their own names for install. ! # Don't use installbsd from OSF since it installs stuff as root ! # by default. ! for ac_prog in ginstall scoinst install; do if test -f $ac_dir/$ac_prog; then if test $ac_prog = install && grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. : else ac_cv_path_install="$ac_dir/$ac_prog -c" --- 547,574 ---- # SunOS /usr/etc/install # IRIX /sbin/install # AIX /bin/install # AFS /usr/afsws/bin/install, which mishandles nonexistent args # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 ! echo "configure:555: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ! IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS="${IFS}:" for ac_dir in $PATH; do # Account for people who put trailing slashes in PATH elements. case "$ac_dir/" in /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;; *) # OSF1 and SCO ODT 3.0 have their own names for install. ! for ac_prog in ginstall installbsd scoinst install; do if test -f $ac_dir/$ac_prog; then if test $ac_prog = install && grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. + # OSF/1 installbsd also uses dspmsg, but is usable. : else ac_cv_path_install="$ac_dir/$ac_prog -c" *************** *** 603,610 **** # It thinks the first close brace ends the variable substitution. test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' - test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' - test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' --- 598,603 ---- *************** *** 631,637 **** # Ultrix sh set writes to stderr and can't be redirected directly, # and sets the high bit in the cache file unless we assign to the vars. (set) 2>&1 | ! case `(ac_space=' '; set | grep ac_space) 2>&1` in *ac_space=\ *) # `set' does not quote correctly, so add quotes (double-quote substitution # turns \\\\ into \\, and sed turns \\ into \). --- 624,630 ---- # Ultrix sh set writes to stderr and can't be redirected directly, # and sets the high bit in the cache file unless we assign to the vars. (set) 2>&1 | ! case `(ac_space=' '; set) 2>&1` in *ac_space=\ *) # `set' does not quote correctly, so add quotes (double-quote substitution # turns \\\\ into \\, and sed turns \\ into \). *************** *** 710,716 **** echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion" exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;; -version | --version | --versio | --versi | --vers | --ver | --ve | --v) ! echo "$CONFIG_STATUS generated by autoconf version 2.13" exit 0 ;; -help | --help | --hel | --he | --h) echo "\$ac_cs_usage"; exit 0 ;; --- 703,709 ---- echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion" exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;; -version | --version | --versio | --versi | --vers | --ver | --ve | --v) ! echo "$CONFIG_STATUS generated by autoconf version 2.12" exit 0 ;; -help | --help | --hel | --he | --h) echo "\$ac_cs_usage"; exit 0 ;; *************** *** 737,747 **** s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF $ac_vpsub $extrasub - s%@SHELL@%$SHELL%g s%@CFLAGS@%$CFLAGS%g s%@CPPFLAGS@%$CPPFLAGS%g s%@CXXFLAGS@%$CXXFLAGS%g - s%@FFLAGS@%$FFLAGS%g s%@DEFS@%$DEFS%g s%@LDFLAGS@%$LDFLAGS%g s%@LIBS@%$LIBS%g --- 730,738 ---- *************** *** 761,767 **** s%@infodir@%$infodir%g s%@mandir@%$mandir%g s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g - s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g s%@INSTALL_DATA@%$INSTALL_DATA%g CEOF --- 752,757 ---- diff -cNr octave-2.0.14/scripts/general/linspace.m octave-2.0.15/scripts/general/linspace.m *** octave-2.0.14/scripts/general/linspace.m Tue Feb 18 11:43:41 1997 --- octave-2.0.15/scripts/general/linspace.m Wed Dec 31 18:00:00 1969 *************** *** 1,60 **** - ## Copyright (C) 1993, 1994, 1995 John W. Eaton - ## - ## This file is part of Octave. - ## - ## Octave is free software; you can redistribute it and/or modify it - ## under the terms of the GNU General Public License as published by the - ## Free Software Foundation; either version 2, or (at your option) any - ## later version. - ## - ## Octave is distributed in the hope that it will be useful, but WITHOUT - ## ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - ## FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - ## for more details. - ## - ## You should have received a copy of the GNU General Public License - ## along with Octave; see the file COPYING. If not, write to the Free - ## Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. - - ## usage: linspace (x1, x2, n) - ## - ## Return a vector of n equally spaced points between x1 and x2 - ## inclusive. - ## - ## If the final argument is omitted, n = 100 is assumed. - ## - ## All three arguments must be scalars. - ## - ## See also: logspace - - ## Author: jwe - - function retval = linspace (x1, x2, n) - - if (nargin == 2) - npoints = 100; - elseif (nargin == 3) - if (length (n) == 1) - npoints = fix (n); - else - error ("linspace: arguments must be scalars"); - endif - else - usage ("linspace (x1, x2 [, n])"); - endif - - if (npoints < 2) - error ("linspace: npoints must be greater than 2"); - endif - - ## In some cases x1 + delta * (npoints - 1) will not be equal to x2, - ## so we cheat and force the last value to be x2. - - if (length (x1) == 1 && length (x2) == 1) - delta = (x2 - x1) / (npoints - 1); - retval = [x1+(0:npoints-2)*delta, x2]; - else - error ("linspace: arguments must be scalars"); - endif - - endfunction --- 0 ---- diff -cNr octave-2.0.14/scripts/general/reshape.m octave-2.0.15/scripts/general/reshape.m *** octave-2.0.14/scripts/general/reshape.m Thu Jul 11 22:58:02 1996 --- octave-2.0.15/scripts/general/reshape.m Sun Sep 5 22:13:46 1999 *************** *** 28,36 **** function retval = reshape (a, m, n) ! if (nargin != 3) ! usage ("reshape (a, m, n)"); ! else [nr, nc] = size (a); if (nr * nc == m * n) dfi = do_fortran_indexing; --- 28,41 ---- function retval = reshape (a, m, n) ! ! if (nargin == 2 && prod (size (m)) == 2) ! n = m(2); ! m = m(1); ! nargin = 3; ! endif ! ! if (nargin == 3) [nr, nc] = size (a); if (nr * nc == m * n) dfi = do_fortran_indexing; *************** *** 50,55 **** --- 55,62 ---- else error ("reshape: sizes must match"); endif + else + usage ("reshape (a, m, n) or reshape (a, size (b))"); endif endfunction diff -cNr octave-2.0.14/scripts/image/saveimage.m octave-2.0.15/scripts/image/saveimage.m *** octave-2.0.14/scripts/image/saveimage.m Tue Nov 24 22:00:50 1998 --- octave-2.0.15/scripts/image/saveimage.m Mon Sep 20 23:21:24 1999 *************** *** 162,168 **** for i = 1:img_nr idx = (i-1)*img_nc+1:i*img_nc; if (n_long > 0) ! img_row = [map(img(idx)); zeros (8-n_long, 1)]; else img_row = map(img(idx)); endif --- 162,168 ---- for i = 1:img_nr idx = (i-1)*img_nc+1:i*img_nc; if (n_long > 0) ! img_row = [map(img(idx)); (zeros (8-n_long, 1))]; else img_row = map(img(idx)); endif *************** *** 238,243 **** --- 238,244 ---- scols = img_nr * pixfac; srows = img_nc * pixfac; + scale = 1; if (scols > pagewid * MARGIN || srows > pagehgt * MARGIN) if (scols > pagewid * MARGIN) diff -cNr octave-2.0.14/scripts/linear-algebra/cond.m octave-2.0.15/scripts/linear-algebra/cond.m *** octave-2.0.14/scripts/linear-algebra/cond.m Thu Oct 10 17:38:47 1996 --- octave-2.0.15/scripts/linear-algebra/cond.m Thu Sep 2 09:48:07 1999 *************** *** 17,28 **** ## Software Foundation, 59 Temple Place - Suite 330, Boston, MA ## 02111-1307, USA. ! ## usage: cond (a) ## ! ## Return the condition number of a, computed using the singular values ! ## of a. ## ! ## See also: norm, svd ## Author: jwe --- 17,29 ---- ## Software Foundation, 59 Temple Place - Suite 330, Boston, MA ## 02111-1307, USA. ! ## usage: cond (A) ## ! ## Return the condition number of A, computed using the singular values ! ## of A. If the maximum and minimum singular values of A are both zero, ! ## cond returns Inf rather than NaN. ## ! ## See also: norm, svd, rank ## Author: jwe *************** *** 39,46 **** endif retval = 0.0; endif ! sigma = svd (a); ! retval = sigma (1) / sigma (length (sigma)); else usage ("cond (a)"); endif --- 40,57 ---- endif retval = 0.0; endif ! if (any (any (isinf (a) | isnan (a)))) ! error ("cond: argument must not contain Inf or NaN values"); ! else ! sigma = svd (a); ! sigma_1 = sigma(1); ! sigma_n = sigma(length (sigma)); ! if (sigma_1 == 0 || sigma_n == 0) ! retval = Inf; ! else ! retval = sigma_1 / sigma_n; ! endif ! endif else usage ("cond (a)"); endif diff -cNr octave-2.0.14/scripts/linear-algebra/kron.m octave-2.0.15/scripts/linear-algebra/kron.m *** octave-2.0.14/scripts/linear-algebra/kron.m Mon Jul 15 17:20:21 1996 --- octave-2.0.15/scripts/linear-algebra/kron.m Sun Jun 20 22:24:08 1999 *************** *** 35,59 **** [m, n] = size (b); [ma, na] = size (a); ! ## Do 1st column. ! x = a (1, 1) * b; ! for ii = 2:ma ! tmp = a (ii, 1) * b; ! x = [x; tmp]; ! endfor ! ! ## Do remaining columns. ! ! for jj = 2:na ! tmp = a (1, jj) * b; ! for ii = 2:ma ! pmt = a (ii, jj) * b; ! tmp = [tmp; pmt]; endfor ! x = [x, tmp]; endfor ! else usage ("kron (a, b)"); endif --- 35,51 ---- [m, n] = size (b); [ma, na] = size (a); ! x = zeros (ma*m, na*n); ! i_vec = 1:m; ! j_vec = 1:n; ! for jj = 1:na ! for ii = 1:ma ! x(i_vec+(ii-1)*m,j_vec) = a(ii,jj) * b; endfor ! j_vec = jvec + n; endfor ! else usage ("kron (a, b)"); endif diff -cNr octave-2.0.14/scripts/linear-algebra/pinv.m octave-2.0.15/scripts/linear-algebra/pinv.m *** octave-2.0.14/scripts/linear-algebra/pinv.m Tue Feb 18 11:48:40 1997 --- octave-2.0.15/scripts/linear-algebra/pinv.m Wed Dec 31 18:00:00 1969 *************** *** 1,55 **** - ## Copyright (C) 1994 John W. Eaton - ## - ## This file is part of Octave. - ## - ## Octave is free software; you can redistribute it and/or modify it - ## under the terms of the GNU General Public License as published by the - ## Free Software Foundation; either version 2, or (at your option) any - ## later version. - ## - ## Octave is distributed in the hope that it will be useful, but WITHOUT - ## ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - ## FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - ## for more details. - ## - ## You should have received a copy of the GNU General Public License - ## along with Octave; see the file COPYING. If not, write to the Free - ## Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. - - ## usage: pinv (X, tol) - ## - ## Returns the pseudoinverse of X; singular values less than tol are - ## ignored. - ## - ## If the second argument is omitted, it is assumed that - ## - ## tol = max (size (X)) * sigma_max (X) * eps, - ## - ## where sigma_max(X) is the maximal singular value of X. - - ## Author: Kurt Hornik (hornik@neuro.tuwien.ac.at> - ## Created: March 1993. - ## Adapted-By: jwe - - function retval = pinv (X, tol) - - if (nargin < 1 || nargin > 2) - error ("usage: pinv (X [, tol])"); - endif - - [U, S, V] = svd(X); - s = diag(S); - - if (nargin == 1) - tol = max (size (X)) * s (1) * eps; - endif - - r = sum (s > tol); - if (r == 0) - retval = zeros (X'); - else - D = diag (ones (r, 1) ./ s (1:r)); - retval = V (:, 1:r) * D * U (:, 1:r)'; - endif - - endfunction --- 0 ---- diff -cNr octave-2.0.14/scripts/miscellaneous/pack.m octave-2.0.15/scripts/miscellaneous/pack.m *** octave-2.0.14/scripts/miscellaneous/pack.m Wed Dec 31 18:00:00 1969 --- octave-2.0.15/scripts/miscellaneous/pack.m Tue Aug 17 11:11:26 1999 *************** *** 0 **** --- 1,29 ---- + ## Copyright (C) 1999 John W. Eaton + ## + ## This file is part of Octave. + ## + ## Octave is free software; you can redistribute it and/or modify it + ## under the terms of the GNU General Public License as published by + ## the Free Software Foundation; either version 2, or (at your option) + ## any later version. + ## + ## Octave is distributed in the hope that it will be useful, but + ## WITHOUT ANY WARRANTY; without even the implied warranty of + ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + ## General Public License for more details. + ## + ## You should have received a copy of the GNU General Public License + ## along with Octave; see the file COPYING. If not, write to the Free + ## Software Foundation, 59 Temple Place - Suite 330, Boston, MA + ## 02111-1307, USA. + + ## usage: pack + ## + ## This function is provided for compatibility with Matlab, but it + ## doesn't actually do anything. + + ## Author: jwe + + function pack () + + endfunction diff -cNr octave-2.0.14/scripts/mkinstalldirs octave-2.0.15/scripts/mkinstalldirs *** octave-2.0.14/scripts/mkinstalldirs Thu Jul 18 21:47:02 1996 --- octave-2.0.15/scripts/mkinstalldirs Wed Oct 13 17:08:40 1999 *************** *** 1,6 **** #!/bin/sh # mkinstalldirs --- make directory hierarchy ! # Author: Noah Friedman # Created: 1993-05-16 # Last modified: Wed Jan 25 09:35:21 1995 # Public domain --- 1,6 ---- #!/bin/sh # mkinstalldirs --- make directory hierarchy ! # Author: Noah Friedman # Created: 1993-05-16 # Last modified: Wed Jan 25 09:35:21 1995 # Public domain diff -cNr octave-2.0.14/scripts/plot/bar.m octave-2.0.15/scripts/plot/bar.m *** octave-2.0.14/scripts/plot/bar.m Mon Jul 15 17:20:21 1996 --- octave-2.0.15/scripts/plot/bar.m Mon Aug 2 16:37:13 1999 *************** *** 69,92 **** if (xlen == ylen) len = 3 * xlen + 1; tmp_xb = tmp_yb = zeros (len, 1); ! delta = (x(2) - x(1)) / 2.0; ! tmp_xb(1) = x(1) - delta; tmp_yb(1) = 0.0; k = 1; for i = 2:3:len tmp_xb(i) = tmp_xb(i-1); ! tmp_xb(i+1) = tmp_xb(i) + 2.0 * delta; tmp_xb(i+2) = tmp_xb(i+1); tmp_yb(i) = y(k); tmp_yb(i+1) = y(k); tmp_yb(i+2) = 0.0; if (k < xlen) - delta = (x(k+1) - x(k)) / 2.0; if (x(k+1) < x(k)) error ("bar: x vector values must be in ascending order"); endif ! endif ! k++; endfor else error ("bar: arguments must be the same length"); --- 69,102 ---- if (xlen == ylen) len = 3 * xlen + 1; tmp_xb = tmp_yb = zeros (len, 1); ! cutoff = zeros (1, xlen-1); ! for i = 1:xlen-1 ! cutoff(i) = (x(i) + x(i+1)) / 2.0; ! endfor ! delta_p = cutoff(1) - x(1); ! delta_m = delta_p; ! tmp_xb(1) = x(1) - delta_m; tmp_yb(1) = 0.0; k = 1; for i = 2:3:len tmp_xb(i) = tmp_xb(i-1); ! tmp_xb(i+1) = x(k) + delta_p; tmp_xb(i+2) = tmp_xb(i+1); tmp_yb(i) = y(k); tmp_yb(i+1) = y(k); tmp_yb(i+2) = 0.0; if (k < xlen) if (x(k+1) < x(k)) error ("bar: x vector values must be in ascending order"); endif ! delta_m = x(k+1) - cutoff(k); ! k++; ! if (k < xlen) ! delta_p = cutoff(k) - x(k); ! else ! delta_p = delta_m; ! endif ! endif endfor else error ("bar: arguments must be the same length"); diff -cNr octave-2.0.14/scripts/plot/figure.m octave-2.0.15/scripts/plot/figure.m *** octave-2.0.14/scripts/plot/figure.m Tue Nov 18 02:18:37 1997 --- octave-2.0.15/scripts/plot/figure.m Mon Aug 16 07:46:17 1999 *************** *** 24,43 **** ## Author: jwe ! function figure (n) ! if (nargin == 1) if (gnuplot_has_frames) if (! isempty (getenv ("DISPLAY"))) oneplot (); ! eval (sprintf ("gset term x11 %d\n", n)); else error ("figure: requires X11 and valid DISPLAY"); endif else error ("figure: gnuplot doesn't appear to support this feature"); endif else usage ("figure (n)"); endif endfunction --- 24,59 ---- ## Author: jwe ! function f = figure (n) ! global __FIGURE_LIST__ = create_set (0); ! global __FIGURE_CALLED__ = 0; ! ! if (nargin == 0) ! f = max (__FIGURE_LIST__) + 1; ! else ! f = n; ! endif ! ! if (nargin < 2) if (gnuplot_has_frames) if (! isempty (getenv ("DISPLAY"))) oneplot (); ! __FIGURE_LIST__ = union (__FIGURE_LIST__, f); ! eval (sprintf ("gset term x11 %d\n", f)); else error ("figure: requires X11 and valid DISPLAY"); endif else error ("figure: gnuplot doesn't appear to support this feature"); endif + elseif (rem (nargin, 2) == 0) + if (! __FIGURE_CALLED__) + __FIGURE_CALLED__ = 1; + warning ("figure: setting figure properties is unsupported"); + endif else usage ("figure (n)"); endif + endfunction diff -cNr octave-2.0.14/scripts/plot/hist.m octave-2.0.15/scripts/plot/hist.m *** octave-2.0.14/scripts/plot/hist.m Fri May 15 01:16:37 1998 --- octave-2.0.15/scripts/plot/hist.m Mon Aug 2 16:37:42 1999 *************** *** 28,34 **** ## Given a second scalar argument, use that as the number of bins. ## ## Given a second vector argument, use that as the centers of the bins, ! ## with the width of the bins determened from the adjacent values in ## the vector. ## ## Extreme values are lumped in the first and last bins. --- 28,34 ---- ## Given a second scalar argument, use that as the number of bins. ## ## Given a second vector argument, use that as the centers of the bins, ! ## with the width of the bins determined from the adjacent values in ## the vector. ## ## Extreme values are lumped in the first and last bins. diff -cNr octave-2.0.14/scripts/signal/arch_fit.m octave-2.0.15/scripts/signal/arch_fit.m *** octave-2.0.14/scripts/signal/arch_fit.m Thu Oct 22 23:56:12 1998 --- octave-2.0.15/scripts/signal/arch_fit.m Mon Sep 20 23:25:15 1999 *************** *** 67,73 **** e = y - X * b; else [b, v_b, e] = ols (y, X); ! a = [v_b, zeros (1,p)]'; if (nargin < 5) gamma = 0.1; if (nargin < 4) --- 67,73 ---- e = y - X * b; else [b, v_b, e] = ols (y, X); ! a = [v_b, (zeros (1,p))]'; if (nargin < 5) gamma = 0.1; if (nargin < 4) diff -cNr octave-2.0.14/scripts/signal/autoreg_matrix.m octave-2.0.15/scripts/signal/autoreg_matrix.m *** octave-2.0.14/scripts/signal/autoreg_matrix.m Thu Oct 22 23:56:12 1998 --- octave-2.0.15/scripts/signal/autoreg_matrix.m Mon Sep 20 23:25:04 1999 *************** *** 38,44 **** y = reshape (y, T, 1); X = ones (T, k+1); for j = 1 : k; ! X(:, j+1) = [zeros (j, 1); y(1:T-j)]; endfor endfunction --- 38,44 ---- y = reshape (y, T, 1); X = ones (T, k+1); for j = 1 : k; ! X(:, j+1) = [(zeros (j, 1)); y(1:T-j)]; endfor endfunction diff -cNr octave-2.0.14/scripts/signal/triangle_lw.m octave-2.0.15/scripts/signal/triangle_lw.m *** octave-2.0.14/scripts/signal/triangle_lw.m Thu Oct 22 23:56:12 1998 --- octave-2.0.15/scripts/signal/triangle_lw.m Mon Sep 20 23:24:38 1999 *************** *** 25,31 **** function retval = triangle_lw (n, b) retval = 1 - (0 : n-1)' * b; ! retval = max ([retval'; zeros (1, n)])'; endfunction --- 25,31 ---- function retval = triangle_lw (n, b) retval = 1 - (0 : n-1)' * b; ! retval = max ([retval'; (zeros (1, n))])'; endfunction diff -cNr octave-2.0.14/scripts/specfun/erfinv.m octave-2.0.15/scripts/specfun/erfinv.m *** octave-2.0.14/scripts/specfun/erfinv.m Mon May 19 16:40:59 1997 --- octave-2.0.15/scripts/specfun/erfinv.m Fri Sep 3 12:13:23 1999 *************** *** 22,37 **** ## Created: 27 September 1994 ## Adapted-By: jwe ! function y = erfinv (x) if (nargin != 1) usage ("erfinv (x)"); endif ! [m, n] = size (x); x = reshape (x, m * n, 1); y = zeros (m * n, 1); ! i = find ((x < -1) | (x > 1)); if any (i) y(i) = NaN * ones (length (i), 1); --- 22,42 ---- ## Created: 27 September 1994 ## Adapted-By: jwe ! function [y, iterations] = erfinv (x) if (nargin != 1) usage ("erfinv (x)"); endif ! ! maxit = 100; ! tol = eps; ! ! iterations = 0; ! [m, n] = size (x); x = reshape (x, m * n, 1); y = zeros (m * n, 1); ! i = find ((x < -1) | (x > 1)); if any (i) y(i) = NaN * ones (length (i), 1); *************** *** 42,56 **** t = find (x == 1); y (t) = Inf * ones (size (t)); ! i = find ((x > -1) & (x < 1)); if any (i) s = sqrt (pi) / 2; z_old = ones (length (i), 1); ! z_new = zeros (length (i), 1); ! while (any (any (abs (z_new - z_old) > 2 * eps))) z_old = z_new; z_new = z_old - (erf (z_old) - x(i)) .* exp (z_old.^2) * s; endwhile y(i) = z_new; endif --- 47,65 ---- t = find (x == 1); y (t) = Inf * ones (size (t)); ! i = find ((x > -1) & (x < 1)); if any (i) s = sqrt (pi) / 2; z_old = ones (length (i), 1); ! z_new = sqrt (-log (1 - abs (x(i)))) .* sign (x(i)); ! while (any (abs (erf (z_old) - x(i)) > tol * abs (x(i)))) z_old = z_new; z_new = z_old - (erf (z_old) - x(i)) .* exp (z_old.^2) * s; + if (++iterations > maxit) + warning ("erfinv: iteration limit exceeded"); + break; + endif endwhile y(i) = z_new; endif diff -cNr octave-2.0.14/scripts/statistics/base/mean.m octave-2.0.15/scripts/statistics/base/mean.m *** octave-2.0.14/scripts/statistics/base/mean.m Fri Oct 23 00:10:11 1998 --- octave-2.0.15/scripts/statistics/base/mean.m Mon Aug 30 12:07:52 1999 *************** *** 41,47 **** endif if (rows (x) == 1) ! x = x'; endif if (nargin == 1) --- 41,47 ---- endif if (rows (x) == 1) ! x = x.'; endif if (nargin == 1) diff -cNr octave-2.0.14/scripts/statistics/base/statistics.m octave-2.0.15/scripts/statistics/base/statistics.m *** octave-2.0.14/scripts/statistics/base/statistics.m Wed Feb 19 03:37:55 1997 --- octave-2.0.15/scripts/statistics/base/statistics.m Mon Sep 20 23:24:19 1999 *************** *** 36,44 **** X = reshape (X, length (X), 1); endif for k=1:columns(X) ! S(:,k) = [min (X(:,k)); empirical_inv ([0.25;0.5;0.75], X(:,k)); ! max (X(:,k)); mean (X(:,k)); std (X(:,k)); ! skewness (X(:,k)); kurtosis (X(:,k))]; endfor else error ("statistics: invalid argument"); --- 36,48 ---- X = reshape (X, length (X), 1); endif for k=1:columns(X) ! S(:,k) = [(min (X(:,k))); ! (empirical_inv ([0.25;0.5;0.75], X(:,k))); ! (max (X(:,k))); ! (mean (X(:,k))); ! (std (X(:,k))); ! (skewness (X(:,k))); ! (kurtosis (X(:,k)))]; endfor else error ("statistics: invalid argument"); diff -cNr octave-2.0.14/scripts/statistics/tests/anova.m octave-2.0.15/scripts/statistics/tests/anova.m *** octave-2.0.14/scripts/statistics/tests/anova.m Wed Feb 26 10:12:42 1997 --- octave-2.0.15/scripts/statistics/tests/anova.m Mon Sep 20 23:22:59 1999 *************** *** 64,70 **** if (k == 1) error ("anova: there should be at least 2 groups"); else ! group_label = s ([1, reshape (i, 1, k-1) + 1]); endif for i = 1 : k; v = y (find (g == group_label (i))); --- 64,70 ---- if (k == 1) error ("anova: there should be at least 2 groups"); else ! group_label = s ([1, (reshape (i, 1, k-1) + 1)]); endif for i = 1 : k; v = y (find (g == group_label (i))); diff -cNr octave-2.0.14/scripts/statistics/tests/chisquare_test_homogeneity.m octave-2.0.15/scripts/statistics/tests/chisquare_test_homogeneity.m *** octave-2.0.14/scripts/statistics/tests/chisquare_test_homogeneity.m Wed Feb 26 10:14:00 1997 --- octave-2.0.15/scripts/statistics/tests/chisquare_test_homogeneity.m Mon Sep 20 23:22:43 1999 *************** *** 46,52 **** error ("chisquare_test_homogeneity: c must be increasing"); endif ! c = [reshape (c, 1, df), Inf]; l_x = length (x); x = reshape (x, l_x, 1); n_x = sum (x * ones (1, df+1) < ones (l_x, 1) * c); --- 46,52 ---- error ("chisquare_test_homogeneity: c must be increasing"); endif ! c = [(reshape (c, 1, df)), Inf]; l_x = length (x); x = reshape (x, l_x, 1); n_x = sum (x * ones (1, df+1) < ones (l_x, 1) * c); diff -cNr octave-2.0.14/scripts/statistics/tests/kruskal_wallis_test.m octave-2.0.15/scripts/statistics/tests/kruskal_wallis_test.m *** octave-2.0.14/scripts/statistics/tests/kruskal_wallis_test.m Wed Feb 26 09:41:01 1997 --- octave-2.0.15/scripts/statistics/tests/kruskal_wallis_test.m Mon Sep 20 23:22:07 1999 *************** *** 48,54 **** endif l = length (x); n = [n, l]; ! p = [p, reshape (x, 1, l)]; endfor r = ranks (p); --- 48,54 ---- endif l = length (x); n = [n, l]; ! p = [p, (reshape (x, 1, l))]; endfor r = ranks (p); diff -cNr octave-2.0.14/scripts/statistics/tests/manova.m octave-2.0.15/scripts/statistics/tests/manova.m *** octave-2.0.14/scripts/statistics/tests/manova.m Wed Feb 26 09:45:25 1997 --- octave-2.0.15/scripts/statistics/tests/manova.m Mon Sep 20 23:21:00 1999 *************** *** 61,67 **** if (k == 1) error ("manova: there should be at least 2 groups"); else ! group_label = s ([1, reshape (i, 1, k - 1) + 1]); endif Y = Y - ones (n, 1) * mean (Y); --- 61,67 ---- if (k == 1) error ("manova: there should be at least 2 groups"); else ! group_label = s ([1, (reshape (i, 1, k - 1) + 1)]); endif Y = Y - ones (n, 1) * mean (Y); diff -cNr octave-2.0.14/scripts/statistics/tests/t_test_regression.m octave-2.0.15/scripts/statistics/tests/t_test_regression.m *** octave-2.0.14/scripts/statistics/tests/t_test_regression.m Sun Jun 1 08:42:04 1997 --- octave-2.0.15/scripts/statistics/tests/t_test_regression.m Mon Sep 20 23:20:21 1999 *************** *** 86,93 **** elseif strcmp (alt, "<") pval = cdf; else ! error (["t_test_regression: ", ... ! sprintf ("the value %s for alt is not possible", alt)]); endif if (nargout == 0) --- 86,92 ---- elseif strcmp (alt, "<") pval = cdf; else ! error ("t_test_regression: the value %s for alt is not possible", alt); endif if (nargout == 0) diff -cNr octave-2.0.14/scripts/statistics/tests/u_test.m octave-2.0.15/scripts/statistics/tests/u_test.m *** octave-2.0.14/scripts/statistics/tests/u_test.m Sun Jun 1 08:42:05 1997 --- octave-2.0.15/scripts/statistics/tests/u_test.m Mon Sep 20 23:19:51 1999 *************** *** 52,58 **** n_x = length (x); n_y = length (y); ! r = ranks ([reshape (x, 1, n_x), reshape (y, 1, n_y)]); z = (sum (r(1 : n_x)) - n_x * (n_x + n_y + 1) / 2) ... / sqrt (n_x * n_y * (n_x + n_y + 1) / 12); --- 52,58 ---- n_x = length (x); n_y = length (y); ! r = ranks ([(reshape (x, 1, n_x)), (reshape (y, 1, n_y))]); z = (sum (r(1 : n_x)) - n_x * (n_x + n_y + 1) / 2) ... / sqrt (n_x * n_y * (n_x + n_y + 1) / 12); diff -cNr octave-2.0.14/scripts/strings/dec2hex.m octave-2.0.15/scripts/strings/dec2hex.m *** octave-2.0.14/scripts/strings/dec2hex.m Tue Aug 20 18:30:55 1996 --- octave-2.0.15/scripts/strings/dec2hex.m Mon Sep 20 23:22:00 1999 *************** *** 44,50 **** for i = 1:len tmp = d (i); if (tmp == round (tmp)) ! h = [h, sprintf ("%x", tmp)]; else error ("dec2hex: invalid conversion"); endif --- 44,50 ---- for i = 1:len tmp = d (i); if (tmp == round (tmp)) ! h = sprintf ("%s%x", h, tmp); else error ("dec2hex: invalid conversion"); endif diff -cNr octave-2.0.14/scripts/strings/split.m octave-2.0.15/scripts/strings/split.m *** octave-2.0.14/scripts/strings/split.m Thu Mar 11 12:49:39 1999 --- octave-2.0.15/scripts/strings/split.m Fri Oct 22 04:42:47 1999 *************** *** 37,43 **** l_s = length (s); l_t = length (t); ! if (l_s < l_t) error ("split: s must not be shorter than t"); endif --- 37,46 ---- l_s = length (s); l_t = length (t); ! if (l_s == 0) ! m = ""; ! return; ! elseif (l_s < l_t) error ("split: s must not be shorter than t"); endif diff -cNr octave-2.0.14/src/ChangeLog octave-2.0.15/src/ChangeLog *** octave-2.0.14/src/ChangeLog Wed Apr 14 12:55:55 1999 --- octave-2.0.15/src/ChangeLog Mon Jan 10 18:03:59 2000 *************** *** 1,3 **** --- 1,174 ---- + 2000-01-10 John W. Eaton + + * Version 2.0.15 released. + + 1999-11-12 John W. Eaton + + * cutils.c (octave_strcasecmp, octave_strncasecmp): New functions. + * utils.cc (almost_match): Call octave_strncasecmp instead of + calling strncasecmp directly. + + 1999-11-05 John W. Eaton + + * sighandlers.cc (install_signal_handlers): Don't install + sigwinch_handler. + + * oct-iostrm.h, oct-iostrm.cc (octave_istream::eof): New function. + (octave_ostream::eof): Ditto. + + * oct-stream.cc (octave_base_stream::do_scanf): + The stdin stream is only special if we are interactive. + (octave_base_stream::scanf): Ditto. + (octave_base_stream::do_oscanf): Ditto. + (octave_base_stream::oscanf): Ditto. + + 1999-11-03 John W. Eaton + + * Makefile.in (oct-gperf.h): Ask for ANSI-C output from gperf + (requires gperf-2.7 or later). + + * oct-stream.cc (octave_base_stream::do_scanf): If it looks like + we have a matching failure, then reset the failbit in the stream + state. + (octave_base_stream::do_oscanf): Likewise. + + 1999-11-02 John W. Eaton + + * lex.l (yywrap): No longer static. + (have_continuation): Declare input character as int, not char, so + comparison to EOF will work. + + 1999-10-26 John W. Eaton + + * lsode.cc (Flsode): Be sure to call run_unwind_frame before returning. + * quad.cc (Fquad): Likewise. + * fsolve.cc (Ffsolve): Likewise. + * dassl.cc (Fdassl): Likewise. + + * pt-fcn.cc (tree_function::eval): If Vmax_recursion_depth is + exceeded, call run_unwind_frame before returning. + + * load-save.cc (read_mat_ascii_data): When reading from + tmp_stream, check its state, not the state of is. + + 1999-10-21 John W. Eaton + + * cutils.c (do_octave_usleep): Handle useconds > 1e6. + + * cutils.c: New file. + * Makefile.in (SOURCES): Add it to the list. + * utils.h: Declare octave_usleep here. + * dirfns.cc (Fls): Simply all octave_usleep. + * oct-procbuf.cc (octave_procbuf::open): Ditto. + * sysdep.cc (Fusleep): Ditto. + * toplev.cc (run_command_and_return_output): Ditto. + + 1999-10-20 John W. Eaton + + * data.cc (make_diag (const octave_value&, const octave_value&)): + Delete special cases for scalars and simply attempt conversion of + first arg to a matrix value. If that fails, we will still see an + error message. + + 1999-10-18 John W. Eaton + + * help.cc (help_from_info): Print `unable to find info' message if + try_info returns 127; otherwise, print `not indexed' message. + Don't sleep after printing `not indexed' message. + + Thu Sep 23 19:49:36 1999 John W. Eaton + + * toplev.cc (Fsystem): For async case, use execl instead of + system, avoiding the need to exit after executing the subprocess. + + Thu Sep 9 17:09:23 1999 John W. Eaton + + * oct-stream.cc (get_size): Allow zero values. + (get_size) New arg, one_elt_size_spec. + (do_scanf_conv): New arg, `conv_count'. Change instantiation + requests and all callers. + (octave_base_stream::do_scanf): Improve scanning of strings. + (octave_base_stream::do_oscanf): Remove size limit on %s conversions. + + * oct-stream.cc (scanf_format_list::all_character_conversions): + Don't count %p as a character conversion. + + Tue Sep 7 08:31:04 1999 John W. Eaton + + * input.cc: Deal with bad readline prototypes (they need to + have some const qualifiers added in the appropriate places). + + * pr-output.cc (set_real_matrix_format, set_complex_matrix_format): + Move check for fixed_point_format ahead of check for + int_or_inf_or_nan. + + Thu Sep 2 11:54:51 1999 John W. Eaton + + * oct-obj.cc (make_argv): Correctly handle empty strings as args. + + Fri Aug 20 08:17:52 1999 John W. Eaton + + * unwind-prot.cc (saved_variable::~saved_variable): Don't try to + delete gen_ptr_value here. + + Mon Aug 16 21:34:33 1999 John W. Eaton + + * lex.l (next_token_is_sep_op): New function. + (handle_close_brace, maybe_unput_comma): Use it. + (have_continuation): Also handle CRLF here. + + Wed Aug 11 16:06:57 1999 John W. Eaton + + * file-io.cc (Ffopen): Make fopen ("filename") work and imply that + MODE = "r". + + Tue Jul 13 14:34:57 1999 John W. Eaton + + * sighandlers.cc (sigchld_handler): Only wait for processes in + octave_child_list. + * toplev.cc (cmd_status): Delete unused static variable. + (cmd_death_handler): Delete unused function. + (run_command_and_return_output): Don't add cmd_death_handler to + octave_child_list. Simply extract command exit status from + calling close() on the procstream object. + + Sun Jun 20 23:04:00 1999 John W. Eaton + + * sysdep.cc: Include sys/ioctl.h if available. + + Sat Jun 19 12:07:16 1999 John W. Eaton + + * variables.cc (do_who): Make pattern and multiple non-option + arguments work. + + Fri May 28 11:02:37 1999 John W. Eaton + + * chol.cc (Fchol): If two output arguments, never produce error + message. + + Thu May 27 18:28:35 1999 John W. Eaton + + * chol.cc (Fchol): Also return info as second output value. + + * minmax.cc (max (const ComplexMatrix&, const ComplexMatrix&)): + Correct test for real columns only. + (min (const ComplexMatrix&, const ComplexMatrix&)): Likewise. + + Fri May 14 12:36:33 1999 John W. Eaton + + * oct-stream.cc (octave_base_stream::write): Force string data to + be converted to matrix before attempting to call Matrix::write. + + Fri Apr 23 11:39:19 1999 John W. Eaton + + * dassl.cc (Fdassl): Prevent recursive calls. + * fsolve.cc (Ffsolve): Likewise. + * lsode.cc (Flsode): Likewise. + * quad.cc (Fquad): Likewise. + + * lsode.cc (lsode_option_table): Correct number of values in + initialize for step limit. + Wed Apr 14 12:55:42 1999 John W. Eaton * Version 2.0.14 released. diff -cNr octave-2.0.14/src/Makefile.in octave-2.0.15/src/Makefile.in *** octave-2.0.14/src/Makefile.in Fri Mar 26 11:25:30 1999 --- octave-2.0.15/src/Makefile.in Wed Nov 3 22:18:25 1999 *************** *** 89,96 **** SLStack-sym.cc SLStack-tok.cc SLStack-ue.cc SLStack-ui.cc SOURCES := BaseSLList.cc DLList.cc Map.cc SLList.cc SLStack.cc \ ! Stack.cc data.cc defaults.cc dirfns.cc dynamic-ld.cc error.cc \ ! file-io.cc fn-cache.cc gripes.cc help.cc input.cc lex.l \ load-save.cc mappers.cc matherr.c oct-fstrm.cc oct-hist.cc \ oct-iostrm.cc oct-map.cc oct-obj.cc oct-prcstrm.cc \ oct-procbuf.cc oct-stdstrm.cc oct-stream.cc oct-strstrm.cc \ --- 89,96 ---- SLStack-sym.cc SLStack-tok.cc SLStack-ue.cc SLStack-ui.cc SOURCES := BaseSLList.cc DLList.cc Map.cc SLList.cc SLStack.cc \ ! Stack.cc cutils.c data.cc defaults.cc dirfns.cc dynamic-ld.cc \ ! error.cc file-io.cc fn-cache.cc gripes.cc help.cc input.cc lex.l \ load-save.cc mappers.cc matherr.c oct-fstrm.cc oct-hist.cc \ oct-iostrm.cc oct-map.cc oct-obj.cc oct-prcstrm.cc \ oct-procbuf.cc oct-stdstrm.cc oct-stream.cc oct-strstrm.cc \ *************** *** 315,326 **** distclean: clean rm -f Makefile octave .fname so_locations ! rm stamp-prereq .PHONY: distclean maintainer-clean: distclean rm -f tags TAGS y.tab.c y.tab.h y.output yy.lex.c lex.cc parse.cc ! rm -f oct-gperf.h stamp-prereq .PHONY: maintainer-clean dist: parse.cc lex.cc oct-gperf.h --- 315,326 ---- distclean: clean rm -f Makefile octave .fname so_locations ! rm stamp-prereq stamp-oct-links .PHONY: distclean maintainer-clean: distclean rm -f tags TAGS y.tab.c y.tab.h y.output yy.lex.c lex.cc parse.cc ! rm -f oct-gperf.h .PHONY: maintainer-clean dist: parse.cc lex.cc oct-gperf.h *************** *** 365,371 **** oct-gperf.h: octave.gperf @echo "making $@ from $<" ! @gperf -a -C -D -E -G -H octave_kw_hash -g -N octave_kw_lookup -p -t \ $< | sed 's,lookup\[,gperf_lookup[,' > $@.t @$(top_srcdir)/move-if-change $@.t $@ --- 365,372 ---- oct-gperf.h: octave.gperf @echo "making $@ from $<" ! @gperf -a -g -p -t -C -D -E -G -L ANSI-C \ ! -H octave_kw_hash -N octave_kw_lookup \ $< | sed 's,lookup\[,gperf_lookup[,' > $@.t @$(top_srcdir)/move-if-change $@.t $@ diff -cNr octave-2.0.14/src/chol.cc octave-2.0.15/src/chol.cc *** octave-2.0.14/src/chol.cc Sun Nov 3 02:22:49 1996 --- octave-2.0.15/src/chol.cc Fri May 28 11:03:59 1999 *************** *** 35,47 **** #include "utils.h" DEFUN_DLD (chol, args, nargout, ! "R = chol (X): cholesky factorization") { octave_value_list retval; int nargin = args.length (); ! if (nargin != 1 || nargout > 1) { print_usage ("chol"); return retval; --- 35,47 ---- #include "utils.h" DEFUN_DLD (chol, args, nargout, ! "[R, p] = chol (X): cholesky factorization") { octave_value_list retval; int nargin = args.length (); ! if (nargin != 1 || nargout > 2) { print_usage ("chol"); return retval; *************** *** 67,76 **** { int info; CHOL fact (m, info); ! if (info != 0) ! error ("chol: matrix not positive definite"); else ! retval = fact.chol_matrix (); } } else if (arg.is_complex_type ()) --- 67,79 ---- { int info; CHOL fact (m, info); ! if (nargout == 2 || info == 0) ! { ! retval(1) = (double) info; ! retval(0) = fact.chol_matrix (); ! } else ! error ("chol: matrix not positive definite"); } } else if (arg.is_complex_type ()) *************** *** 81,90 **** { int info; ComplexCHOL fact (m, info); ! if (info != 0) ! error ("chol: matrix not positive definite"); else ! retval = fact.chol_matrix (); } } else --- 84,96 ---- { int info; ComplexCHOL fact (m, info); ! if (nargout == 2 || info == 0) ! { ! retval(1) = (double) info; ! retval(0) = fact.chol_matrix (); ! } else ! error ("chol: matrix not positive definite"); } } else diff -cNr octave-2.0.14/src/cutils.c octave-2.0.15/src/cutils.c *** octave-2.0.14/src/cutils.c Wed Dec 31 18:00:00 1969 --- octave-2.0.15/src/cutils.c Fri Nov 12 09:47:58 1999 *************** *** 0 **** --- 1,99 ---- + /* + + Copyright (C) 1999 John W. Eaton + + This file is part of Octave. + + Octave is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by the + Free Software Foundation; either version 2, or (at your option) any + later version. + + Octave is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + for more details. + + You should have received a copy of the GNU General Public License + along with Octave; see the file COPYING. If not, write to the Free + Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + + */ + + #ifdef HAVE_CONFIG_H + #include + #endif + + #ifdef HAVE_UNISTD_H + #ifdef HAVE_SYS_TYPES_H + #include + #endif + #include + #endif + + #include "systime.h" + + #ifdef HAVE_POLL_H + #include + #elif HAVE_SYS_POLL_H + #include + #endif + + #include + + static void + do_octave_usleep (unsigned int useconds) + { + #if defined (HAVE_USLEEP) + + usleep (useconds); + + #elif defined (HAVE_SELECT) + + struct timeval delay; + + delay.tv_sec = 0; + delay.tv_usec = useconds; + + select (0, 0, 0, 0, &delay); + + #elif defined (HAVE_POLL) + + struct pollfd pfd; + int delay = useconds / 1000; + + if (delay > 0) + poll (&fd, 0, delay); + + #endif + } + + void + octave_usleep (unsigned int useconds) + { + unsigned int sec = useconds / 1000000; + unsigned int usec = useconds % 1000000; + + if (sec > 0) + sleep (sec); + + do_octave_usleep (usec); + } + + int + octave_strcasecmp (const char *s1, const char *s2) + { + return strcasecmp (s1, s2); + } + + int + octave_strncasecmp (const char *s1, const char *s2, size_t n) + { + return strncasecmp (s1, s2, n); + } + + /* + ;;; Local Variables: *** + ;;; mode: C++ *** + ;;; End: *** + */ diff -cNr octave-2.0.14/src/dassl.cc octave-2.0.15/src/dassl.cc *** octave-2.0.14/src/dassl.cc Wed Jan 28 00:44:18 1998 --- octave-2.0.15/src/dassl.cc Tue Oct 26 21:09:36 1999 *************** *** 37,42 **** --- 37,43 ---- #include "oct-obj.h" #include "pager.h" #include "pt-fvc.h" + #include "unwind-prot.h" #include "utils.h" #include "variables.h" *************** *** 45,50 **** --- 46,54 ---- static DASSL_options dassl_opts; + // Is this a recursive call? + static int call_depth = 0; + ColumnVector dassl_user_function (const ColumnVector& x, const ColumnVector& xdot, double t) { *************** *** 105,110 **** --- 109,138 ---- return retval; } + #define DASSL_ABORT() \ + do \ + { \ + run_unwind_frame ("Fdassl"); \ + return retval; \ + } \ + while (0) + + #define DASSL_ABORT1(msg) \ + do \ + { \ + ::error ("dassl: " ## msg); \ + DASSL_ABORT (); \ + } \ + while (0) + + #define DASSL_ABORT2(fmt, arg) \ + do \ + { \ + ::error ("dassl: " ## fmt, arg); \ + DASSL_ABORT (); \ + } \ + while (0) + DEFUN_DLD (dassl, args, , "dassl (\"function_name\", x_0, xdot_0, t_out)\n\ dassl (F, X_0, XDOT_0, T_OUT, T_CRIT)\n\ *************** *** 118,201 **** { octave_value_list retval; ! int nargin = args.length (); ! if (nargin < 4 || nargin > 5) ! { ! print_usage ("dassl"); ! return retval; ! } ! dassl_fcn = is_valid_function (args(0), "dassl", 1); ! if (! dassl_fcn) ! return retval; ! ColumnVector state = args(1).vector_value (); ! if (error_state) { ! error ("dassl: expecting state vector as second argument"); ! return retval; ! } ! ColumnVector deriv = args(2).vector_value (); ! if (error_state) ! { ! error ("dassl: expecting derivative vector as third argument"); ! return retval; ! } ! ColumnVector out_times = args(3).vector_value (); ! if (error_state) ! { ! error ("dassl: expecting output time vector as fourth argument"); ! return retval; ! } ! ColumnVector crit_times; ! int crit_times_set = 0; ! if (nargin > 4) ! { ! crit_times = args(4).vector_value (); if (error_state) { ! error ("dassl: expecting critical time vector as fifth argument"); ! return retval; ! } ! crit_times_set = 1; ! } ! if (state.capacity () != deriv.capacity ()) ! { ! error ("dassl: x and xdot must have the same size"); ! return retval; ! } ! double tzero = out_times (0); ! DAEFunc func (dassl_user_function); ! DASSL dae (state, deriv, tzero, func); ! dae.copy (dassl_opts); ! Matrix output; ! Matrix deriv_output; ! if (crit_times_set) ! output = dae.integrate (out_times, deriv_output, crit_times); ! else ! output = dae.integrate (out_times, deriv_output); ! if (! error_state) ! { ! retval.resize (2); ! retval(0) = output; ! retval(1) = deriv_output; } return retval; } --- 146,224 ---- { octave_value_list retval; ! begin_unwind_frame ("Fdassl"); ! unwind_protect_int (call_depth); ! call_depth++; ! if (call_depth > 1) ! DASSL_ABORT1 ("invalid recursive call"); ! int nargin = args.length (); ! if (nargin > 3 && nargin < 6) { ! dassl_fcn = is_valid_function (args(0), "dassl", 1); ! if (! dassl_fcn) ! DASSL_ABORT (); ! ColumnVector state = args(1).vector_value (); ! if (error_state) ! DASSL_ABORT1 ("expecting state vector as second argument"); ! ColumnVector deriv = args(2).vector_value (); ! if (error_state) ! DASSL_ABORT1 ("expecting derivative vector as third argument"); ! ! ColumnVector out_times = args(3).vector_value (); if (error_state) + DASSL_ABORT1 ("expecting output time vector as fourth argument"); + + ColumnVector crit_times; + int crit_times_set = 0; + if (nargin > 4) { ! crit_times = args(4).vector_value (); ! if (error_state) ! DASSL_ABORT1 ("expecting critical time vector as fifth argument"); ! crit_times_set = 1; ! } ! if (state.capacity () != deriv.capacity ()) ! DASSL_ABORT1 ("x and xdot must have the same size"); ! double tzero = out_times (0); ! DAEFunc func (dassl_user_function); ! DASSL dae (state, deriv, tzero, func); ! dae.copy (dassl_opts); ! Matrix output; ! Matrix deriv_output; ! if (crit_times_set) ! output = dae.integrate (out_times, deriv_output, crit_times); ! else ! output = dae.integrate (out_times, deriv_output); ! ! if (! error_state) ! { ! retval.resize (2); ! retval(0) = output; ! retval(1) = deriv_output; ! } } + else + print_usage ("dassl"); + + run_unwind_frame ("Fdassl"); return retval; } diff -cNr octave-2.0.14/src/data.cc octave-2.0.15/src/data.cc *** octave-2.0.14/src/data.cc Thu Mar 18 12:08:53 1999 --- octave-2.0.15/src/data.cc Wed Oct 20 22:02:46 1999 *************** *** 463,495 **** } int k = NINT (tmp); - int n = ABS (k) + 1; if (a.is_real_type ()) { ! if (a.is_scalar_type ()) ! { ! double d = a.double_value (); ! if (k == 0) ! retval = d; ! else if (k > 0) ! { ! Matrix m (n, n, 0.0); ! m (0, k) = d; ! retval = m; ! } ! else if (k < 0) ! { ! Matrix m (n, n, 0.0); ! m (-k, 0) = d; ! retval = m; ! } ! } ! else if (a.is_matrix_type ()) { - Matrix m = a.matrix_value (); - int nr = m.rows (); int nc = m.columns (); --- 463,475 ---- } int k = NINT (tmp); if (a.is_real_type ()) { ! Matrix m = a.matrix_value (); ! if (! error_state) { int nr = m.rows (); int nc = m.columns (); *************** *** 503,536 **** retval = d; } } - else - gripe_wrong_type_arg ("diag", a); } else if (a.is_complex_type ()) { ! if (a.is_scalar_type ()) ! { ! Complex c = a.complex_value (); ! if (k == 0) ! retval = c; ! else if (k > 0) ! { ! ComplexMatrix m (n, n, 0.0); ! m (0, k) = c; ! retval = m; ! } ! else if (k < 0) ! { ! ComplexMatrix m (n, n, 0.0); ! m (-k, 0) = c; ! retval = m; ! } ! } ! else if (a.is_matrix_type ()) { - ComplexMatrix cm = a.complex_matrix_value (); - int nr = cm.rows (); int nc = cm.columns (); --- 483,495 ---- retval = d; } } } else if (a.is_complex_type ()) { ! ComplexMatrix cm = a.complex_matrix_value (); ! if (! error_state) { int nr = cm.rows (); int nc = cm.columns (); *************** *** 544,551 **** retval = d; } } - else - gripe_wrong_type_arg ("diag", a); } else gripe_wrong_type_arg ("diag", a); --- 503,508 ---- diff -cNr octave-2.0.14/src/dirfns.cc octave-2.0.15/src/dirfns.cc *** octave-2.0.14/src/dirfns.cc Thu Feb 5 23:45:27 1998 --- octave-2.0.15/src/dirfns.cc Thu Oct 21 02:02:49 1999 *************** *** 414,424 **** { cmd->clear (); ! #if defined (HAVE_USLEEP) ! usleep (100); ! #else ! sleep (1); ! #endif } while (cmd->get (ch)) --- 414,420 ---- { cmd->clear (); ! octave_usleep (100); } while (cmd->get (ch)) diff -cNr octave-2.0.14/src/file-io.cc octave-2.0.15/src/file-io.cc *** octave-2.0.14/src/file-io.cc Wed Apr 14 12:45:01 1999 --- octave-2.0.15/src/file-io.cc Mon Aug 16 21:28:46 1999 *************** *** 328,334 **** } DEFUN (fopen, args, , ! "[FILENUM, ERRMSG] = fopen (FILENAME, MODE [, ARCH]): open a file\n\ \n\ FILENAME is a string specifying the name of the file.\n\ \n\ --- 328,334 ---- } DEFUN (fopen, args, , ! "[FILENUM, ERRMSG] = fopen (FILENAME [, MODE [, ARCH]]): open a file\n\ \n\ FILENAME is a string specifying the name of the file.\n\ \n\ *************** *** 344,349 **** --- 344,351 ---- \n\ Update mode permits reading from and writing to the same file.\n\ \n\ + If MODE is missing, a value of \"r\" is assumed.\n\ + \n\ ARCH is a string specifying the default data format for the file.\n\ Valid values for ARCH are:\n\ \n\ *************** *** 370,377 **** if (nargin == 1) { ! if (args(0).is_string () && args(0).string_value () == "all") ! retval(0) = octave_stream_list::open_file_numbers (); else { string_vector tmp = octave_stream_list::get_info (args(0)); --- 372,387 ---- if (nargin == 1) { ! if (args(0).is_string ()) ! { ! // If there is only one argument and it is a string but it ! // is not the string "all", we assume it is a file to open ! // with MODE = "r". To open a file called "all", you have ! // to supply more than one argument. ! ! if (args(0).string_value () == "all") ! return octave_stream_list::open_file_numbers (); ! } else { string_vector tmp = octave_stream_list::get_info (args(0)); *************** *** 382,390 **** retval(1) = tmp(1); retval(0) = tmp(0); } - } ! return retval; } if (nargin > 0 && nargin < 4) --- 392,400 ---- retval(1) = tmp(1); retval(0) = tmp(0); } ! return retval; ! } } if (nargin > 0 && nargin < 4) *************** *** 949,962 **** values are\n\ \n\ native -- the format of the current machine (default)\n\ ! ieee-le -- IEEE big endian\n\ ! ieee-be -- IEEE little endian\n\ vaxd -- VAX D floating format\n\ vaxg -- VAX G floating format\n\ cray -- Cray floating format\n\ \n\ however, conversions are currently only supported for\n\ ! ieee-be, and ieee-le formats.\n\ \n\ \n\ DATA : matrix in which the data is stored\n\ --- 959,972 ---- values are\n\ \n\ native -- the format of the current machine (default)\n\ ! ieee-be -- IEEE big endian\n\ ! ieee-le -- IEEE little endian\n\ vaxd -- VAX D floating format\n\ vaxg -- VAX G floating format\n\ cray -- Cray floating format\n\ \n\ however, conversions are currently only supported for\n\ ! ieee-be and ieee-le formats.\n\ \n\ \n\ DATA : matrix in which the data is stored\n\ diff -cNr octave-2.0.14/src/fsolve.cc octave-2.0.15/src/fsolve.cc *** octave-2.0.14/src/fsolve.cc Tue Apr 14 17:15:08 1998 --- octave-2.0.15/src/fsolve.cc Tue Oct 26 21:09:34 1999 *************** *** 37,42 **** --- 37,43 ---- #include "pager.h" #include "pt-fvc.h" #include "oct-obj.h" + #include "unwind-prot.h" #include "utils.h" #include "variables.h" *************** *** 45,50 **** --- 46,54 ---- static NLEqn_options fsolve_opts; + // Is this a recursive call? + static int call_depth = 0; + int hybrd_info_to_fsolve_info (int info) { *************** *** 121,126 **** --- 125,154 ---- return retval; } + #define FSOLVE_ABORT() \ + do \ + { \ + run_unwind_frame ("Ffsolve"); \ + return retval; \ + } \ + while (0) + + #define FSOLVE_ABORT1(msg) \ + do \ + { \ + ::error ("fsolve: " ## msg); \ + FSOLVE_ABORT (); \ + } \ + while (0) + + #define FSOLVE_ABORT2(fmt, arg) \ + do \ + { \ + ::error ("fsolve: " ## fmt, arg); \ + FSOLVE_ABORT (); \ + } \ + while (0) + DEFUN_DLD (fsolve, args, nargout, "Solve nonlinear equations using Minpack. Usage:\n\ \n\ *************** *** 135,180 **** { octave_value_list retval; int nargin = args.length (); ! if (nargin != 2 || nargout > 3) { ! print_usage ("fsolve"); ! return retval; ! } ! fsolve_fcn = is_valid_function (args(0), "fsolve", 1); ! if (! fsolve_fcn) ! return retval; ! ColumnVector x = args(1).vector_value (); ! if (error_state) ! { ! error ("fsolve: expecting vector as second argument"); ! return retval; ! } ! if (nargin > 2) ! warning ("fsolve: ignoring extra arguments"); ! if (nargout > 2) ! warning ("fsolve: can't compute path output yet"); ! NLFunc foo_fcn (fsolve_user_function); ! NLEqn foo (x, foo_fcn); ! foo.set_options (fsolve_opts); ! int info; ! ColumnVector soln = foo.solve (info); ! info = hybrd_info_to_fsolve_info (info); ! retval.resize (nargout ? nargout : 1); ! retval(0) = soln, 1; ! if (nargout > 1) ! retval(1) = (double) info; return retval; } --- 163,215 ---- { octave_value_list retval; + begin_unwind_frame ("Ffsolve"); + + unwind_protect_int (call_depth); + call_depth++; + + if (call_depth > 1) + FSOLVE_ABORT1 ("invalid recursive call"); + int nargin = args.length (); ! if (nargin == 2 && nargout < 4) { ! fsolve_fcn = is_valid_function (args(0), "fsolve", 1); ! if (! fsolve_fcn) ! FSOLVE_ABORT (); ! ColumnVector x = args(1).vector_value (); ! if (error_state) ! FSOLVE_ABORT1 ("expecting vector as second argument"); ! ! if (nargin > 2) ! warning ("fsolve: ignoring extra arguments"); ! if (nargout > 2) ! warning ("fsolve: can't compute path output yet"); ! NLFunc foo_fcn (fsolve_user_function); ! NLEqn foo (x, foo_fcn); ! foo.set_options (fsolve_opts); ! int info; ! ColumnVector soln = foo.solve (info); ! info = hybrd_info_to_fsolve_info (info); ! retval.resize (nargout ? nargout : 1); ! retval(0) = soln, 1; ! if (nargout > 1) ! retval(1) = (double) info; ! } ! else ! print_usage ("fsolve"); ! run_unwind_frame ("Ffsolve"); return retval; } diff -cNr octave-2.0.14/src/help.cc octave-2.0.15/src/help.cc *** octave-2.0.14/src/help.cc Fri Oct 23 22:58:28 1998 --- octave-2.0.15/src/help.cc Mon Oct 18 17:23:40 1999 *************** *** 578,596 **** if (status) { ! if (status < 0) ! { ! message ("help", ! "sorry, `%s' is not indexed in the manual", ! argv[i].c_str ()); ! sleep (2); ! } ! else { error ("help: unable to find info"); error ("help: you need info 2.18 or later (texinfo 3.12)"); break; } } } } --- 578,595 ---- if (status) { ! if (status == 127) { error ("help: unable to find info"); error ("help: you need info 2.18 or later (texinfo 3.12)"); break; } + else + { + message ("help", + "sorry, `%s' is not indexed in the manual", + argv[i].c_str ()); + } } } } *************** *** 688,694 **** } else { ! if (argv[1] == "-i") { help_from_info (argv, 2, argc); } --- 687,693 ---- } else { ! if (argv[1].length () > 0 && argv[1] == "-i") { help_from_info (argv, 2, argc); } diff -cNr octave-2.0.14/src/input.cc octave-2.0.15/src/input.cc *** octave-2.0.14/src/input.cc Mon Nov 23 09:53:56 1998 --- octave-2.0.15/src/input.cc Thu Nov 4 11:21:14 1999 *************** *** 134,139 **** --- 134,143 ---- // TRUE after a call to completion_matches(). bool octave_completion_matches_called = false; + // Nonzero means readline has been initialized. + bool octave_initialized_readline = false; + + // Return the octal number parsed from STRING, or -1 to indicate that // the string contained a bad number. *************** *** 423,429 **** if (using_readline || force_readline) { ! char *tmp = retval = ::readline (s); if (tmp && strlen (tmp) == 0) { --- 427,437 ---- if (using_readline || force_readline) { ! char *FIX_READLINE_PROTOS = strdup (s); ! ! char *tmp = retval = ::readline (FIX_READLINE_PROTOS); ! ! free (FIX_READLINE_PROTOS); if (tmp && strlen (tmp) == 0) { *************** *** 923,929 **** command_completer (char *text, int /* start */, int /* end */) { char **matches = 0; ! matches = completion_matches (text, command_generator); return matches; } --- 931,939 ---- command_completer (char *text, int /* start */, int /* end */) { char **matches = 0; ! ! matches = completion_matches (text, (CPFunction *) command_generator); ! return matches; } *************** *** 976,982 **** // Accept the current line. ! rl_newline (); // Find the current line, and find the next line to use. --- 986,992 ---- // Accept the current line. ! rl_newline (0, 0); // Find the current line, and find the next line to use. *************** *** 1034,1039 **** --- 1044,1051 ---- tilde_additional_prefixes = octave_default_prefixes; tilde_additional_suffixes = octave_default_suffixes; + + octave_initialized_readline = true; } static int *************** *** 1373,1385 **** int nargin = args.length (); if (nargin == 0) ! rl_re_read_init_file (); else if (nargin == 1) { string file = oct_tilde_expand (args(0).string_value ()); if (! error_state) ! rl_read_init_file (file.c_str ()); } else print_usage ("read_readline_init_file"); --- 1385,1403 ---- int nargin = args.length (); if (nargin == 0) ! rl_re_read_init_file (0, 0); else if (nargin == 1) { string file = oct_tilde_expand (args(0).string_value ()); if (! error_state) ! { ! char *FIX_READLINE_PROTOS = strdup (file.c_str ()); ! ! rl_read_init_file (FIX_READLINE_PROTOS); ! ! free (FIX_READLINE_PROTOS); ! } } else print_usage ("read_readline_init_file"); diff -cNr octave-2.0.14/src/input.h octave-2.0.15/src/input.h *** octave-2.0.14/src/input.h Wed May 13 22:13:43 1998 --- octave-2.0.15/src/input.h Thu Nov 4 11:20:14 1999 *************** *** 70,75 **** --- 70,78 ---- // TRUE after a call to completion_matches(). extern bool octave_completion_matches_called; + // TRUE if readline has been initialized. + extern bool octave_initialized_readline; + char *gnu_readline (const char *s, bool force_readline = false); extern string Vps4; diff -cNr octave-2.0.14/src/lex.l octave-2.0.15/src/lex.l *** octave-2.0.14/src/lex.l Wed Mar 3 11:54:44 1999 --- octave-2.0.15/src/lex.l Tue Nov 2 00:36:16 1999 *************** *** 173,178 **** --- 173,179 ---- static symbol_record *lookup_identifier (const string& s); static void grab_help_text (void); static int match_any (char c, char *s); + static int next_token_is_sep_op (void); static int next_token_is_bin_op (int spc_prev, char *yytext); static int next_token_is_postfix_unary_op (int spc_prev, char *yytext); static string strip_trailing_whitespace (char *s); *************** *** 722,728 **** #ifdef yywrap #undef yywrap #endif ! static int yywrap (void) { return 1; --- 723,729 ---- #ifdef yywrap #undef yywrap #endif ! int yywrap (void) { return 1; *************** *** 1178,1183 **** --- 1179,1215 ---- return ((spc_prev && spc_next) || ! spc_prev); } + // Recognize separators. If the separator is a CRLF pair, it is + // replaced by a single LF. + + static int + next_token_is_sep_op (void) + { + int retval = 0; + + int c1 = yyinput (); + + if (c1 == '\r') + { + int c2 = yyinput (); + + if (c2 == '\n') + { + c1 = '\n'; + + retval = true; + } + else + unput (c2); + } + else + retval = match_any (c1, ",;\n]"); + + unput (c1); + + return retval; + } + // Try to determine if the next token should be treated as a postfix // unary operator. This is ugly, but it seems to do the right thing. *************** *** 1425,1431 **** ostrstream buf; int in_comment = 0; ! char c; while ((c = yyinput ()) != EOF) { buf << (char) c; --- 1457,1463 ---- ostrstream buf; int in_comment = 0; ! int c; while ((c = yyinput ()) != EOF) { buf << (char) c; *************** *** 1449,1454 **** --- 1481,1497 ---- promptflag--; return 1; + case '\r': + c = yyinput (); + if (c == EOF) + break; + else if (c == '\n') + { + current_input_column = 0; + promptflag--; + return 1; + } + default: if (! in_comment) goto cleanup; *************** *** 1637,1648 **** if (lexer_flags.braceflag && Vwhitespace_in_literal_matrix != 2) { int bin_op = next_token_is_bin_op (spc_gobbled, yytext); int postfix_un_op = next_token_is_postfix_unary_op (spc_gobbled, yytext); ! int other_op = match_any (c1, ",;\n]"); ! if (! (postfix_un_op || bin_op || other_op) && nesting_level.is_brace () && lexer_flags.convert_spaces_to_comma) { --- 1680,1692 ---- if (lexer_flags.braceflag && Vwhitespace_in_literal_matrix != 2) { int bin_op = next_token_is_bin_op (spc_gobbled, yytext); + int postfix_un_op = next_token_is_postfix_unary_op (spc_gobbled, yytext); ! int sep_op = next_token_is_sep_op (); ! if (! (postfix_un_op || bin_op || sep_op) && nesting_level.is_brace () && lexer_flags.convert_spaces_to_comma) { *************** *** 1671,1681 **** int c1 = yyinput (); int c2 = yyinput (); unput (c2); unput (c1); ! int sep_op = match_any (c1, ",;\n]"); int dot_op = (c1 == '.' && (isalpha (c2) || isspace (c2) || c2 == '_')); int index_op = (c1 == '(' && (Vwhitespace_in_literal_matrix == 0 || ! spc_gobbled)); --- 1715,1729 ---- int c1 = yyinput (); int c2 = yyinput (); + unput (c2); unput (c1); ! ! int sep_op = next_token_is_sep_op (); ! int dot_op = (c1 == '.' && (isalpha (c2) || isspace (c2) || c2 == '_')); + int index_op = (c1 == '(' && (Vwhitespace_in_literal_matrix == 0 || ! spc_gobbled)); diff -cNr octave-2.0.14/src/load-save.cc octave-2.0.15/src/load-save.cc *** octave-2.0.14/src/load-save.cc Fri Jan 22 21:41:57 1999 --- octave-2.0.15/src/load-save.cc Tue Oct 26 19:46:23 1999 *************** *** 1071,1085 **** for (int j = 0; j < nc; j++) { tmp_stream >> d; ! if (is) tmp.elem (i, j) = d; else ! goto done; } } } - - done: if (is) { --- 1071,1089 ---- for (int j = 0; j < nc; j++) { tmp_stream >> d; ! ! if (tmp_stream) tmp.elem (i, j) = d; else ! { ! error ("load: failed to read matrix from file `%s'", ! filename.c_str ()); ! ! return retval; ! } } } } if (is) { diff -cNr octave-2.0.14/src/lsode.cc octave-2.0.15/src/lsode.cc *** octave-2.0.14/src/lsode.cc Thu Oct 8 22:29:11 1998 --- octave-2.0.15/src/lsode.cc Tue Oct 26 21:09:22 1999 *************** *** 37,42 **** --- 37,43 ---- #include "oct-obj.h" #include "pager.h" #include "pt-fvc.h" + #include "unwind-prot.h" #include "utils.h" #include "variables.h" *************** *** 45,50 **** --- 46,54 ---- static LSODE_options lsode_opts; + // Is this a recursive call? + static int call_depth = 0; + ColumnVector lsode_user_function (const ColumnVector& x, double t) { *************** *** 94,99 **** --- 98,127 ---- return retval; } + #define LSODE_ABORT() \ + do \ + { \ + run_unwind_frame ("Flsode"); \ + return retval; \ + } \ + while (0) + + #define LSODE_ABORT1(msg) \ + do \ + { \ + ::error ("lsode: " ## msg); \ + LSODE_ABORT (); \ + } \ + while (0) + + #define LSODE_ABORT2(fmt, arg) \ + do \ + { \ + ::error ("lsode: " ## fmt, arg); \ + LSODE_ABORT (); \ + } \ + while (0) + DEFUN_DLD (lsode, args, nargout, "lsode (F, X0, T_OUT, T_CRIT)\n\ \n\ *************** *** 106,175 **** { octave_value_list retval; ! int nargin = args.length (); ! if (nargin < 3 || nargin > 4 || nargout > 1) ! { ! print_usage ("lsode"); ! return retval; ! } ! lsode_fcn = is_valid_function (args(0), "lsode", 1); ! if (! lsode_fcn) ! return retval; ! ColumnVector state = args(1).vector_value (); ! if (error_state) { ! error ("lsode: expecting state vector as second argument"); ! return retval; ! } ! ColumnVector out_times = args(2).vector_value (); ! if (error_state) ! { ! error ("lsode: expecting output time vector as third argument"); ! return retval; ! } ! ColumnVector crit_times; ! int crit_times_set = 0; ! if (nargin > 3) ! { ! crit_times = args(3).vector_value (); if (error_state) { ! error ("lsode: expecting critical time vector as fourth argument"); ! return retval; } ! crit_times_set = 1; ! } ! double tzero = out_times (0); ! int nsteps = out_times.capacity (); ! ODEFunc func (lsode_user_function); ! LSODE ode (state, tzero, func); ! ode.copy (lsode_opts); ! int nstates = state.capacity (); ! Matrix output (nsteps, nstates + 1); ! if (crit_times_set) ! output = ode.integrate (out_times, crit_times); else ! output = ode.integrate (out_times); ! if (! error_state) ! { ! retval.resize (1); ! retval(0) = output; ! } return retval; } --- 134,204 ---- { octave_value_list retval; ! begin_unwind_frame ("Flsode"); ! unwind_protect_int (call_depth); ! call_depth++; ! if (call_depth > 1) ! LSODE_ABORT1 ("invalid recursive call"); ! int nargin = args.length (); ! if ((nargin == 3 || nargin == 4) && nargout < 2) { ! lsode_fcn = is_valid_function (args(0), "lsode", 1); ! if (! lsode_fcn) ! LSODE_ABORT (); ! ColumnVector state = args(1).vector_value (); ! if (error_state) ! LSODE_ABORT1 ("expecting state vector as second argument"); ! ColumnVector out_times = args(2).vector_value (); if (error_state) + LSODE_ABORT1 ("expecting output time vector as third argument"); + + ColumnVector crit_times; + + int crit_times_set = 0; + if (nargin > 3) { ! crit_times = args(3).vector_value (); ! ! if (error_state) ! LSODE_ABORT1 ("expecting critical time vector as fourth argument"); ! ! crit_times_set = 1; } ! double tzero = out_times (0); ! int nsteps = out_times.capacity (); ! ODEFunc func (lsode_user_function); ! LSODE ode (state, tzero, func); ! ode.copy (lsode_opts); ! int nstates = state.capacity (); ! Matrix output (nsteps, nstates + 1); ! if (crit_times_set) ! output = ode.integrate (out_times, crit_times); ! else ! output = ode.integrate (out_times); ! if (! error_state) ! { ! retval.resize (1); ! retval(0) = output; ! } ! } else ! print_usage ("lsode"); ! run_unwind_frame ("Flsode"); return retval; } *************** *** 227,233 **** { "step limit", { "step", "limit", 0, }, ! { 1, 0, 0, }, 1, 0, &LSODE_options::set_step_limit, 0, &LSODE_options::step_limit, }, --- 256,262 ---- { "step limit", { "step", "limit", 0, }, ! { 1, 0, 0, 0, }, 1, 0, &LSODE_options::set_step_limit, 0, &LSODE_options::step_limit, }, diff -cNr octave-2.0.14/src/minmax.cc octave-2.0.15/src/minmax.cc *** octave-2.0.14/src/minmax.cc Sun Nov 3 02:22:47 1996 --- octave-2.0.15/src/minmax.cc Tue Oct 26 21:09:20 1999 *************** *** 169,175 **** { int columns_are_real_only = 1; for (int i = 0; i < nr; i++) ! if (imag (a (i, j)) != 0.0 && imag (b (i, j)) != 0.0) { columns_are_real_only = 0; break; --- 169,175 ---- { int columns_are_real_only = 1; for (int i = 0; i < nr; i++) ! if (imag (a (i, j)) != 0.0 || imag (b (i, j)) != 0.0) { columns_are_real_only = 0; break; *************** *** 327,333 **** { int columns_are_real_only = 1; for (int i = 0; i < nr; i++) ! if (imag (a (i, j)) != 0.0 && imag (b (i, j)) != 0.0) { columns_are_real_only = 0; break; --- 327,333 ---- { int columns_are_real_only = 1; for (int i = 0; i < nr; i++) ! if (imag (a (i, j)) != 0.0 || imag (b (i, j)) != 0.0) { columns_are_real_only = 0; break; diff -cNr octave-2.0.14/src/oct-gperf.h octave-2.0.15/src/oct-gperf.h *** octave-2.0.14/src/oct-gperf.h Wed Apr 14 12:58:25 1999 --- octave-2.0.15/src/oct-gperf.h Mon Jan 10 21:26:38 2000 *************** *** 1,5 **** ! /* C code produced by gperf version 2.5 (GNU C++ version) */ ! /* Command-line: gperf -a -C -D -E -G -H octave_kw_hash -g -N octave_kw_lookup -p -t octave.gperf */ enum octave_kw_id { --- 1,5 ---- ! /* ANSI-C code produced by gperf version 2.7 */ ! /* Command-line: gperf -a -g -p -t -C -D -E -G -L ANSI-C -H octave_kw_hash -N octave_kw_lookup octave.gperf */ enum octave_kw_id { *************** *** 37,128 **** }; struct octave_kw { char *name; int tok; octave_kw_id kw_id; }; /* maximum key range = 48, duplicates = 1 */ #ifdef __GNUC__ ! inline #endif static unsigned int ! octave_kw_hash (register const char *str, register int len) { static const unsigned char asso_values[] = { ! 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, ! 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, ! 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, ! 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, ! 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, ! 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, ! 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, ! 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, ! 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, ! 50, 50, 50, 50, 50, 5, 50, 20, 5, 15, ! 0, 0, 0, 15, 15, 0, 50, 0, 5, 50, ! 28, 0, 0, 50, 10, 0, 25, 10, 50, 10, ! 50, 5, 50, 50, 50, 50, 50, 50, }; ! return len + asso_values[str[len - 1]] + asso_values[str[0]]; } static const struct octave_kw wordlist[] = ! { ! {"",}, {"",}, ! {"if", IF, if_kw}, ! {"end", END, end_kw}, ! {"else", ELSE, else_kw}, ! {"endif", END, endif_kw}, ! {"elseif", ELSEIF, elseif_kw}, ! {"endwhile", END, endwhile_kw}, ! {"otherwise", OTHERWISE, otherwise_kw}, ! {"break", BREAK, break_kw}, ! {"for", FOR, for_kw}, ! {"while", WHILE, while_kw}, ! {"endfor", END, endfor_kw}, ! {"__FILE__", TEXT, magic_file_kw}, ! {"__LINE__", NUM, magic_line_kw}, ! {"case", CASE, case_kw}, ! {"switch", SWITCH, switch_kw}, ! {"continue", CONTINUE, continue_kw}, ! {"endswitch", END, endswitch_kw}, ! {"global", GLOBAL, global_kw}, ! {"end_try_catch", END, end_try_catch_kw}, ! {"all_va_args", ALL_VA_ARGS, all_va_args_kw}, ! {"unwind_protect_cleanup", CLEANUP, unwind_protect_cleanup_kw}, ! {"try", TRY, try_kw}, ! {"catch", CATCH, catch_kw}, ! {"function", FCN, function_kw}, ! {"endfunction", END, endfunction_kw}, ! {"replot", PLOT, replot_kw}, ! {"end_unwind_protect", END, end_unwind_protect_kw}, ! {"return", FUNC_RET, return_kw}, ! {"gplot", PLOT, gplot_kw}, ! {"gsplot", PLOT, gsplot_kw}, ! {"unwind_protect", UNWIND, unwind_protect_kw}, ! }; ! ! static const char gperf_lookup[] = ! { ! -1, -1, 2, 3, 4, 5, 6, -1, 7, 8, 9, -1, -1, 10, ! -1, 11, 12, -1, 60, 15, -1, 16, -1, 17, 18, -1, 19, -1, ! 20,-13, -2, 21, 22, 23, -1, 24, 25, -1, -1, 26, -1, 27, ! -1, 28, 29, 30, 31, -1, -1, 32, ! }; #ifdef __GNUC__ ! inline #endif const struct octave_kw * ! octave_kw_lookup (register const char *str, register int len) { - enum - { - TOTAL_KEYWORDS = 31, - MIN_WORD_LENGTH = 2, - MAX_WORD_LENGTH = 22, - MIN_HASH_VALUE = 2, - MAX_HASH_VALUE = 49, - }; - if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH) { register int key = octave_kw_hash (str, len); --- 37,141 ---- }; struct octave_kw { char *name; int tok; octave_kw_id kw_id; }; + enum + { + TOTAL_KEYWORDS = 31, + MIN_WORD_LENGTH = 2, + MAX_WORD_LENGTH = 22, + MIN_HASH_VALUE = 2, + MAX_HASH_VALUE = 49 + }; + /* maximum key range = 48, duplicates = 1 */ #ifdef __GNUC__ ! __inline #endif static unsigned int ! octave_kw_hash (register const char *str, register unsigned int len) { static const unsigned char asso_values[] = { ! 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, ! 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, ! 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, ! 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, ! 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, ! 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, ! 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, ! 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, ! 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, ! 50, 50, 50, 50, 50, 5, 50, 20, 5, 15, ! 0, 0, 0, 15, 15, 0, 50, 0, 5, 50, ! 28, 0, 0, 50, 10, 0, 25, 10, 50, 10, ! 50, 5, 50, 50, 50, 50, 50, 50, 50, 50, ! 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, ! 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, ! 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, ! 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, ! 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, ! 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, ! 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, ! 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, ! 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, ! 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, ! 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, ! 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, ! 50, 50, 50, 50, 50, 50 }; ! return len + asso_values[(unsigned char)str[len - 1]] + asso_values[(unsigned char)str[0]]; } static const struct octave_kw wordlist[] = ! { ! {"if", IF, if_kw}, ! {"end", END, end_kw}, ! {"else", ELSE, else_kw}, ! {"endif", END, endif_kw}, ! {"elseif", ELSEIF, elseif_kw}, ! {"endwhile", END, endwhile_kw}, ! {"otherwise", OTHERWISE, otherwise_kw}, ! {"break", BREAK, break_kw}, ! {"for", FOR, for_kw}, ! {"while", WHILE, while_kw}, ! {"endfor", END, endfor_kw}, ! {"__FILE__", TEXT, magic_file_kw}, ! {"__LINE__", NUM, magic_line_kw}, ! {"case", CASE, case_kw}, ! {"switch", SWITCH, switch_kw}, ! {"continue", CONTINUE, continue_kw}, ! {"endswitch", END, endswitch_kw}, ! {"global", GLOBAL, global_kw}, ! {"end_try_catch", END, end_try_catch_kw}, ! {"all_va_args", ALL_VA_ARGS, all_va_args_kw}, ! {"unwind_protect_cleanup", CLEANUP, unwind_protect_cleanup_kw}, ! {"try", TRY, try_kw}, ! {"catch", CATCH, catch_kw}, ! {"function", FCN, function_kw}, ! {"endfunction", END, endfunction_kw}, ! {"replot", PLOT, replot_kw}, ! {"end_unwind_protect", END, end_unwind_protect_kw}, ! {"return", FUNC_RET, return_kw}, ! {"gplot", PLOT, gplot_kw}, ! {"gsplot", PLOT, gsplot_kw}, ! {"unwind_protect", UNWIND, unwind_protect_kw} ! }; ! ! static const signed char gperf_lookup[] = ! { ! -1, -1, 0, 1, 2, 3, 4, -1, 5, 6, ! 7, -1, -1, 8, -1, 9, 10, -1, -61, 13, ! -1, 14, -1, 15, 16, -1, 17, -1, 18, -20, ! -2, 19, 20, 21, -1, 22, 23, -1, -1, 24, ! -1, 25, -1, 26, 27, 28, 29, -1, -1, 30 ! }; #ifdef __GNUC__ ! __inline #endif const struct octave_kw * ! octave_kw_lookup (register const char *str, register unsigned int len) { if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH) { register int key = octave_kw_hash (str, len); *************** *** 131,154 **** { register int index = gperf_lookup[key]; ! if (index >= 0 && index < MAX_HASH_VALUE) { register const char *s = wordlist[index].name; ! if (*s == *str && !strcmp (str + 1, s + 1)) return &wordlist[index]; } ! else if (index < 0 && index >= -MAX_HASH_VALUE) ! return 0; ! else { ! register int offset = key + index + (index > 0 ? -MAX_HASH_VALUE : MAX_HASH_VALUE); ! register const struct octave_kw *base = &wordlist[-gperf_lookup[offset]]; ! register const struct octave_kw *ptr = base + -gperf_lookup[offset + 1]; ! ! while (--ptr >= base) ! if (*str == *ptr->name && !strcmp (str + 1, ptr->name + 1)) ! return ptr; } } } --- 144,170 ---- { register int index = gperf_lookup[key]; ! if (index >= 0) { register const char *s = wordlist[index].name; ! if (*str == *s && !strcmp (str + 1, s + 1)) return &wordlist[index]; } ! else if (index < -TOTAL_KEYWORDS) { ! register int offset = - 1 - TOTAL_KEYWORDS - index; ! register const struct octave_kw *wordptr = &wordlist[TOTAL_KEYWORDS + gperf_lookup[offset]]; ! register const struct octave_kw *wordendptr = wordptr + -gperf_lookup[offset + 1]; ! ! while (wordptr < wordendptr) ! { ! register const char *s = wordptr->name; ! ! if (*str == *s && !strcmp (str + 1, s + 1)) ! return wordptr; ! wordptr++; ! } } } } diff -cNr octave-2.0.14/src/oct-iostrm.cc octave-2.0.15/src/oct-iostrm.cc *** octave-2.0.14/src/oct-iostrm.cc Wed Apr 24 22:17:36 1996 --- octave-2.0.15/src/oct-iostrm.cc Fri Nov 5 10:47:10 1999 *************** *** 68,73 **** --- 68,89 ---- ::error ("%s: invalid operation", stream_type ()); } + // Return non-zero if EOF has been reached on this stream. + + bool + octave_istream::eof (void) const + { + return is && is->eof (); + } + + // Return non-zero if EOF has been reached on this stream. + + bool + octave_ostream::eof (void) const + { + return os && os->eof (); + } + /* ;;; Local Variables: *** ;;; mode: C++ *** diff -cNr octave-2.0.14/src/oct-iostrm.h octave-2.0.15/src/oct-iostrm.h *** octave-2.0.14/src/oct-iostrm.h Sun Jan 19 22:40:29 1997 --- octave-2.0.15/src/oct-iostrm.h Fri Nov 5 10:46:22 1999 *************** *** 85,90 **** --- 85,94 ---- ~octave_istream (void) { } + // Return non-zero if EOF has been reached on this stream. + + bool eof (void) const; + istream *input_stream (void) { return is; } ostream *output_stream (void) { return 0; } *************** *** 110,115 **** --- 114,123 ---- octave_ostream (ostream *arg, const string& nm = string ()) : octave_base_iostream (nm, ios::out, oct_mach_info::native), os (arg) { } + + // Return non-zero if EOF has been reached on this stream. + + bool eof (void) const; ~octave_ostream (void) { } diff -cNr octave-2.0.14/src/oct-obj.cc octave-2.0.15/src/oct-obj.cc *** octave-2.0.14/src/oct-obj.cc Sat Aug 29 12:21:56 1998 --- octave-2.0.15/src/oct-obj.cc Thu Sep 2 12:44:56 1999 *************** *** 55,61 **** int total_nr = 0; for (int i = 0; i < len; i++) ! total_nr += elem(i).rows (); argv.resize (total_nr+1); --- 55,68 ---- int total_nr = 0; for (int i = 0; i < len; i++) ! { ! // An empty string ("") has zero columns and zero rows (a ! // change that was made for Matlab contemptibility. ! ! int n = elem(i).rows (); ! ! total_nr += n ? n : 1; ! } argv.resize (total_nr+1); *************** *** 66,72 **** { int nr = elem(i).rows (); ! if (nr == 1) argv[k++] = elem(i).string_value (); else { --- 73,79 ---- { int nr = elem(i).rows (); ! if (nr < 2) argv[k++] = elem(i).string_value (); else { diff -cNr octave-2.0.14/src/oct-procbuf.cc octave-2.0.15/src/oct-procbuf.cc *** octave-2.0.14/src/oct-procbuf.cc Fri Oct 16 02:06:24 1998 --- octave-2.0.15/src/oct-procbuf.cc Tue Oct 26 19:51:14 1999 *************** *** 42,47 **** --- 42,48 ---- #include "defun.h" #include "gripes.h" + #include "utils.h" // Number of microseconds to delay in the parent after forking. #if defined (__CYGWIN32__) *************** *** 111,123 **** exit (127); } - #if defined (HAVE_USLEEP) if (Vkluge_procbuf_delay > 0) ! usleep (Vkluge_procbuf_delay); ! #else ! if (Vkluge_procbuf_delay > 499999) ! sleep ((Vkluge_procbuf_delay + 500000) / 1000000); ! #endif ::close (child_end); --- 112,119 ---- exit (127); } if (Vkluge_procbuf_delay > 0) ! octave_usleep (Vkluge_procbuf_delay); ::close (child_end); diff -cNr octave-2.0.14/src/oct-stream.cc octave-2.0.15/src/oct-stream.cc *** octave-2.0.14/src/oct-stream.cc Wed Jan 20 12:00:49 1999 --- octave-2.0.15/src/oct-stream.cc Fri Nov 5 10:34:19 1999 *************** *** 24,29 **** --- 24,30 ---- #include #endif + #include #include #include *************** *** 35,40 **** --- 36,42 ---- #include "str-vec.h" #include "error.h" + #include "input.h" #include "oct-stream.h" #include "utils.h" *************** *** 88,94 **** { if (! xisinf (d)) { ! if (d > 0.0) retval = NINT (d); else ::error ("%s: negative value invalid as size specification", --- 90,96 ---- { if (! xisinf (d)) { ! if (d >= 0.0) retval = NINT (d); else ::error ("%s: negative value invalid as size specification", *************** *** 104,114 **** } static void ! get_size (const Matrix& size, int& nr, int& nc, const char *warn_for) { nr = -1; nc = -1; double dnr = -1.0; double dnc = -1.0; --- 106,119 ---- } static void ! get_size (const Matrix& size, int& nr, int& nc, int& one_elt_size_spec, ! const char *warn_for) { nr = -1; nc = -1; + one_elt_size_spec = 0; + double dnr = -1.0; double dnc = -1.0; *************** *** 117,122 **** --- 122,129 ---- if (sz_nr == 1 && sz_nc == 1) { + one_elt_size_spec = 1; + dnr = size (0, 0); dnc = 1.0; } *************** *** 145,151 **** { nr = get_size (dnr, warn_for); ! if (! error_state && dnc > 0.0) nc = get_size (dnc, warn_for); } } --- 152,158 ---- { nr = get_size (dnr, warn_for); ! if (! error_state && dnc >= 0.0) nc = get_size (dnc, warn_for); } } *************** *** 427,433 **** switch (elt->type) { ! case 'c': case 's': case 'p': case '%': case '[': break; default: --- 434,440 ---- switch (elt->type) { ! case 'c': case 's': case '%': case '[': break; default: *************** *** 879,885 **** int nr = -1; int nc = -1; ! get_size (size, nr, nc, "fread"); if (! error_state) { --- 886,894 ---- int nr = -1; int nc = -1; ! int ignore; ! ! get_size (size, nr, nc, ignore, "fread"); if (! error_state) { *************** *** 903,910 **** template void do_scanf_conv (istream& is, const char *fmt, T valptr, Matrix& mval, ! double *data, int& idx, int nr, int max_size, ! bool discard) { is.scan (fmt, valptr); --- 912,919 ---- template void do_scanf_conv (istream& is, const char *fmt, T valptr, Matrix& mval, ! double *data, int& idx, int& conv_count, int nr, ! int max_size, bool discard) { is.scan (fmt, valptr); *************** *** 923,963 **** } if (! discard) ! data[idx++] = *(valptr); } } template void do_scanf_conv (istream&, const char*, int*, Matrix&, double*, int&, ! int, int, bool); template void do_scanf_conv (istream&, const char*, long int*, Matrix&, double*, int&, ! int, int, bool); template void do_scanf_conv (istream&, const char*, short int*, Matrix&, double*, int&, ! int, int, bool); #if 0 template void do_scanf_conv (istream&, const char*, float*, Matrix&, double*, int&, ! int, int, bool); #endif template void do_scanf_conv (istream&, const char*, double*, Matrix&, double*, int&, ! int, int, bool); octave_value octave_base_stream::do_scanf (scanf_format_list& fmt_list, ! int nr, int nc, int& count) { ! count = 0; octave_value retval = Matrix (); istream *isp = input_stream (); bool all_char_conv = fmt_list.all_character_conversions (); --- 932,986 ---- } if (! discard) ! { ! conv_count++; ! data[idx++] = *(valptr); ! } } } template void do_scanf_conv (istream&, const char*, int*, Matrix&, double*, int&, ! int&, int, int, bool); template void do_scanf_conv (istream&, const char*, long int*, Matrix&, double*, int&, ! int&, int, int, bool); template void do_scanf_conv (istream&, const char*, short int*, Matrix&, double*, int&, ! int&, int, int, bool); #if 0 template void do_scanf_conv (istream&, const char*, float*, Matrix&, double*, int&, ! int&, int, int, bool); #endif template void do_scanf_conv (istream&, const char*, double*, Matrix&, double*, int&, ! int&, int, int, bool); octave_value octave_base_stream::do_scanf (scanf_format_list& fmt_list, ! int nr, int nc, int one_elt_size_spec, ! int& conversion_count) { ! conversion_count = 0; ! ! int data_index = 0; octave_value retval = Matrix (); + if (nr == 0 || nc == 0) + { + if (one_elt_size_spec) + nc = 0; + + return Matrix (nr, nc, 0.0); + } + istream *isp = input_stream (); bool all_char_conv = fmt_list.all_character_conversions (); *************** *** 965,981 **** Matrix mval; double *data = 0; int max_size = 0; int final_nr = 0; int final_nc = 0; ! if (nr > 0) { if (nc > 0) { mval.resize (nr, nc, 0.0); data = mval.fortran_vec (); max_size = nr * nc; } else { --- 988,1027 ---- Matrix mval; double *data = 0; int max_size = 0; + int max_conv = 0; int final_nr = 0; int final_nc = 0; ! if (all_char_conv) ! { ! if (one_elt_size_spec) ! { ! mval.resize (1, 512, 0.0); ! data = mval.fortran_vec (); ! max_size = 512; ! ! if (nr > 0) ! max_conv = nr; ! } ! else if (nr > 0 && nc > 0) ! { ! mval.resize (nr, 32, 0.0); ! data = mval.fortran_vec (); ! max_size = nr * 32; ! ! max_conv = nr * nc; ! } ! } ! else if (nr > 0) { if (nc > 0) { mval.resize (nr, nc, 0.0); data = mval.fortran_vec (); max_size = nr * nc; + + max_conv = max_size; } else { *************** *** 1003,1029 **** { if (elt) { ! if (count == max_size) { ! if (nr > 0) { ! if (nc > 0) ! { ! final_nr = nr; ! final_nc = nc; ! break; ! } ! else ! { ! max_size *= 2; ! mval.resize (nr, max_size / nr, 0.0); ! data = mval.fortran_vec (); ! } } else { ! max_size *=2; mval.resize (max_size, 1, 0.0); data = mval.fortran_vec (); } --- 1049,1080 ---- { if (elt) { ! if (max_conv > 0 && conversion_count == max_conv) { ! if (all_char_conv && one_elt_size_spec) { ! final_nr = 1; ! final_nc = data_index; ! } ! else ! { ! final_nr = nr; ! final_nc = (data_index - 1) / nr + 1; ! } ! break; ! } ! else if (data_index == max_size) ! { ! if (nr > 0) ! { ! max_size *= 2; ! mval.resize (nr, max_size / nr, 0.0); ! data = mval.fortran_vec (); } else { ! max_size *= 2; mval.resize (max_size, 1, 0.0); data = mval.fortran_vec (); } *************** *** 1050,1056 **** case 'h': { short int tmp; ! do_scanf_conv (is, fmt, &tmp, mval, data, count, nr, max_size, discard); } break; --- 1101,1108 ---- case 'h': { short int tmp; ! do_scanf_conv (is, fmt, &tmp, mval, data, ! data_index, conversion_count, nr, max_size, discard); } break; *************** *** 1058,1064 **** case 'l': { long int tmp; ! do_scanf_conv (is, fmt, &tmp, mval, data, count, nr, max_size, discard); } break; --- 1110,1117 ---- case 'l': { long int tmp; ! do_scanf_conv (is, fmt, &tmp, mval, data, ! data_index, conversion_count, nr, max_size, discard); } break; *************** *** 1066,1072 **** default: { int tmp; ! do_scanf_conv (is, fmt, &tmp, mval, data, count, nr, max_size, discard); } break; --- 1119,1126 ---- default: { int tmp; ! do_scanf_conv (is, fmt, &tmp, mval, data, ! data_index, conversion_count, nr, max_size, discard); } break; *************** *** 1078,1084 **** { double tmp; ! do_scanf_conv (is, fmt, &tmp, mval, data, count, nr, max_size, discard); } break; --- 1132,1139 ---- { double tmp; ! do_scanf_conv (is, fmt, &tmp, mval, data, ! data_index, conversion_count, nr, max_size, discard); } break; *************** *** 1089,1109 **** case 's': { ! int len = strlen (fmt); ! char *tmp_fmt = new char [len+1]; ! strcpy (tmp_fmt, fmt); ! if (tmp_fmt[len-1] == 's') ! tmp_fmt[len-1] = 'c'; ! int width = elt->width ? elt->width : 1; ! char *tmp = new char [width+1]; ! is.scan (tmp_fmt, tmp); ! delete [] tmp_fmt; ! tmp[width] = '\0'; if (is) { --- 1144,1189 ---- case 's': { ! int width = elt->width; ! if (elt->type == 'c' && width == 0) ! width = 1; ! char *tmp = 0; ! if (width) ! { ! tmp = new char [width+1]; ! is.scan (fmt, tmp); ! tmp[width] = '\0'; ! } ! else ! { ! // We're looking at a `%s' format. We have to ! // skip initial whitespace and then read until ! // the next whitespace character. ! ! ostrstream buf; ! ! int c = EOF; ! ! while (is && (c = is.get ()) != EOF && isspace (c)) ! /* skip leading whitespace */; ! ! if (is && c != EOF) ! buf << (char) c; ! ! while (is && (c = is.get ()) != EOF && ! isspace (c)) ! buf << (char) c; ! ! buf << ends; ! ! tmp = buf.str (); ! } ! ! width = strlen (tmp); if (is) { *************** *** 1111,1119 **** if (! discard) { while (i < width && tmp[i] != '\0') { ! if (count == max_size) { max_size *= 2; --- 1191,1201 ---- if (! discard) { + conversion_count++; + while (i < width && tmp[i] != '\0') { ! if (data_index == max_size) { max_size *= 2; *************** *** 1125,1131 **** data = mval.fortran_vec (); } ! data[count++] = tmp[i++]; } } } --- 1207,1213 ---- data = mval.fortran_vec (); } ! data[data_index++] = tmp[i++]; } } } *************** *** 1151,1178 **** } else if (! is) { ! if (nr > 0) { ! if (count > nr) { final_nr = nr; ! final_nc = (count - 1) / nr + 1; } else { ! final_nr = count; final_nc = 1; } } else { ! final_nr = count; final_nc = 1; } // XXX FIXME XXX -- is this the right thing to do? ! // What about other streams? ! if (name () == "stdin") { is.clear (); --- 1233,1284 ---- } else if (! is) { ! if (all_char_conv) ! { ! if (one_elt_size_spec) ! { ! final_nr = 1; ! final_nc = data_index; ! } ! else if (data_index > nr) ! { ! final_nr = nr; ! final_nc = (data_index - 1) / nr + 1; ! } ! else ! { ! final_nr = data_index; ! final_nc = 1; ! } ! } ! else if (nr > 0) { ! if (data_index > nr) { final_nr = nr; ! final_nc = (data_index - 1) / nr + 1; } else { ! final_nr = data_index; final_nc = 1; } } else { ! final_nr = data_index; final_nc = 1; } + // If it looks like we have a matching failure, then + // reset the failbit in the stream state. + + if (is.rdstate () & ios::failbit) + is.clear (is.rdstate () & (~ios::failbit)); + // XXX FIXME XXX -- is this the right thing to do? ! ! if (interactive && name () == "stdin") { is.clear (); *************** *** 1199,1215 **** { mval.resize (final_nr, final_nc, 0.0); ! if (all_char_conv) ! { ! if (nr < 0) ! mval = mval.transpose (); ! retval = mval; ! ! retval = retval.convert_to_str (); ! } ! else ! retval = mval; } return retval; --- 1305,1314 ---- { mval.resize (final_nr, final_nc, 0.0); ! retval = mval; ! if (all_char_conv) ! retval = retval.convert_to_str (); } return retval; *************** *** 1249,1259 **** if (! is) { ! error ("fscanf: read error"); // XXX FIXME XXX -- is this the right thing to do? ! if (name () == "stdin") { is.clear (); --- 1348,1364 ---- if (! is) { ! // If it looks like we have a matching failure, then ! // reset the failbit in the stream state. ! ! if (is.rdstate () & ios::failbit) ! is.clear (is.rdstate () & (~ios::failbit)); ! else ! error ("fscanf: read error"); // XXX FIXME XXX -- is this the right thing to do? ! if (interactive && name () == "stdin") { is.clear (); *************** *** 1272,1281 **** int nr = -1; int nc = -1; ! get_size (size, nr, nc, "fscanf"); if (! error_state) ! retval = do_scanf (fmt_list, nr, nc, count); } break; } --- 1377,1388 ---- int nr = -1; int nc = -1; ! int one_elt_size_spec; ! ! get_size (size, nr, nc, one_elt_size_spec, "fscanf"); if (! error_state) ! retval = do_scanf (fmt_list, nr, nc, one_elt_size_spec, count); } break; } *************** *** 1372,1394 **** case 's': { ! // XXX FIXME XXX -- this must be fixed! ! int width = elt->width ? elt->width : 65535; ! char *tmp = new char [width+1]; ! if (is.scan (fmt, tmp)) { ! if (! discard) ! { ! tmp[width] = '\0'; ! retval = tmp; ! } } else ! quit = true; delete [] tmp; } break; --- 1479,1527 ---- case 's': { ! int width = elt->width; ! char *tmp = 0; ! if (width) { ! tmp = new char [width+1]; ! ! is.scan (fmt, tmp); ! ! tmp[width] = '\0'; } else ! { ! // We're looking at a `%s' format. We have to ! // skip initial whitespace and then read until ! // the next whitespace character. ! ! ostrstream buf; ! ! int c = EOF; ! ! while (is && (c = is.get ()) != EOF && isspace (c)) ! /* skip leading whitespace */; ! ! if (is && c != EOF) ! buf << (char) c; ! ! while (is && (c = is.get ()) != EOF && ! isspace (c)) ! buf << (char) c; ! ! buf << ends; ! ! tmp = buf.str (); ! ! if (! discard) ! retval = tmp; ! } delete [] tmp; + + if (! is) + quit = true; } break; *************** *** 1407,1414 **** error ("fscanf: read error"); // XXX FIXME XXX -- is this the right thing to do? ! // What about other streams? ! if (name () == "stdin") { is.clear (); --- 1540,1547 ---- error ("fscanf: read error"); // XXX FIXME XXX -- is this the right thing to do? ! ! if (interactive && name () == "stdin") { is.clear (); *************** *** 1459,1470 **** error ("fscanf: read error"); // XXX FIXME XXX -- is this the right thing to do? - // Maybe. We should probably also arrange to - // flush the pending input prior to printing a - // prompt. Or maybe just blow off scanf for stdin - // like the MathWorks did. What about other streams? ! if (name () == "stdin") { is.clear (); --- 1592,1599 ---- error ("fscanf: read error"); // XXX FIXME XXX -- is this the right thing to do? ! if (interactive && name () == "stdin") { is.clear (); *************** *** 1566,1572 **** { ostream& os = *osp; ! Matrix mval = data.matrix_value (); if (! error_state) { --- 1695,1701 ---- { ostream& os = *osp; ! Matrix mval = data.matrix_value (true); if (! error_state) { diff -cNr octave-2.0.14/src/oct-stream.h octave-2.0.15/src/oct-stream.h *** octave-2.0.14/src/oct-stream.h Fri Feb 6 10:48:03 1998 --- octave-2.0.15/src/oct-stream.h Fri Sep 10 00:04:25 1999 *************** *** 315,321 **** int nr, int nc, int& count); octave_value do_scanf (scanf_format_list& fmt_list, int nr, int nc, ! int& count); octave_value scanf (const string& fmt, const Matrix& size, int& count); --- 315,321 ---- int nr, int nc, int& count); octave_value do_scanf (scanf_format_list& fmt_list, int nr, int nc, ! int one_elt_size_spec, int& count); octave_value scanf (const string& fmt, const Matrix& size, int& count); diff -cNr octave-2.0.14/src/parse.y octave-2.0.15/src/parse.y *** octave-2.0.14/src/parse.y Thu Sep 24 10:13:46 1998 --- octave-2.0.15/src/parse.y Fri Jun 18 18:24:17 1999 *************** *** 2047,2056 **** int l = return_tok->line (); int c = return_tok->column (); ! if (lexer_flags.defining_func || reading_script_file) retval = new tree_return_command (l, c); ! else ! retval = new tree_no_op_command ("return", l, c); return retval; } --- 2047,2056 ---- int l = return_tok->line (); int c = return_tok->column (); ! // if (lexer_flags.defining_func || reading_script_file) retval = new tree_return_command (l, c); ! // else ! // retval = new tree_no_op_command ("return", l, c); return retval; } diff -cNr octave-2.0.14/src/pr-output.cc octave-2.0.15/src/pr-output.cc *** octave-2.0.14/src/pr-output.cc Wed Apr 8 23:39:54 1998 --- octave-2.0.15/src/pr-output.cc Tue Sep 7 08:44:46 1999 *************** *** 293,314 **** fw = 8 * sizeof (double); rd = 0; } ! else if (int_or_inf_or_nan) { ! int digits = x_max > x_min ? x_max : x_min; ! fw = digits <= 0 ? 1 : digits; if (inf_or_nan && fw < 3) fw = 3; fw += sign; - rd = 0; } ! else if (Vfixed_point_format) { ! rd = prec; ! fw = rd + 2; if (inf_or_nan && fw < 3) fw = 3; fw += sign; } else { --- 293,314 ---- fw = 8 * sizeof (double); rd = 0; } ! else if (Vfixed_point_format) { ! rd = prec; ! fw = rd + 2; if (inf_or_nan && fw < 3) fw = 3; fw += sign; } ! else if (int_or_inf_or_nan) { ! int digits = x_max > x_min ? x_max : x_min; ! fw = digits <= 0 ? 1 : digits; if (inf_or_nan && fw < 3) fw = 3; fw += sign; + rd = 0; } else { *************** *** 607,628 **** i_fw = 8 * sizeof (double); rd = 0; } ! else if (int_or_inf_or_nan) { ! int digits = x_max > x_min ? x_max : x_min; ! i_fw = r_fw = digits <= 0 ? 1 : digits; if (inf_or_nan && i_fw < 3) i_fw = r_fw = 3; r_fw += sign; - rd = 0; } ! else if (Vfixed_point_format) { ! rd = prec; ! i_fw = r_fw = rd + 2; if (inf_or_nan && i_fw < 3) i_fw = r_fw = 3; r_fw += sign; } else { --- 607,628 ---- i_fw = 8 * sizeof (double); rd = 0; } ! else if (Vfixed_point_format) { ! rd = prec; ! i_fw = r_fw = rd + 2; if (inf_or_nan && i_fw < 3) i_fw = r_fw = 3; r_fw += sign; } ! else if (int_or_inf_or_nan) { ! int digits = x_max > x_min ? x_max : x_min; ! i_fw = r_fw = digits <= 0 ? 1 : digits; if (inf_or_nan && i_fw < 3) i_fw = r_fw = 3; r_fw += sign; + rd = 0; } else { diff -cNr octave-2.0.14/src/pt-fcn.cc octave-2.0.15/src/pt-fcn.cc *** octave-2.0.14/src/pt-fcn.cc Sat Mar 27 11:37:41 1999 --- octave-2.0.15/src/pt-fcn.cc Tue Oct 26 19:14:59 1999 *************** *** 282,287 **** --- 282,288 ---- if (call_depth > Vmax_recursion_depth) { ::error ("max_recursion_limit exceeded"); + run_unwind_frame ("func_eval"); return retval; } diff -cNr octave-2.0.14/src/quad.cc octave-2.0.15/src/quad.cc *** octave-2.0.14/src/quad.cc Fri Oct 16 02:34:11 1998 --- octave-2.0.15/src/quad.cc Tue Oct 26 21:09:18 1999 *************** *** 38,43 **** --- 38,44 ---- #include "pager.h" #include "pt-fvc.h" #include "oct-obj.h" + #include "unwind-prot.h" #include "utils.h" #include "variables.h" *************** *** 50,55 **** --- 51,59 ---- static Quad_options quad_opts; + // Is this a recursive call? + static int call_depth = 0; + double quad_user_function (double x) { *************** *** 89,94 **** --- 93,122 ---- return retval; } + #define QUAD_ABORT() \ + do \ + { \ + run_unwind_frame ("Fquad"); \ + return retval; \ + } \ + while (0) + + #define QUAD_ABORT1(msg) \ + do \ + { \ + ::error ("quad: " ## msg); \ + QUAD_ABORT (); \ + } \ + while (0) + + #define QUAD_ABORT2(fmt, arg) \ + do \ + { \ + ::error ("quad: " ## fmt, arg); \ + QUAD_ABORT (); \ + } \ + while (0) + DEFUN_DLD (quad, args, nargout, "[V, IER, NFUN] = quad (F, A, B [, TOL] [, SING])\n\ \n\ *************** *** 112,250 **** { octave_value_list retval; ! int nargin = args.length (); ! ! if (nargin < 3 || nargin > 5 || nargout > 4) ! { ! print_usage ("quad"); ! return retval; ! } ! ! quad_fcn = is_valid_function (args(0), "quad", 1); ! if (! quad_fcn) ! return retval; ! double a = args(1).double_value (); ! if (error_state) ! { ! error ("quad: expecting second argument to be a scalar"); ! return retval; ! } ! double b = args(2).double_value (); ! if (error_state) { ! error ("quad: expecting third argument to be a scalar"); ! return retval; ! } ! int indefinite = 0; ! IndefQuad::IntegralType indef_type = IndefQuad::doubly_infinite; ! double bound = 0.0; ! if ((int) xisinf (a) && (int) xisinf (b)) ! { ! indefinite = 1; ! indef_type = IndefQuad::doubly_infinite; ! } ! else if ((int) xisinf (a)) ! { ! indefinite = 1; ! bound = b; ! indef_type = IndefQuad::neg_inf_to_bound; ! } ! else if ((int) xisinf (b)) ! { ! indefinite = 1; ! bound = a; ! indef_type = IndefQuad::bound_to_inf; ! } ! int ier = 0; ! int nfun = 0; ! double abserr = 0.0; ! double val = 0.0; ! double abstol = 1e-6; ! double reltol = 1e-6; ! ColumnVector tol (2); ! ColumnVector sing; ! int have_sing = 0; ! switch (nargin) ! { ! case 5: ! if (indefinite) ! { ! error("quad: singularities not allowed on infinite intervals"); ! return retval; ! } ! have_sing = 1; ! sing = args(4).vector_value (); if (error_state) { ! error ("quad: expecting vector of singularities as fourth argument"); ! return retval; } ! ! case 4: ! tol = args(3).vector_value (); ! ! if (error_state) { ! error ("quad: expecting vector of tolerances as fifth argument"); ! return retval; } ! switch (tol.capacity ()) { ! case 2: ! reltol = tol (1); ! case 1: ! abstol = tol (0); ! break; ! default: ! error ("quad: expecting tol to contain no more than two values"); ! return retval; ! } ! case 3: ! if (indefinite) ! { ! IndefQuad iq (quad_user_function, bound, indef_type, abstol, reltol); ! iq.set_options (quad_opts); ! val = iq.integrate (ier, nfun, abserr); ! } ! else ! { ! if (have_sing) { ! DefQuad dq (quad_user_function, a, b, sing, abstol, reltol); ! dq.set_options (quad_opts); ! val = dq.integrate (ier, nfun, abserr); } else { ! DefQuad dq (quad_user_function, a, b, abstol, reltol); ! dq.set_options (quad_opts); ! val = dq.integrate (ier, nfun, abserr); } } - break; ! default: ! panic_impossible (); ! break; } ! ! retval(3) = abserr; ! retval(2) = (double) nfun; ! retval(1) = (double) ier; ! retval(0) = val; return retval; } --- 140,273 ---- { octave_value_list retval; ! begin_unwind_frame ("Fquad"); ! unwind_protect_int (call_depth); ! call_depth++; ! if (call_depth > 1) ! QUAD_ABORT1 ("invalid recursive call"); ! int nargin = args.length (); ! if (nargin > 2 && nargin < 6 && nargout < 5) { ! quad_fcn = is_valid_function (args(0), "quad", 1); ! if (! quad_fcn) ! QUAD_ABORT (); ! double a = args(1).double_value (); ! if (error_state) ! QUAD_ABORT1 ("expecting second argument to be a scalar"); ! double b = args(2).double_value (); if (error_state) + QUAD_ABORT1 ("expecting third argument to be a scalar"); + + int indefinite = 0; + IndefQuad::IntegralType indef_type = IndefQuad::doubly_infinite; + double bound = 0.0; + if ((int) xisinf (a) && (int) xisinf (b)) { ! indefinite = 1; ! indef_type = IndefQuad::doubly_infinite; } ! else if ((int) xisinf (a)) { ! indefinite = 1; ! bound = b; ! indef_type = IndefQuad::neg_inf_to_bound; ! } ! else if ((int) xisinf (b)) ! { ! indefinite = 1; ! bound = a; ! indef_type = IndefQuad::bound_to_inf; } ! int ier = 0; ! int nfun = 0; ! double abserr = 0.0; ! double val = 0.0; ! double abstol = 1e-6; ! double reltol = 1e-6; ! ColumnVector tol (2); ! ColumnVector sing; ! int have_sing = 0; ! switch (nargin) { ! case 5: ! if (indefinite) ! QUAD_ABORT1 ("singularities not allowed on infinite intervals"); ! have_sing = 1; ! sing = args(4).vector_value (); ! if (error_state) ! QUAD_ABORT1 ("expecting vector of singularities as fourth argument"); ! ! case 4: ! tol = args(3).vector_value (); ! ! if (error_state) ! QUAD_ABORT1 ("expecting vector of tolerances as fifth argument"); ! ! switch (tol.capacity ()) { ! case 2: ! reltol = tol (1); ! ! case 1: ! abstol = tol (0); ! break; ! ! default: ! QUAD_ABORT1 ("expecting tol to contain no more than two values"); ! } ! ! case 3: ! if (indefinite) ! { ! IndefQuad iq (quad_user_function, bound, indef_type, ! abstol, reltol); ! ! iq.set_options (quad_opts); ! ! val = iq.integrate (ier, nfun, abserr); } else { ! if (have_sing) ! { ! DefQuad dq (quad_user_function, a, b, sing, abstol, reltol); ! dq.set_options (quad_opts); ! val = dq.integrate (ier, nfun, abserr); ! } ! else ! { ! DefQuad dq (quad_user_function, a, b, abstol, reltol); ! dq.set_options (quad_opts); ! val = dq.integrate (ier, nfun, abserr); ! } } + break; + + default: + panic_impossible (); + break; } ! retval(3) = abserr; ! retval(2) = (double) nfun; ! retval(1) = (double) ier; ! retval(0) = val; } ! else ! print_usage ("quad"); return retval; } diff -cNr octave-2.0.14/src/sighandlers.cc octave-2.0.15/src/sighandlers.cc *** octave-2.0.14/src/sighandlers.cc Thu Oct 8 13:45:16 1998 --- octave-2.0.15/src/sighandlers.cc Fri Nov 5 13:24:29 1999 *************** *** 39,44 **** --- 39,45 ---- #endif #include "error.h" + #include "input.h" #include "load-save.h" #include "pager.h" #include "sighandlers.h" *************** *** 208,240 **** int n = octave_child_list::length (); ! if (n == 0) { ! waitpid (-1, 0, WNOHANG); ! } ! else ! { ! for (int i = 0; i < n; i++) ! { ! octave_child& elt = octave_child_list::elem (i); ! pid_t pid = elt.pid; ! if (pid > 0) ! { ! int status; ! if (waitpid (pid, &status, WNOHANG) > 0) ! { ! elt.pid = -1; ! octave_child::dead_child_handler f = elt.handler; ! if (f) ! f (pid, status); ! break; ! } } } } --- 209,234 ---- int n = octave_child_list::length (); ! for (int i = 0; i < n; i++) { ! octave_child& elt = octave_child_list::elem (i); ! pid_t pid = elt.pid; ! if (pid > 0) ! { ! int status; ! if (waitpid (pid, &status, WNOHANG) > 0) ! { ! elt.pid = -1; ! octave_child::dead_child_handler f = elt.handler; ! if (f) ! f (pid, status); ! break; } } } *************** *** 274,279 **** --- 268,293 ---- } #endif + #if 0 + #if defined (SIGWINCH) + + #if defined (USE_READLINE) + #include + #include + #endif + + static RETSIGTYPE + sigwinch_handler (int /* sig */) + { + MAYBE_ACK_SIGNAL (SIGWINCH); + + MAYBE_REINSTALL_SIGHANDLER (SIGWINCH, sigwinch_handler); + + SIGHANDLER_RETURN (0); + } + #endif + #endif + // Handle SIGINT by restarting the parser (see octave.cc). // // This also has to work for SIGBREAK (on systems that have it), so we *************** *** 478,484 **** octave_set_signal_handler (SIGVTALRM, generic_sig_handler); #endif ! // SIGWINCH #ifdef SIGXCPU octave_set_signal_handler (SIGXCPU, generic_sig_handler); --- 492,502 ---- octave_set_signal_handler (SIGVTALRM, generic_sig_handler); #endif ! #if 0 ! #ifdef SIGWINCH ! octave_set_signal_handler (SIGWINCH, sigwinch_handler); ! #endif ! #endif #ifdef SIGXCPU octave_set_signal_handler (SIGXCPU, generic_sig_handler); diff -cNr octave-2.0.14/src/strftime.c octave-2.0.15/src/strftime.c *** octave-2.0.14/src/strftime.c Tue Nov 24 23:32:55 1998 --- octave-2.0.15/src/strftime.c Wed Oct 13 17:08:39 1999 *************** *** 1,7 **** /* Copyright (C) 1991, 92, 93, 94, 95, 96 Free Software Foundation, Inc. NOTE: The canonical source of this file is maintained with the GNU C ! Library. Bugs can be reported to bug-glibc@prep.ai.mit.edu. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the --- 1,7 ---- /* Copyright (C) 1991, 92, 93, 94, 95, 96 Free Software Foundation, Inc. NOTE: The canonical source of this file is maintained with the GNU C ! Library. Bugs can be reported to bug-glibc@gnu.org. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff -cNr octave-2.0.14/src/sysdep.cc octave-2.0.15/src/sysdep.cc *** octave-2.0.14/src/sysdep.cc Thu Jan 28 21:30:45 1999 --- octave-2.0.15/src/sysdep.cc Thu Oct 21 02:04:08 1999 *************** *** 60,65 **** --- 60,73 ---- LOSE! LOSE! #endif + #if defined (HAVE_TERMCAP_H) + #include + #endif + + #if defined (HAVE_SYS_IOCTL_H) + #include + #endif + #if defined (HAVE_FLOATINGPOINT_H) #include #endif *************** *** 77,85 **** #include #endif - extern char *term_clrpag; - extern "C" void _rl_output_character_function (); - #include "mach-info.h" #include "defun.h" --- 85,90 ---- *************** *** 388,406 **** { octave_value_list retval; ! rl_beg_of_line (); ! rl_kill_line (1); ! ! #if ! defined (_GO32_) ! if (term_clrpag) ! tputs (term_clrpag, 1, _rl_output_character_function); ! else ! crlf (); ! #else ! crlf (); ! #endif ! ! fflush (rl_outstream); return retval; } --- 393,399 ---- { octave_value_list retval; ! rl_clear_screen (0, 0); return retval; } *************** *** 567,583 **** warning ("usleep: NaN is an invalid delay"); else { - #if defined (HAVE_USLEEP) int delay = NINT (dval); if (delay > 0) ! usleep (delay); ! #else ! int delay = NINT (dval / 1e6); ! ! if (delay > 0) ! sleep (delay); ! #endif } } } --- 560,569 ---- warning ("usleep: NaN is an invalid delay"); else { int delay = NINT (dval); if (delay > 0) ! octave_usleep (delay); } } } diff -cNr octave-2.0.14/src/toplev.cc octave-2.0.15/src/toplev.cc *** octave-2.0.14/src/toplev.cc Tue Nov 17 14:33:38 1998 --- octave-2.0.15/src/toplev.cc Thu Oct 21 02:04:53 1999 *************** *** 675,688 **** // Execute a shell command. - static int cmd_status = 0; - - static void - cmd_death_handler (pid_t, int status) - { - cmd_status = status; - } - static void cleanup_iprocstream (void *p) { --- 675,680 ---- *************** *** 700,711 **** iprocstream *cmd = new iprocstream (cmd_str.c_str ()); - cmd_status = -1; - if (cmd) { - octave_child_list::insert (cmd->pid (), cmd_death_handler); - add_unwind_protect (cleanup_iprocstream, cmd); if (*cmd) --- 692,699 ---- *************** *** 729,754 **** { cmd->clear (); ! #if defined (HAVE_USLEEP) ! usleep (100); ! #else ! sleep (1); ! #endif } while (cmd->get (ch)) output_buf.put (ch); ! cmd->close (); ! ! // One way or another, cmd_death_handler should be called ! // when the process exits, and it will save the exit status ! // of the command in cmd_status. ! ! // The value in cmd_status is as returned by waitpid. If ! // the process exited normally, extract the actual exit ! // status of the command. Otherwise, return 127 as a ! // failure code. if (WIFEXITED (cmd_status)) cmd_status = WEXITSTATUS (cmd_status); --- 717,729 ---- { cmd->clear (); ! octave_usleep (100); } while (cmd->get (ch)) output_buf.put (ch); ! int cmd_status = cmd->close (); if (WIFEXITED (cmd_status)) cmd_status = WEXITSTATUS (cmd_status); *************** *** 842,850 **** error ("system: fork failed -- can't create child process"); else if (pid == 0) { ! system (cmd_str.c_str ()); ! exit (0); ! retval(0) = 0.0; } else retval(0) = (double) pid; --- 817,825 ---- error ("system: fork failed -- can't create child process"); else if (pid == 0) { ! execl ("/bin/sh", "sh", "-c", cmd_str.c_str (), 0); ! ! panic_impossible (); } else retval(0) = (double) pid; diff -cNr octave-2.0.14/src/unwind-prot.cc octave-2.0.15/src/unwind-prot.cc *** octave-2.0.14/src/unwind-prot.cc Mon Jan 20 14:51:00 1997 --- octave-2.0.15/src/unwind-prot.cc Fri Aug 20 08:17:51 1999 *************** *** 197,203 **** break; case generic: ! delete [] gen_ptr_value; // Can this be right? break; default: --- 197,204 ---- break; case generic: ! // XXX FIXME XXX ! // delete [] gen_ptr_value; break; default: diff -cNr octave-2.0.14/src/utils.cc octave-2.0.15/src/utils.cc *** octave-2.0.14/src/utils.cc Wed Dec 2 22:38:16 1998 --- octave-2.0.15/src/utils.cc Fri Nov 12 09:48:20 1999 *************** *** 51,60 **** LOSE! LOSE! #endif - #ifndef HAVE_STRNCASECMP - extern "C" int strncasecmp (const char*, const char*, size_t); - #endif - #include "SLStack.h" #include "file-ops.h" --- 51,56 ---- *************** *** 118,124 **** && slen >= min_match_len && (case_sens ? (strncmp (std.c_str (), s.c_str (), slen) == 0) ! : (strncasecmp (std.c_str (), s.c_str (), slen) == 0))); } // Ugh. --- 114,120 ---- && slen >= min_match_len && (case_sens ? (strncmp (std.c_str (), s.c_str (), slen) == 0) ! : (octave_strncasecmp (std.c_str (), s.c_str (), slen) == 0))); } // Ugh. diff -cNr octave-2.0.14/src/utils.h octave-2.0.15/src/utils.h *** octave-2.0.14/src/utils.h Thu Apr 23 15:38:47 1998 --- octave-2.0.15/src/utils.h Mon Jan 10 21:26:17 2000 *************** *** 62,67 **** --- 62,73 ---- extern int check_preference (const string& var); + extern "C" void octave_usleep (unsigned int useconds); + + extern "C" int octave_strcasecmp (const char *s1, const char *s2); + + extern "C" int octave_strncasecmp (const char *s1, const char *s2, size_t n); + #endif /* diff -cNr octave-2.0.14/src/variables.cc octave-2.0.15/src/variables.cc *** octave-2.0.14/src/variables.cc Tue Mar 2 01:35:54 1999 --- octave-2.0.15/src/variables.cc Sat Jun 19 11:55:38 1999 *************** *** 1275,1301 **** return retval; } - // XXX FIXME XXX -- this should take a list of regular expressions - // naming the variables to look for. - static octave_value_list do_who (int argc, const string_vector& argv) { octave_value_list retval; int show_builtins = 0; ! int show_functions = (curr_sym_tab == top_level_sym_tab); ! int show_variables = 1; int show_verbose = 0; string my_name = argv[0]; - if (argc > 1) - { - show_functions = 0; - show_variables = 0; - } - int i; for (i = 1; i < argc; i++) { --- 1275,1292 ---- return retval; } static octave_value_list do_who (int argc, const string_vector& argv) { octave_value_list retval; int show_builtins = 0; ! int show_functions = 0; ! int show_variables = 0; int show_verbose = 0; string my_name = argv[0]; int i; for (i = 1; i < argc; i++) { *************** *** 1318,1323 **** --- 1309,1323 ---- argv[i].c_str ()); else break; + } + + // If no options were specified to select the type of symbol to + // display, then set defaults. + + if (! (show_builtins || show_functions || show_variables)) + { + show_functions = (curr_sym_tab == top_level_sym_tab); + show_variables = 1; } int npats = argc - i; diff -cNr octave-2.0.14/src/version.h octave-2.0.15/src/version.h *** octave-2.0.14/src/version.h Wed Apr 14 12:57:50 1999 --- octave-2.0.15/src/version.h Mon Jan 10 18:03:09 2000 *************** *** 20,29 **** */ ! #define OCTAVE_VERSION "2.0.14" #define OCTAVE_COPYRIGHT \ ! "Copyright (C) 1996, 1997, 1998, 1999 John W. Eaton." #define OCTAVE_NAME_AND_VERSION \ "GNU Octave, version " OCTAVE_VERSION " (" CANONICAL_HOST_TYPE ")" --- 20,29 ---- */ ! #define OCTAVE_VERSION "2.0.15" #define OCTAVE_COPYRIGHT \ ! "Copyright (C) 1996, 1997, 1998, 1999, 2000 John W. Eaton." #define OCTAVE_NAME_AND_VERSION \ "GNU Octave, version " OCTAVE_VERSION " (" CANONICAL_HOST_TYPE ")" diff -cNr octave-2.0.14/test/ChangeLog octave-2.0.15/test/ChangeLog *** octave-2.0.14/test/ChangeLog Wed Apr 14 12:55:51 1999 --- octave-2.0.15/test/ChangeLog Mon Jan 10 18:03:56 2000 *************** *** 1,3 **** --- 1,7 ---- + 2000-01-10 John W. Eaton + + * Version 2.0.15 released. + Wed Apr 14 12:55:42 1999 John W. Eaton * Version 2.0.14 released. diff -cNr octave-2.0.14/test/octave.test/index/dfi-f/v-3.m octave-2.0.15/test/octave.test/index/dfi-f/v-3.m *** octave-2.0.14/test/octave.test/index/dfi-f/v-3.m Sat Oct 12 00:09:51 1996 --- octave-2.0.15/test/octave.test/index/dfi-f/v-3.m Mon Jun 7 11:37:04 1999 *************** *** 2,5 **** a = [4,3,2,1]; a_prime = [4;3;2;1]; mid_a = [3,2]; ! all (a(:) == a) --- 2,5 ---- a = [4,3,2,1]; a_prime = [4;3;2;1]; mid_a = [3,2]; ! all (a(:) == a_prime) diff -cNr octave-2.0.14/texi2dvi octave-2.0.15/texi2dvi *** octave-2.0.14/texi2dvi Thu Nov 14 14:48:14 1996 --- octave-2.0.15/texi2dvi Wed Oct 13 17:05:31 1999 *************** *** 22,30 **** # Commentary: ! # Author: Noah Friedman ! # Please send bug reports, etc. to bug-texinfo@prep.ai.mit.edu # If possible, please send a copy of the output of the script called with # the `--debug' option when making a bug report. --- 22,30 ---- # Commentary: ! # Author: Noah Friedman ! # Please send bug reports, etc. to bug-texinfo@gnu.org. # If possible, please send a copy of the output of the script called with # the `--debug' option when making a bug report. *************** *** 67,73 **** The values of the TEX, TEXINDEX, and MAKEINFO environment variables are used to run those commands, if they are set. ! Email bug reports to bug-texinfo@prep.ai.mit.edu. " # Initialize variables. --- 67,73 ---- The values of the TEX, TEXINDEX, and MAKEINFO environment variables are used to run those commands, if they are set. ! Email bug reports to bug-texinfo@gnu.org. " # Initialize variables. PATCH_EOF