Fresh Fish 9/FreshFishVol9-CD2.bin/bbs/gnu/octave-1.1.1-diffs.lha/GNU/diffs/octave-1.1.1.diffs

Text File | 1995-04-14 | 197.1 KB | 7,627 lines

diff -rc --new-file octave-1.1.1-base/configure octave-1.1.1/configure
*** octave-1.1.1-base/configure    Wed Feb 22 20:33:24 1995
--- octave-1.1.1/configure    Sat Mar 25 07:56:58 1995
***************
*** 11,17 ****

  # Defaults:
  ac_help=
! ac_default_prefix=/usr/local
  # Any additions from configure.in:
  ac_help="$ac_help
    --with-f2c              use f2c even if Fortran compiler is available"
--- 11,17 ----

  # Defaults:
  ac_help=
! ac_default_prefix=/gnu
  # Any additions from configure.in:
  ac_help="$ac_help
    --with-f2c              use f2c even if Fortran compiler is available"
***************
*** 19,25 ****
    --enable-dld            use DLD for dynamic linking (not all systems)"
  ac_help="$ac_help
    --enable-lite-kernel    compile smaller kernel (requires DLD)"
! ac_default_prefix=/usr/local

  # Initialize some variables set by options.
  # The variables have the same names as the options, with
--- 19,25 ----
    --enable-dld            use DLD for dynamic linking (not all systems)"
  ac_help="$ac_help
    --enable-lite-kernel    compile smaller kernel (requires DLD)"
! ac_default_prefix=/gnu

  # Initialize some variables set by options.
  # The variables have the same names as the options, with
***************
*** 58,64 ****
    fi

    case "$ac_option" in
!   -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
    *) ac_optarg= ;;
    esac

--- 58,64 ----
    fi

    case "$ac_option" in
!   -*=*) ac_optarg=`/bin/echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
    *) ac_optarg= ;;
    esac

***************
*** 79,99 ****
      cache_file="$ac_optarg" ;;

    -disable-* | --disable-*)
!     ac_feature=`echo $ac_option|sed -e 's/-*disable-//'`
      # Reject names that are not valid shell variable names.
!     if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then
        { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
      fi
!     ac_feature=`echo $ac_feature| sed 's/-/_/g'`
      eval "enable_${ac_feature}=no" ;;

    -enable-* | --enable-*)
!     ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'`
      # Reject names that are not valid shell variable names.
!     if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then
        { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
      fi
!     ac_feature=`echo $ac_feature| sed 's/-/_/g'`
      case "$ac_option" in
        *=*) ;;
        *) ac_optarg=yes ;;
--- 79,99 ----
      cache_file="$ac_optarg" ;;

    -disable-* | --disable-*)
!     ac_feature=`/bin/echo $ac_option|sed -e 's/-*disable-//'`
      # Reject names that are not valid shell variable names.
!     if test -n "`/bin/echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then
        { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
      fi
!     ac_feature=`/bin/echo $ac_feature| sed 's/-/_/g'`
      eval "enable_${ac_feature}=no" ;;

    -enable-* | --enable-*)
!     ac_feature=`/bin/echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'`
      # Reject names that are not valid shell variable names.
!     if test -n "`/bin/echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then
        { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
      fi
!     ac_feature=`/bin/echo $ac_feature| sed 's/-/_/g'`
      case "$ac_option" in
        *=*) ;;
        *) ac_optarg=yes ;;
***************
*** 229,240 ****
      exit 0 ;;

    -with-* | --with-*)
!     ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'`
      # Reject names that are not valid shell variable names.
!     if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then
        { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
      fi
!     ac_package=`echo $ac_package| sed 's/-/_/g'`
      case "$ac_option" in
        *=*) ;;
        *) ac_optarg=yes ;;
--- 229,240 ----
      exit 0 ;;

    -with-* | --with-*)
!     ac_package=`/bin/echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'`
      # Reject names that are not valid shell variable names.
!     if test -n "`/bin/echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then
        { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
      fi
!     ac_package=`/bin/echo $ac_package| sed 's/-/_/g'`
      case "$ac_option" in
        *=*) ;;
        *) ac_optarg=yes ;;
***************
*** 242,253 ****
      eval "with_${ac_package}='$ac_optarg'" ;;

    -without-* | --without-*)
!     ac_package=`echo $ac_option|sed -e 's/-*without-//'`
      # Reject names that are not valid shell variable names.
!     if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then
        { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
      fi
!     ac_package=`echo $ac_package| sed 's/-/_/g'`
      eval "with_${ac_package}=no" ;;

    --x)
--- 242,253 ----
      eval "with_${ac_package}='$ac_optarg'" ;;

    -without-* | --without-*)
!     ac_package=`/bin/echo $ac_option|sed -e 's/-*without-//'`
      # Reject names that are not valid shell variable names.
!     if test -n "`/bin/echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then
        { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
      fi
!     ac_package=`/bin/echo $ac_package| sed 's/-/_/g'`
      eval "with_${ac_package}=no" ;;

    --x)
***************
*** 272,278 ****
      ;;

    *)
!     if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
        echo "configure: warning: $ac_option: invalid host type" 1>&2
      fi
      if test "x$nonopt" != xNONE; then
--- 272,278 ----
      ;;

    *)
!     if test -n "`/bin/echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
        echo "configure: warning: $ac_option: invalid host type" 1>&2
      fi
      if test "x$nonopt" != xNONE; then
***************
*** 285,291 ****
  done

  if test -n "$ac_prev"; then
!   { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; }
  fi

  trap 'rm -fr conftest* confdefs* core $ac_clean_files; exit 1' 1 2 15
--- 285,291 ----
  done

  if test -n "$ac_prev"; then
!   { echo "configure: error: missing argument to --`/bin/echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; }
  fi

  trap 'rm -fr conftest* confdefs* core $ac_clean_files; exit 1' 1 2 15
***************
*** 335,341 ****
  # confdefs.h avoids OS command line length limits that DEFS can exceed.
  rm -rf conftest* confdefs.h
  # AIX cpp loses on an empty file, so make sure it contains at least a newline.
! echo > confdefs.h

  # A filename unique to this package, relative to the directory that
  # configure is in, which we can look for to find out if srcdir is correct.
--- 335,341 ----
  # confdefs.h avoids OS command line length limits that DEFS can exceed.
  rm -rf conftest* confdefs.h
  # AIX cpp loses on an empty file, so make sure it contains at least a newline.
! /bin/echo > confdefs.h

  # A filename unique to this package, relative to the directory that
  # configure is in, which we can look for to find out if srcdir is correct.
***************
*** 346,352 ****
    ac_srcdir_defaulted=yes
    # Try the directory containing this script, then its parent.
    ac_prog=$0
!   ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'`
    test "x$ac_confdir" = "x$ac_prog" && ac_confdir=.
    srcdir=$ac_confdir
    if test ! -r $srcdir/$ac_unique_file; then
--- 346,352 ----
    ac_srcdir_defaulted=yes
    # Try the directory containing this script, then its parent.
    ac_prog=$0
!   ac_confdir=`/bin/echo $ac_prog|sed 's%/[^/][^/]*$%%'`
    test "x$ac_confdir" = "x$ac_prog" && ac_confdir=.
    srcdir=$ac_confdir
    if test ! -r $srcdir/$ac_unique_file; then
***************
*** 362,368 ****
      { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; }
    fi
  fi
! srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`

  # Prefer explicitly selected file to automatically selected ones.
  if test -z "$CONFIG_SITE"; then
--- 362,368 ----
      { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; }
    fi
  fi
! srcdir=`/bin/echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`

  # Prefer explicitly selected file to automatically selected ones.
  if test -z "$CONFIG_SITE"; then
***************
*** 438,444 ****
  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>&4

  host_alias=$host
  case "$host_alias" in
--- 438,444 ----
  else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
  fi

! /bin/echo $ac_n "checking host system type""... $ac_c" 1>&4

  host_alias=$host
  case "$host_alias" in
***************
*** 453,462 ****
  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/'`
! echo "$ac_t""$host" 1>&4

  if test -z "$host"; then
    host=unknown
--- 453,462 ----
  esac

  host=`$ac_config_sub $host_alias`
! host_cpu=`/bin/echo $host | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\1/'`
! host_vendor=`/bin/echo $host | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\2/'`
! host_os=`/bin/echo $host | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\3/'`
! /bin/echo "$ac_t""$host" 1>&4

  if test -z "$host"; then
    host=unknown
***************
*** 470,482 ****


  ### Allow the user to force us to use f2c.

  # Check whether --with-f2c or --without-f2c was given.
  withval="$with_f2c"
  if test -n "$withval"; then
    use_f2c=true
  else
!   use_f2c=false
  fi


--- 470,483 ----


  ### Allow the user to force us to use f2c.
+ ### Amiga hack -- the GNU f77 compiler won't quite work yet so force this.

  # Check whether --with-f2c or --without-f2c was given.
  withval="$with_f2c"
  if test -n "$withval"; then
    use_f2c=true
  else
!   use_f2c=true
  fi


***************
*** 533,556 ****
  imagedir='$(datadir)/octave/$(version)/imagelib'
  imagepath='.:$(imagedir)//'

! echo "$ac_t""defining prefix to be $prefix" 1>&4
! echo "$ac_t""defining exec_prefix to be $exec_prefix" 1>&4
! echo "$ac_t""defining bindir to be $bindir" 1>&4
! echo "$ac_t""defining datadir to be $datadir" 1>&4
! echo "$ac_t""defining libdir to be $libdir" 1>&4
! echo "$ac_t""defining includedir to be $includedir" 1>&4
! echo "$ac_t""defining mandir to be $mandir" 1>&4
! echo "$ac_t""defining infodir to be $infodir" 1>&4
! echo "$ac_t""defining fcnfiledir to be $fcnfiledir" 1>&4
! echo "$ac_t""defining localfcnfiledir to be $localfcnfiledir" 1>&4
! echo "$ac_t""defining localfcnfilepath to be $localfcnfilepath" 1>&4
! echo "$ac_t""defining archlibdir to be $archlibdir" 1>&4
! echo "$ac_t""defining octfiledir to be $octfiledir" 1>&4
! echo "$ac_t""defining localoctfiledir to be $localoctfiledir" 1>&4
! echo "$ac_t""defining localoctfilepath to be $localoctfilepath" 1>&4
! echo "$ac_t""defining fcnfilepath to be $fcnfilepath" 1>&4
! echo "$ac_t""defining imagedir to be $imagedir" 1>&4
! echo "$ac_t""defining imagepath to be $imagepath" 1>&4



--- 534,557 ----
  imagedir='$(datadir)/octave/$(version)/imagelib'
  imagepath='.:$(imagedir)//'

! /bin/echo "$ac_t""defining prefix to be $prefix" 1>&4
! /bin/echo "$ac_t""defining exec_prefix to be $exec_prefix" 1>&4
! /bin/echo "$ac_t""defining bindir to be $bindir" 1>&4
! /bin/echo "$ac_t""defining datadir to be $datadir" 1>&4
! /bin/echo "$ac_t""defining libdir to be $libdir" 1>&4
! /bin/echo "$ac_t""defining includedir to be $includedir" 1>&4
! /bin/echo "$ac_t""defining mandir to be $mandir" 1>&4
! /bin/echo "$ac_t""defining infodir to be $infodir" 1>&4
! /bin/echo "$ac_t""defining fcnfiledir to be $fcnfiledir" 1>&4
! /bin/echo "$ac_t""defining localfcnfiledir to be $localfcnfiledir" 1>&4
! /bin/echo "$ac_t""defining localfcnfilepath to be $localfcnfilepath" 1>&4
! /bin/echo "$ac_t""defining archlibdir to be $archlibdir" 1>&4
! /bin/echo "$ac_t""defining octfiledir to be $octfiledir" 1>&4
! /bin/echo "$ac_t""defining localoctfiledir to be $localoctfiledir" 1>&4
! /bin/echo "$ac_t""defining localoctfilepath to be $localoctfilepath" 1>&4
! /bin/echo "$ac_t""defining fcnfilepath to be $fcnfilepath" 1>&4
! /bin/echo "$ac_t""defining imagedir to be $imagedir" 1>&4
! /bin/echo "$ac_t""defining imagepath to be $imagepath" 1>&4



***************
*** 610,625 ****
  esac

  if test -n "$DLD_DIR"; then
!   echo "$ac_t""defining DLD_DIR to be $DLD_DIR" 1>&4
  fi
  if test -n "$LIBDLD"; then
!   echo "$ac_t""defining LIBDLD to be $LIBDLD" 1>&4
  fi
  if test -n "$LIBOCTDLD"; then
!   echo "$ac_t""defining LIBOCTDLD to be $LIBOCTDLD" 1>&4
  fi
  if test -n "$LD_STATIC_FLAG"; then
!   echo "$ac_t""defining LD_STATIC_FLAG to be $LD_STATIC_FLAG" 1>&4
  fi


--- 611,626 ----
  esac

  if test -n "$DLD_DIR"; then
!   /bin/echo "$ac_t""defining DLD_DIR to be $DLD_DIR" 1>&4
  fi
  if test -n "$LIBDLD"; then
!   /bin/echo "$ac_t""defining LIBDLD to be $LIBDLD" 1>&4
  fi
  if test -n "$LIBOCTDLD"; then
!   /bin/echo "$ac_t""defining LIBOCTDLD to be $LIBOCTDLD" 1>&4
  fi
  if test -n "$LD_STATIC_FLAG"; then
!   /bin/echo "$ac_t""defining LD_STATIC_FLAG to be $LD_STATIC_FLAG" 1>&4
  fi


***************
*** 628,660 ****

  ### See if the optional nonlinear programming code is present.

! echo $ac_n "checking for npsol""... $ac_c" 1>&4
  if test -f $srcdir/libcruft/npsol/npsol.f; then
!   echo "$ac_t""yes" 1>&4
  else
!   echo "$ac_t""no" 1>&4
    cat >> confdefs.h <<\EOF
  #define NPSOL_MISSING 1
  EOF

  fi

! echo $ac_n "checking for qpsol""... $ac_c" 1>&4
  if test -f $srcdir/libcruft/qpsol/qpsol.f; then
!   echo "$ac_t""yes" 1>&4
  else
!   echo "$ac_t""no" 1>&4
    cat >> confdefs.h <<\EOF
  #define QPSOL_MISSING 1
  EOF

  fi

! echo $ac_n "checking for fsqp""... $ac_c" 1>&4
  if test -f $srcdir/libcruft/fsqp/fsqpd.f; then
!   echo "$ac_t""yes" 1>&4
  else
!   echo "$ac_t""no" 1>&4
    cat >> confdefs.h <<\EOF
  #define FSQP_MISSING 1
  EOF
--- 629,661 ----

  ### See if the optional nonlinear programming code is present.

! /bin/echo $ac_n "checking for npsol""... $ac_c" 1>&4
  if test -f $srcdir/libcruft/npsol/npsol.f; then
!   /bin/echo "$ac_t""yes" 1>&4
  else
!   /bin/echo "$ac_t""no" 1>&4
    cat >> confdefs.h <<\EOF
  #define NPSOL_MISSING 1
  EOF

  fi

! /bin/echo $ac_n "checking for qpsol""... $ac_c" 1>&4
  if test -f $srcdir/libcruft/qpsol/qpsol.f; then
!   /bin/echo "$ac_t""yes" 1>&4
  else
!   /bin/echo "$ac_t""no" 1>&4
    cat >> confdefs.h <<\EOF
  #define QPSOL_MISSING 1
  EOF

  fi

! /bin/echo $ac_n "checking for fsqp""... $ac_c" 1>&4
  if test -f $srcdir/libcruft/fsqp/fsqpd.f; then
!   /bin/echo "$ac_t""yes" 1>&4
  else
!   /bin/echo "$ac_t""no" 1>&4
    cat >> confdefs.h <<\EOF
  #define FSQP_MISSING 1
  EOF
***************
*** 667,675 ****
  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>&4
  if eval "test \"`echo '${'ac_cv_prog_CXX'+set}'`\" = set"; then
!   echo $ac_n "(cached) $ac_c" 1>&4
  else
    if test -n "$CXX"; then
    ac_cv_prog_CXX="$CXX" # Let the user override the test.
--- 668,676 ----
  do
  # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
! /bin/echo $ac_n "checking for $ac_word""... $ac_c" 1>&4
  if eval "test \"`echo '${'ac_cv_prog_CXX'+set}'`\" = set"; then
!   /bin/echo $ac_n "(cached) $ac_c" 1>&4
  else
    if test -n "$CXX"; then
    ac_cv_prog_CXX="$CXX" # Let the user override the test.
***************
*** 687,695 ****
  fi
  CXX="$ac_cv_prog_CXX"
  if test -n "$CXX"; then
!   echo "$ac_t""$CXX" 1>&4
  else
!   echo "$ac_t""no" 1>&4
  fi

  test -n "$CXX" && break
--- 688,696 ----
  fi
  CXX="$ac_cv_prog_CXX"
  if test -n "$CXX"; then
!   /bin/echo "$ac_t""$CXX" 1>&4
  else
!   /bin/echo "$ac_t""no" 1>&4
  fi

  test -n "$CXX" && break
***************
*** 697,705 ****
  test -n "$CXX" || CXX="gcc"


! echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&4
  if eval "test \"`echo '${'ac_cv_prog_gxx'+set}'`\" = set"; then
!   echo $ac_n "(cached) $ac_c" 1>&4
  else
    cat > conftest.C <<EOF
  #ifdef __GNUC__
--- 698,706 ----
  test -n "$CXX" || CXX="gcc"


! /bin/echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&4
  if eval "test \"`echo '${'ac_cv_prog_gxx'+set}'`\" = set"; then
!   /bin/echo $ac_n "(cached) $ac_c" 1>&4
  else
    cat > conftest.C <<EOF
  #ifdef __GNUC__
***************
*** 712,724 ****
    ac_cv_prog_gxx=no
  fi
  fi
! echo "$ac_t""$ac_cv_prog_gxx" 1>&4
  if test $ac_cv_prog_gxx = yes; then
    GXX=yes
    if test "${CXXFLAGS+set}" != set; then
!     echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&4
  if eval "test \"`echo '${'ac_cv_prog_gxx_g'+set}'`\" = set"; then
!   echo $ac_n "(cached) $ac_c" 1>&4
  else
    echo 'void f(){}' > conftest.cc
  if test -z "`${CXX-g++} -g -c conftest.cc 2>&1`"; then
--- 713,725 ----
    ac_cv_prog_gxx=no
  fi
  fi
! /bin/echo "$ac_t""$ac_cv_prog_gxx" 1>&4
  if test $ac_cv_prog_gxx = yes; then
    GXX=yes
    if test "${CXXFLAGS+set}" != set; then
!     /bin/echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&4
  if eval "test \"`echo '${'ac_cv_prog_gxx_g'+set}'`\" = set"; then
!   /bin/echo $ac_n "(cached) $ac_c" 1>&4
  else
    echo 'void f(){}' > conftest.cc
  if test -z "`${CXX-g++} -g -c conftest.cc 2>&1`"; then
***************
*** 729,739 ****
  rm -f conftest*

  fi
!     echo "$ac_t""$ac_cv_prog_gxx_g" 1>&4
      if test $ac_cv_prog_gxx_g = yes; then
!       CXXFLAGS="-g -O"
      else
!       CXXFLAGS="-O"
      fi
    fi
  else
--- 730,742 ----
  rm -f conftest*

  fi
!     /bin/echo "$ac_t""$ac_cv_prog_gxx_g" 1>&4
      if test $ac_cv_prog_gxx_g = yes; then
!       # Amiga hack - suppress automatically using -g for now
!       # Also default to using -O2
!       CXXFLAGS="-O2"
      else
!       CXXFLAGS="-O2"
      fi
    fi
  else
***************
*** 741,750 ****
    test "${CXXFLAGS+set}" = set || CXXFLAGS="-g"
  fi

! echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&4
  if test -z "$CXXCPP"; then
  if eval "test \"`echo '${'ac_cv_prog_CXXCPP'+set}'`\" = set"; then
!   echo $ac_n "(cached) $ac_c" 1>&4
  else
    ac_ext=C
  # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
--- 744,753 ----
    test "${CXXFLAGS+set}" = set || CXXFLAGS="-g"
  fi

! /bin/echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&4
  if test -z "$CXXCPP"; then
  if eval "test \"`echo '${'ac_cv_prog_CXXCPP'+set}'`\" = set"; then
!   /bin/echo $ac_n "(cached) $ac_c" 1>&4
  else
    ac_ext=C
  # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
***************
*** 753,759 ****
  ac_link='${CXX-g++} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext -o conftest $LIBS 1>&5 2>&5'
    CXXCPP="${CXX-g++} -E"
    cat > conftest.$ac_ext <<EOF
! #line 757 "configure"
  #include "confdefs.h"
  #include <stdlib.h>
  EOF
--- 756,762 ----
  ac_link='${CXX-g++} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext -o conftest $LIBS 1>&5 2>&5'
    CXXCPP="${CXX-g++} -E"
    cat > conftest.$ac_ext <<EOF
! #line 759 "configure"
  #include "confdefs.h"
  #include <stdlib.h>
  EOF
***************
*** 762,768 ****
  if test -z "$ac_err"; then
    :
  else
!   echo "$ac_err" >&5
    rm -rf conftest*
    CXXCPP=/lib/cpp
  fi
--- 765,771 ----
  if test -z "$ac_err"; then
    :
  else
!   /bin/echo "$ac_err" >&5
    rm -rf conftest*
    CXXCPP=/lib/cpp
  fi
***************
*** 776,782 ****
  fi
  fi
  CXXCPP="$ac_cv_prog_CXXCPP"
! echo "$ac_t""$CXXCPP" 1>&4


  ### Do special things for g++.
--- 779,785 ----
  fi
  fi
  CXXCPP="$ac_cv_prog_CXXCPP"
! /bin/echo "$ac_t""$CXXCPP" 1>&4


  ### Do special things for g++.
***************
*** 787,798 ****
  case "$gxx_version" in
    2.[6789].*|2.[123456789][0123456789].*)
      if test -z "$CXXFLAGS"; then
!       CXXFLAGS="-g -O"
!       echo "$ac_t""defining CXXFLAGS to be $CXXFLAGS" 1>&4
        ADD_CXX_WALL=true
      fi
      NO_IMPLICIT_TEMPLATES="-fno-implicit-templates"
!     echo "$ac_t""defining NO_IMPLICIT_TEMPLATES to be $NO_IMPLICIT_TEMPLATES" 1>&4
    ;;
    1.*|2.[012345].*)
      echo "configure: warning: g++ version $gxx_version will not work to compile Octave" 1>&2
--- 790,801 ----
  case "$gxx_version" in
    2.[6789].*|2.[123456789][0123456789].*)
      if test -z "$CXXFLAGS"; then
!       CXXFLAGS="-O"
!       /bin/echo "$ac_t""defining CXXFLAGS to be $CXXFLAGS" 1>&4
        ADD_CXX_WALL=true
      fi
      NO_IMPLICIT_TEMPLATES="-fno-implicit-templates"
!     /bin/echo "$ac_t""defining NO_IMPLICIT_TEMPLATES to be $NO_IMPLICIT_TEMPLATES" 1>&4
    ;;
    1.*|2.[012345].*)
      echo "configure: warning: g++ version $gxx_version will not work to compile Octave" 1>&2
***************
*** 808,814 ****
      case "$canonical_host_type" in
        rs6000-ibm-aix*)
          HOST_CXXFLAGS="-Wa,-u"
!         echo "$ac_t""defining HOST_CXXFLAGS to be $HOST_CXXFLAGS" 1>&4
        ;;
      esac
    ;;
--- 811,817 ----
      case "$canonical_host_type" in
        rs6000-ibm-aix*)
          HOST_CXXFLAGS="-Wa,-u"
!         /bin/echo "$ac_t""defining HOST_CXXFLAGS to be $HOST_CXXFLAGS" 1>&4
        ;;
      esac
    ;;
***************
*** 820,826 ****
  ### dynamic linking.

  CXXLIBS=`sh $srcdir/cxxlibs.sh`
! echo "$ac_t""defining CXXLIBS to be $CXXLIBS" 1>&4



--- 823,829 ----
  ### dynamic linking.

  CXXLIBS=`sh $srcdir/cxxlibs.sh`
! /bin/echo "$ac_t""defining CXXLIBS to be $CXXLIBS" 1>&4



***************
*** 830,838 ****

  # 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>&4
  if eval "test \"`echo '${'ac_cv_prog_CC'+set}'`\" = set"; then
!   echo $ac_n "(cached) $ac_c" 1>&4
  else
    if test -n "$CC"; then
    ac_cv_prog_CC="$CC" # Let the user override the test.
--- 833,841 ----

  # Extract the first word of "gcc", so it can be a program name with args.
  set dummy gcc; ac_word=$2
! /bin/echo $ac_n "checking for $ac_word""... $ac_c" 1>&4
  if eval "test \"`echo '${'ac_cv_prog_CC'+set}'`\" = set"; then
!   /bin/echo $ac_n "(cached) $ac_c" 1>&4
  else
    if test -n "$CC"; then
    ac_cv_prog_CC="$CC" # Let the user override the test.
***************
*** 851,865 ****
  fi
  CC="$ac_cv_prog_CC"
  if test -n "$CC"; then
!   echo "$ac_t""$CC" 1>&4
  else
!   echo "$ac_t""no" 1>&4
  fi


! echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&4
  if eval "test \"`echo '${'ac_cv_prog_gcc'+set}'`\" = set"; then
!   echo $ac_n "(cached) $ac_c" 1>&4
  else
    cat > conftest.c <<EOF
  #ifdef __GNUC__
--- 854,868 ----
  fi
  CC="$ac_cv_prog_CC"
  if test -n "$CC"; then
!   /bin/echo "$ac_t""$CC" 1>&4
  else
!   /bin/echo "$ac_t""no" 1>&4
  fi


! /bin/echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&4
  if eval "test \"`echo '${'ac_cv_prog_gcc'+set}'`\" = set"; then
!   /bin/echo $ac_n "(cached) $ac_c" 1>&4
  else
    cat > conftest.c <<EOF
  #ifdef __GNUC__
***************
*** 872,884 ****
    ac_cv_prog_gcc=no
  fi
  fi
! echo "$ac_t""$ac_cv_prog_gcc" 1>&4
  if test $ac_cv_prog_gcc = yes; then
    GCC=yes
    if test "${CFLAGS+set}" != set; then
!     echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&4
  if eval "test \"`echo '${'ac_cv_prog_gcc_g'+set}'`\" = set"; then
!   echo $ac_n "(cached) $ac_c" 1>&4
  else
    echo 'void f(){}' > conftest.c
  if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
--- 875,887 ----
    ac_cv_prog_gcc=no
  fi
  fi
! /bin/echo "$ac_t""$ac_cv_prog_gcc" 1>&4
  if test $ac_cv_prog_gcc = yes; then
    GCC=yes
    if test "${CFLAGS+set}" != set; then
!     /bin/echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&4
  if eval "test \"`echo '${'ac_cv_prog_gcc_g'+set}'`\" = set"; then
!   /bin/echo $ac_n "(cached) $ac_c" 1>&4
  else
    echo 'void f(){}' > conftest.c
  if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
***************
*** 889,899 ****
  rm -f conftest*

  fi
!     echo "$ac_t""$ac_cv_prog_gcc_g" 1>&4
      if test $ac_cv_prog_gcc_g = yes; then
!       CFLAGS="-g -O"
      else
!       CFLAGS="-O"
      fi
    fi
  else
--- 892,904 ----
  rm -f conftest*

  fi
!     /bin/echo "$ac_t""$ac_cv_prog_gcc_g" 1>&4
      if test $ac_cv_prog_gcc_g = yes; then
!       # Amiga hack - suppress automatically using -g for now
!       # Also default to using -O2
!       CFLAGS="-O2"
      else
!       CFLAGS="-O2"
      fi
    fi
  else
***************
*** 901,914 ****
    test "${CFLAGS+set}" = set || CFLAGS="-g"
  fi

! echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&4
  # On Suns, sometimes $CPP names a directory.
  if test -n "$CPP" && test -d "$CPP"; then
    CPP=
  fi
  if test -z "$CPP"; then
  if eval "test \"`echo '${'ac_cv_prog_CPP'+set}'`\" = set"; then
!   echo $ac_n "(cached) $ac_c" 1>&4
  else
      # This must be in double quotes, not single quotes, because CPP may get
    # substituted into the Makefile and "${CC-cc}" will confuse make.
--- 906,919 ----
    test "${CFLAGS+set}" = set || CFLAGS="-g"
  fi

! /bin/echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&4
  # On Suns, sometimes $CPP names a directory.
  if test -n "$CPP" && test -d "$CPP"; then
    CPP=
  fi
  if test -z "$CPP"; then
  if eval "test \"`echo '${'ac_cv_prog_CPP'+set}'`\" = set"; then
!   /bin/echo $ac_n "(cached) $ac_c" 1>&4
  else
      # This must be in double quotes, not single quotes, because CPP may get
    # substituted into the Makefile and "${CC-cc}" will confuse make.
***************
*** 916,922 ****
    # On the NeXT, cc -E runs the code through the compiler's parser,
    # not just through cpp.
    cat > conftest.$ac_ext <<EOF
! #line 920 "configure"
  #include "confdefs.h"
  #include <assert.h>
  Syntax Error
--- 921,927 ----
    # On the NeXT, cc -E runs the code through the compiler's parser,
    # not just through cpp.
    cat > conftest.$ac_ext <<EOF
! #line 924 "configure"
  #include "confdefs.h"
  #include <assert.h>
  Syntax Error
***************
*** 926,936 ****
  if test -z "$ac_err"; then
    :
  else
!   echo "$ac_err" >&5
    rm -rf conftest*
    CPP="${CC-cc} -E -traditional-cpp"
    cat > conftest.$ac_ext <<EOF
! #line 934 "configure"
  #include "confdefs.h"
  #include <assert.h>
  Syntax Error
--- 931,941 ----
  if test -z "$ac_err"; then
    :
  else
!   /bin/echo "$ac_err" >&5
    rm -rf conftest*
    CPP="${CC-cc} -E -traditional-cpp"
    cat > conftest.$ac_ext <<EOF
! #line 938 "configure"
  #include "confdefs.h"
  #include <assert.h>
  Syntax Error
***************
*** 940,946 ****
  if test -z "$ac_err"; then
    :
  else
!   echo "$ac_err" >&5
    rm -rf conftest*
    CPP=/lib/cpp
  fi
--- 945,951 ----
  if test -z "$ac_err"; then
    :
  else
!   /bin/echo "$ac_err" >&5
    rm -rf conftest*
    CPP=/lib/cpp
  fi
***************
*** 951,966 ****
  fi
  fi
  CPP="$ac_cv_prog_CPP"
! echo "$ac_t""$CPP" 1>&4

  if test $ac_cv_prog_gcc = yes; then
!   echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&4
  if eval "test \"`echo '${'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then
!   echo $ac_n "(cached) $ac_c" 1>&4
  else
      ac_pattern="Autoconf.*'x'"
    cat > conftest.$ac_ext <<EOF
! #line 964 "configure"
  #include "confdefs.h"
  #include <sgtty.h>
  Autoconf TIOCGETP
--- 956,971 ----
  fi
  fi
  CPP="$ac_cv_prog_CPP"
! /bin/echo "$ac_t""$CPP" 1>&4

  if test $ac_cv_prog_gcc = yes; then
!   /bin/echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&4
  if eval "test \"`echo '${'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then
!   /bin/echo $ac_n "(cached) $ac_c" 1>&4
  else
      ac_pattern="Autoconf.*'x'"
    cat > conftest.$ac_ext <<EOF
! #line 968 "configure"
  #include "confdefs.h"
  #include <sgtty.h>
  Autoconf TIOCGETP
***************
*** 978,984 ****

    if test $ac_cv_prog_gcc_traditional = no; then
      cat > conftest.$ac_ext <<EOF
! #line 982 "configure"
  #include "confdefs.h"
  #include <termio.h>
  Autoconf TCGETA
--- 983,989 ----

    if test $ac_cv_prog_gcc_traditional = no; then
      cat > conftest.$ac_ext <<EOF
! #line 986 "configure"
  #include "confdefs.h"
  #include <termio.h>
  Autoconf TCGETA
***************
*** 992,998 ****

    fi
  fi
!   echo "$ac_t""$ac_cv_prog_gcc_traditional" 1>&4
    if test $ac_cv_prog_gcc_traditional = yes; then
      CC="$CC -traditional"
    fi
--- 997,1003 ----

    fi
  fi
!   /bin/echo "$ac_t""$ac_cv_prog_gcc_traditional" 1>&4
    if test $ac_cv_prog_gcc_traditional = yes; then
      CC="$CC -traditional"
    fi
***************
*** 1006,1018 ****
  case "$gcc_version" in
    2.*)
      if test -z "$CFLAGS"; then
!       CFLAGS="-g -O"
!       echo "$ac_t""defining CFLAGS to be $CFLAGS" 1>&4
        ADD_CC_WALL=true
      fi
      if test -z "$LDFLAGS"; then
!       LDFLAGS="-g"
!       echo "$ac_t""defining LDFLAGS to be $LDFLAGS" 1>&4
      fi
    ;;
    1.*)
--- 1011,1023 ----
  case "$gcc_version" in
    2.*)
      if test -z "$CFLAGS"; then
!       CFLAGS="-O"
!       /bin/echo "$ac_t""defining CFLAGS to be $CFLAGS" 1>&4
        ADD_CC_WALL=true
      fi
      if test -z "$LDFLAGS"; then
!       LDFLAGS="-s"    # Amiga version won't run if not stripped -FIXME!
!       /bin/echo "$ac_t""defining LDFLAGS to be $LDFLAGS" 1>&4
      fi
    ;;
    1.*)
***************
*** 1032,1038 ****
  case "$canonical_host_type" in
    i386-*-linux | i486-*-linux | i586-*-linux)
      GCC_IEEE_FP_FLAG="-mieee-fp"
!     echo "$ac_t""defining GCC_IEEE_FP_FLAG to be $GCC_IEEE_FP_FLAG" 1>&4
    ;;
  esac

--- 1037,1043 ----
  case "$canonical_host_type" in
    i386-*-linux | i486-*-linux | i586-*-linux)
      GCC_IEEE_FP_FLAG="-mieee-fp"
!     /bin/echo "$ac_t""defining GCC_IEEE_FP_FLAG to be $GCC_IEEE_FP_FLAG" 1>&4
    ;;
  esac

***************
*** 1040,1050 ****

  ### Special checks for odd OS specific things.

! echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&4
! if test -d /etc/conf/kconfig.d &&
!   grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1
  then
!   echo "$ac_t""yes" 1>&4
    ISC=yes # If later tests want to check for ISC.
    cat >> confdefs.h <<\EOF
  #define _POSIX_SOURCE 1
--- 1045,1055 ----

  ### Special checks for odd OS specific things.

! /bin/echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&4
! if test -d /gnu/etc/conf/kconfig.d &&
!   grep _POSIX_VERSION /gnu/include/sys/unistd.h >/dev/null 2>&1
  then
!   /bin/echo "$ac_t""yes" 1>&4
    ISC=yes # If later tests want to check for ISC.
    cat >> confdefs.h <<\EOF
  #define _POSIX_SOURCE 1
***************
*** 1056,1072 ****
      CC="$CC -Xp"
    fi
  else
!   echo "$ac_t""no" 1>&4
    ISC=
  fi

! ac_safe=`echo "minix/config.h" | tr './\055' '___'`
! echo $ac_n "checking for minix/config.h""... $ac_c" 1>&4
  if eval "test \"`echo '${'ac_cv_header_$ac_safe'+set}'`\" = set"; then
!   echo $ac_n "(cached) $ac_c" 1>&4
  else
    cat > conftest.$ac_ext <<EOF
! #line 1070 "configure"
  #include "confdefs.h"
  #include <minix/config.h>
  EOF
--- 1061,1077 ----
      CC="$CC -Xp"
    fi
  else
!   /bin/echo "$ac_t""no" 1>&4
    ISC=
  fi

! ac_safe=`/bin/echo "minix/config.h" | tr './\055' '___'`
! /bin/echo $ac_n "checking for minix/config.h""... $ac_c" 1>&4
  if eval "test \"`echo '${'ac_cv_header_$ac_safe'+set}'`\" = set"; then
!   /bin/echo $ac_n "(cached) $ac_c" 1>&4
  else
    cat > conftest.$ac_ext <<EOF
! #line 1074 "configure"
  #include "confdefs.h"
  #include <minix/config.h>
  EOF
***************
*** 1076,1092 ****
    rm -rf conftest*
    eval "ac_cv_header_$ac_safe=yes"
  else
!   echo "$ac_err" >&5
    rm -rf conftest*
    eval "ac_cv_header_$ac_safe=no"
  fi
  rm -f conftest*
  fi
  if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
!   echo "$ac_t""yes" 1>&4
    MINIX=yes
  else
!   echo "$ac_t""no" 1>&4
  MINIX=
  fi

--- 1081,1097 ----
    rm -rf conftest*
    eval "ac_cv_header_$ac_safe=yes"
  else
!   /bin/echo "$ac_err" >&5
    rm -rf conftest*
    eval "ac_cv_header_$ac_safe=no"
  fi
  rm -f conftest*
  fi
  if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
!   /bin/echo "$ac_t""yes" 1>&4
    MINIX=yes
  else
!   /bin/echo "$ac_t""no" 1>&4
  MINIX=
  fi

***************
*** 1105,1113 ****

  fi

! echo $ac_n "checking for AIX""... $ac_c" 1>&4
  cat > conftest.$ac_ext <<EOF
! #line 1111 "configure"
  #include "confdefs.h"
  #ifdef _AIX
    yes
--- 1110,1118 ----

  fi

! /bin/echo $ac_n "checking for AIX""... $ac_c" 1>&4
  cat > conftest.$ac_ext <<EOF
! #line 1115 "configure"
  #include "confdefs.h"
  #ifdef _AIX
    yes
***************
*** 1117,1142 ****
  if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
    egrep "yes" >/dev/null 2>&1; then
    rm -rf conftest*
!   echo "$ac_t""yes" 1>&4; cat >> confdefs.h <<\EOF
  #define _ALL_SOURCE 1
  EOF

  else
    rm -rf conftest*
!   echo "$ac_t""no" 1>&4
  fi
  rm -f conftest*


  # strftime is in -lintl on SCO UNIX.
! echo $ac_n "checking for -lintl""... $ac_c" 1>&4
  if eval "test \"`echo '${'ac_cv_lib_intl'+set}'`\" = set"; then
!   echo $ac_n "(cached) $ac_c" 1>&4
  else
    ac_save_LIBS="$LIBS"
  LIBS="$LIBS -lintl "
  cat > conftest.$ac_ext <<EOF
! #line 1140 "configure"
  #include "confdefs.h"

  int main() { return 0; }
--- 1122,1147 ----
  if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
    egrep "yes" >/dev/null 2>&1; then
    rm -rf conftest*
!   /bin/echo "$ac_t""yes" 1>&4; cat >> confdefs.h <<\EOF
  #define _ALL_SOURCE 1
  EOF

  else
    rm -rf conftest*
!   /bin/echo "$ac_t""no" 1>&4
  fi
  rm -f conftest*


  # strftime is in -lintl on SCO UNIX.
! /bin/echo $ac_n "checking for -lintl""... $ac_c" 1>&4
  if eval "test \"`echo '${'ac_cv_lib_intl'+set}'`\" = set"; then
!   /bin/echo $ac_n "(cached) $ac_c" 1>&4
  else
    ac_save_LIBS="$LIBS"
  LIBS="$LIBS -lintl "
  cat > conftest.$ac_ext <<EOF
! #line 1144 "configure"
  #include "confdefs.h"

  int main() { return 0; }
***************
*** 1156,1173 ****

  fi
  if eval "test \"`echo '$ac_cv_lib_'intl`\" = yes"; then
!   echo "$ac_t""yes" 1>&4
    LIBS="$LIBS -lintl"
  else
!   echo "$ac_t""no" 1>&4
  fi

! echo $ac_n "checking for strftime""... $ac_c" 1>&4
  if eval "test \"`echo '${'ac_cv_func_strftime'+set}'`\" = set"; then
!   echo $ac_n "(cached) $ac_c" 1>&4
  else
    cat > conftest.$ac_ext <<EOF
! #line 1171 "configure"
  #include "confdefs.h"
  #include <ctype.h> /* Arbitrary system header to define __stub macros. */
  /* Override any gcc2 internal prototype to avoid an error.  */
--- 1161,1178 ----

  fi
  if eval "test \"`echo '$ac_cv_lib_'intl`\" = yes"; then
!   /bin/echo "$ac_t""yes" 1>&4
    LIBS="$LIBS -lintl"
  else
!   /bin/echo "$ac_t""no" 1>&4
  fi

! /bin/echo $ac_n "checking for strftime""... $ac_c" 1>&4
  if eval "test \"`echo '${'ac_cv_func_strftime'+set}'`\" = set"; then
!   /bin/echo $ac_n "(cached) $ac_c" 1>&4
  else
    cat > conftest.$ac_ext <<EOF
! #line 1175 "configure"
  #include "confdefs.h"
  #include <ctype.h> /* Arbitrary system header to define __stub macros. */
  /* Override any gcc2 internal prototype to avoid an error.  */
***************
*** 1198,1220 ****

  fi
  if eval "test \"`echo '$ac_cv_func_'strftime`\" = yes"; then
!   echo "$ac_t""yes" 1>&4
    cat >> confdefs.h <<\EOF
  #define HAVE_STRFTIME 1
  EOF

  else
!   echo "$ac_t""no" 1>&4
  fi

! echo $ac_n "checking for -lsun""... $ac_c" 1>&4
  if eval "test \"`echo '${'ac_cv_lib_sun'+set}'`\" = set"; then
!   echo $ac_n "(cached) $ac_c" 1>&4
  else
    ac_save_LIBS="$LIBS"
  LIBS="$LIBS -lsun "
  cat > conftest.$ac_ext <<EOF
! #line 1218 "configure"
  #include "confdefs.h"

  int main() { return 0; }
--- 1203,1225 ----

  fi
  if eval "test \"`echo '$ac_cv_func_'strftime`\" = yes"; then
!   /bin/echo "$ac_t""yes" 1>&4
    cat >> confdefs.h <<\EOF
  #define HAVE_STRFTIME 1
  EOF

  else
!   /bin/echo "$ac_t""no" 1>&4
  fi

! /bin/echo $ac_n "checking for -lsun""... $ac_c" 1>&4
  if eval "test \"`echo '${'ac_cv_lib_sun'+set}'`\" = set"; then
!   /bin/echo $ac_n "(cached) $ac_c" 1>&4
  else
    ac_save_LIBS="$LIBS"
  LIBS="$LIBS -lsun "
  cat > conftest.$ac_ext <<EOF
! #line 1222 "configure"
  #include "confdefs.h"

  int main() { return 0; }
***************
*** 1234,1241 ****

  fi
  if eval "test \"`echo '$ac_cv_lib_'sun`\" = yes"; then
!   echo "$ac_t""yes" 1>&4
!     ac_tr_lib=HAVE_LIB`echo sun | tr '[a-z]' '[A-Z]'`
    cat >> confdefs.h <<EOF
  #define $ac_tr_lib 1
  EOF
--- 1239,1246 ----

  fi
  if eval "test \"`echo '$ac_cv_lib_'sun`\" = yes"; then
!   /bin/echo "$ac_t""yes" 1>&4
!     ac_tr_lib=HAVE_LIB`/bin/echo sun | tr '[a-z]' '[A-Z]'`
    cat >> confdefs.h <<EOF
  #define $ac_tr_lib 1
  EOF
***************
*** 1243,1249 ****
    LIBS="$LIBS -lsun"

  else
!   echo "$ac_t""no" 1>&4
  fi


--- 1248,1254 ----
    LIBS="$LIBS -lsun"

  else
!   /bin/echo "$ac_t""no" 1>&4
  fi


***************
*** 1251,1265 ****
  ### be eliminated in favor of run-time checks.

  # If we cannot run a trivial program, we must be cross compiling.
! echo $ac_n "checking whether cross-compiling""... $ac_c" 1>&4
  if eval "test \"`echo '${'ac_cv_c_cross'+set}'`\" = set"; then
!   echo $ac_n "(cached) $ac_c" 1>&4
  else
    if test "$cross_compiling" = yes; then
    ac_cv_cross=yes
  else
  cat > conftest.$ac_ext <<EOF
! #line 1263 "configure"
  #include "confdefs.h"
  main(){return(0);}
  EOF
--- 1256,1270 ----
  ### be eliminated in favor of run-time checks.

  # If we cannot run a trivial program, we must be cross compiling.
! /bin/echo $ac_n "checking whether cross-compiling""... $ac_c" 1>&4
  if eval "test \"`echo '${'ac_cv_c_cross'+set}'`\" = set"; then
!   /bin/echo $ac_n "(cached) $ac_c" 1>&4
  else
    if test "$cross_compiling" = yes; then
    ac_cv_cross=yes
  else
  cat > conftest.$ac_ext <<EOF
! #line 1267 "configure"
  #include "confdefs.h"
  main(){return(0);}
  EOF
***************
*** 1273,1289 ****
  rm -fr conftest*
  fi
  cross_compiling=$ac_cv_c_cross
! echo "$ac_t""$ac_cv_c_cross" 1>&4

! echo $ac_n "checking size of short""... $ac_c" 1>&4
  if eval "test \"`echo '${'ac_cv_sizeof_short'+set}'`\" = set"; then
!   echo $ac_n "(cached) $ac_c" 1>&4
  else
    if test "$cross_compiling" = yes; then
      { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
  else
  cat > conftest.$ac_ext <<EOF
! #line 1287 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  main()
--- 1278,1294 ----
  rm -fr conftest*
  fi
  cross_compiling=$ac_cv_c_cross
! /bin/echo "$ac_t""$ac_cv_c_cross" 1>&4

! /bin/echo $ac_n "checking size of short""... $ac_c" 1>&4
  if eval "test \"`echo '${'ac_cv_sizeof_short'+set}'`\" = set"; then
!   /bin/echo $ac_n "(cached) $ac_c" 1>&4
  else
    if test "$cross_compiling" = yes; then
      { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
  else
  cat > conftest.$ac_ext <<EOF
! #line 1291 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  main()
***************
*** 1301,1321 ****
  fi
  rm -fr conftest*
  fi
! echo "$ac_t""$ac_cv_sizeof_short" 1>&4
  cat >> confdefs.h <<EOF
  #define SIZEOF_SHORT $ac_cv_sizeof_short
  EOF


! echo $ac_n "checking size of int""... $ac_c" 1>&4
  if eval "test \"`echo '${'ac_cv_sizeof_int'+set}'`\" = set"; then
!   echo $ac_n "(cached) $ac_c" 1>&4
  else
    if test "$cross_compiling" = yes; then
      { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
  else
  cat > conftest.$ac_ext <<EOF
! #line 1319 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  main()
--- 1306,1326 ----
  fi
  rm -fr conftest*
  fi
! /bin/echo "$ac_t""$ac_cv_sizeof_short" 1>&4
  cat >> confdefs.h <<EOF
  #define SIZEOF_SHORT $ac_cv_sizeof_short
  EOF


! /bin/echo $ac_n "checking size of int""... $ac_c" 1>&4
  if eval "test \"`echo '${'ac_cv_sizeof_int'+set}'`\" = set"; then
!   /bin/echo $ac_n "(cached) $ac_c" 1>&4
  else
    if test "$cross_compiling" = yes; then
      { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
  else
  cat > conftest.$ac_ext <<EOF
! #line 1323 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  main()
***************
*** 1333,1353 ****
  fi
  rm -fr conftest*
  fi
! echo "$ac_t""$ac_cv_sizeof_int" 1>&4
  cat >> confdefs.h <<EOF
  #define SIZEOF_INT $ac_cv_sizeof_int
  EOF


! echo $ac_n "checking size of long""... $ac_c" 1>&4
  if eval "test \"`echo '${'ac_cv_sizeof_long'+set}'`\" = set"; then
!   echo $ac_n "(cached) $ac_c" 1>&4
  else
    if test "$cross_compiling" = yes; then
      { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
  else
  cat > conftest.$ac_ext <<EOF
! #line 1351 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  main()
--- 1338,1358 ----
  fi
  rm -fr conftest*
  fi
! /bin/echo "$ac_t""$ac_cv_sizeof_int" 1>&4
  cat >> confdefs.h <<EOF
  #define SIZEOF_INT $ac_cv_sizeof_int
  EOF


! /bin/echo $ac_n "checking size of long""... $ac_c" 1>&4
  if eval "test \"`echo '${'ac_cv_sizeof_long'+set}'`\" = set"; then
!   /bin/echo $ac_n "(cached) $ac_c" 1>&4
  else
    if test "$cross_compiling" = yes; then
      { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
  else
  cat > conftest.$ac_ext <<EOF
! #line 1355 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  main()
***************
*** 1365,1385 ****
  fi
  rm -fr conftest*
  fi
! echo "$ac_t""$ac_cv_sizeof_long" 1>&4
  cat >> confdefs.h <<EOF
  #define SIZEOF_LONG $ac_cv_sizeof_long
  EOF


! echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&4
  if eval "test \"`echo '${'ac_cv_c_bigendian'+set}'`\" = set"; then
!   echo $ac_n "(cached) $ac_c" 1>&4
  else
    if test "$cross_compiling" = yes; then
      { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
  else
  cat > conftest.$ac_ext <<EOF
! #line 1383 "configure"
  #include "confdefs.h"
  main () {
    /* Are we little or big endian?  From Harbison&Steele.  */
--- 1370,1390 ----
  fi
  rm -fr conftest*
  fi
! /bin/echo "$ac_t""$ac_cv_sizeof_long" 1>&4
  cat >> confdefs.h <<EOF
  #define SIZEOF_LONG $ac_cv_sizeof_long
  EOF


! /bin/echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&4
  if eval "test \"`echo '${'ac_cv_c_bigendian'+set}'`\" = set"; then
!   /bin/echo $ac_n "(cached) $ac_c" 1>&4
  else
    if test "$cross_compiling" = yes; then
      { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
  else
  cat > conftest.$ac_ext <<EOF
! #line 1387 "configure"
  #include "confdefs.h"
  main () {
    /* Are we little or big endian?  From Harbison&Steele.  */
***************
*** 1401,1407 ****
  fi
  rm -fr conftest*
  fi
! echo "$ac_t""$ac_cv_c_bigendian" 1>&4
  if test $ac_cv_c_bigendian = yes; then
    cat >> confdefs.h <<\EOF
  #define WORDS_BIGENDIAN 1
--- 1406,1412 ----
  fi
  rm -fr conftest*
  fi
! /bin/echo "$ac_t""$ac_cv_c_bigendian" 1>&4
  if test $ac_cv_c_bigendian = yes; then
    cat >> confdefs.h <<\EOF
  #define WORDS_BIGENDIAN 1
***************
*** 1413,1453 ****
  ### Try to determine the floating point format.  This could probably
  ### be eliminated in favor of run-time checks.

! echo $ac_n "checking floating point format""... $ac_c" 1>&4
  XCFLAGS=`echo $CFLAGS | sed 's/-O[^ \t]*//'`
  ${CC-cc} -DDP $XCFLAGS $LDFLAGS $srcdir/float-type.c -o conftest >/dev/null 2>&1
  FLOAT_FORMAT=`./conftest`
  case "$FLOAT_FORMAT" in
    IEEE_BIG_ENDIAN)
!     echo "$ac_t""IEEE big endian" 1>&4
      cat >> confdefs.h <<\EOF
  #define IEEE_BIG_ENDIAN 1
  EOF

    ;;
    IEEE_LITTLE_ENDIAN)
!     echo "$ac_t""IEEE little endian" 1>&4
      cat >> confdefs.h <<\EOF
  #define IEEE_LITTLE_ENDIAN 1
  EOF

    ;;
    VAX_D_FLOAT)
!     echo "$ac_t""VAX D floating" 1>&4
      cat >> confdefs.h <<\EOF
  #define VAX_D_FLOAT 1
  EOF

    ;;
    VAX_G_FLOAT)
!     echo "$ac_t""VAX G floating" 1>&4
      cat >> confdefs.h <<\EOF
  #define VAX_G_FLOAT 1
  EOF

    ;;
    *)
!     echo "$ac_t""" 1>&4
      echo "configure: warning: "unrecognized floating point format!"" 1>&2
    ;;
  esac
--- 1418,1458 ----
  ### Try to determine the floating point format.  This could probably
  ### be eliminated in favor of run-time checks.

! /bin/echo $ac_n "checking floating point format""... $ac_c" 1>&4
  XCFLAGS=`echo $CFLAGS | sed 's/-O[^ \t]*//'`
  ${CC-cc} -DDP $XCFLAGS $LDFLAGS $srcdir/float-type.c -o conftest >/dev/null 2>&1
  FLOAT_FORMAT=`./conftest`
  case "$FLOAT_FORMAT" in
    IEEE_BIG_ENDIAN)
!     /bin/echo "$ac_t""IEEE big endian" 1>&4
      cat >> confdefs.h <<\EOF
  #define IEEE_BIG_ENDIAN 1
  EOF

    ;;
    IEEE_LITTLE_ENDIAN)
!     /bin/echo "$ac_t""IEEE little endian" 1>&4
      cat >> confdefs.h <<\EOF
  #define IEEE_LITTLE_ENDIAN 1
  EOF

    ;;
    VAX_D_FLOAT)
!     /bin/echo "$ac_t""VAX D floating" 1>&4
      cat >> confdefs.h <<\EOF
  #define VAX_D_FLOAT 1
  EOF

    ;;
    VAX_G_FLOAT)
!     /bin/echo "$ac_t""VAX G floating" 1>&4
      cat >> confdefs.h <<\EOF
  #define VAX_G_FLOAT 1
  EOF

    ;;
    *)
!     /bin/echo "$ac_t""" 1>&4
      echo "configure: warning: "unrecognized floating point format!"" 1>&2
    ;;
  esac
***************
*** 1456,1467 ****

  # 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>&4
  if eval "test \"`echo '${'ac_cv_header_alloca_h'+set}'`\" = set"; then
!   echo $ac_n "(cached) $ac_c" 1>&4
  else
    cat > conftest.$ac_ext <<EOF
! #line 1465 "configure"
  #include "confdefs.h"
  #include <alloca.h>
  int main() { return 0; }
--- 1461,1472 ----

  # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
  # for constant arguments.  Useless!
! /bin/echo $ac_n "checking for working alloca.h""... $ac_c" 1>&4
  if eval "test \"`echo '${'ac_cv_header_alloca_h'+set}'`\" = set"; then
!   /bin/echo $ac_n "(cached) $ac_c" 1>&4
  else
    cat > conftest.$ac_ext <<EOF
! #line 1469 "configure"
  #include "confdefs.h"
  #include <alloca.h>
  int main() { return 0; }
***************
*** 1479,1485 ****
  rm -f conftest*

  fi
! echo "$ac_t""$ac_cv_header_alloca_h" 1>&4
  if test $ac_cv_header_alloca_h = yes; then
    cat >> confdefs.h <<\EOF
  #define HAVE_ALLOCA_H 1
--- 1484,1490 ----
  rm -f conftest*

  fi
! /bin/echo "$ac_t""$ac_cv_header_alloca_h" 1>&4
  if test $ac_cv_header_alloca_h = yes; then
    cat >> confdefs.h <<\EOF
  #define HAVE_ALLOCA_H 1
***************
*** 1487,1498 ****

  fi

! echo $ac_n "checking for alloca""... $ac_c" 1>&4
  if eval "test \"`echo '${'ac_cv_func_alloca'+set}'`\" = set"; then
!   echo $ac_n "(cached) $ac_c" 1>&4
  else
    cat > conftest.$ac_ext <<EOF
! #line 1496 "configure"
  #include "confdefs.h"

  #ifdef __GNUC__
--- 1492,1503 ----

  fi

! /bin/echo $ac_n "checking for alloca""... $ac_c" 1>&4
  if eval "test \"`echo '${'ac_cv_func_alloca'+set}'`\" = set"; then
!   /bin/echo $ac_n "(cached) $ac_c" 1>&4
  else
    cat > conftest.$ac_ext <<EOF
! #line 1500 "configure"
  #include "confdefs.h"

  #ifdef __GNUC__
***************
*** 1526,1532 ****
  rm -f conftest*

  fi
! echo "$ac_t""$ac_cv_func_alloca" 1>&4
  if test $ac_cv_func_alloca = yes; then
    cat >> confdefs.h <<\EOF
  #define HAVE_ALLOCA 1
--- 1531,1537 ----
  rm -f conftest*

  fi
! /bin/echo "$ac_t""$ac_cv_func_alloca" 1>&4
  if test $ac_cv_func_alloca = yes; then
    cat >> confdefs.h <<\EOF
  #define HAVE_ALLOCA 1
***************
*** 1545,1556 ****
  EOF


! echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&4
  if eval "test \"`echo '${'ac_cv_os_cray'+set}'`\" = set"; then
!   echo $ac_n "(cached) $ac_c" 1>&4
  else
    cat > conftest.$ac_ext <<EOF
! #line 1554 "configure"
  #include "confdefs.h"
  #if defined(CRAY) && ! defined(CRAY2)
  webecray
--- 1550,1561 ----
  EOF


! /bin/echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&4
  if eval "test \"`echo '${'ac_cv_os_cray'+set}'`\" = set"; then
!   /bin/echo $ac_n "(cached) $ac_c" 1>&4
  else
    cat > conftest.$ac_ext <<EOF
! #line 1558 "configure"
  #include "confdefs.h"
  #if defined(CRAY) && ! defined(CRAY2)
  webecray
***************
*** 1570,1583 ****
  rm -f conftest*

  fi
! echo "$ac_t""$ac_cv_os_cray" 1>&4
  if test $ac_cv_os_cray = yes; then
! echo $ac_n "checking for _getb67""... $ac_c" 1>&4
  if eval "test \"`echo '${'ac_cv_func__getb67'+set}'`\" = set"; then
!   echo $ac_n "(cached) $ac_c" 1>&4
  else
    cat > conftest.$ac_ext <<EOF
! #line 1581 "configure"
  #include "confdefs.h"
  #include <ctype.h> /* Arbitrary system header to define __stub macros. */
  /* Override any gcc2 internal prototype to avoid an error.  */
--- 1575,1588 ----
  rm -f conftest*

  fi
! /bin/echo "$ac_t""$ac_cv_os_cray" 1>&4
  if test $ac_cv_os_cray = yes; then
! /bin/echo $ac_n "checking for _getb67""... $ac_c" 1>&4
  if eval "test \"`echo '${'ac_cv_func__getb67'+set}'`\" = set"; then
!   /bin/echo $ac_n "(cached) $ac_c" 1>&4
  else
    cat > conftest.$ac_ext <<EOF
! #line 1585 "configure"
  #include "confdefs.h"
  #include <ctype.h> /* Arbitrary system header to define __stub macros. */
  /* Override any gcc2 internal prototype to avoid an error.  */
***************
*** 1608,1626 ****

  fi
  if eval "test \"`echo '$ac_cv_func_'_getb67`\" = yes"; then
!   echo "$ac_t""yes" 1>&4
    cat >> confdefs.h <<\EOF
  #define CRAY_STACKSEG_END _getb67
  EOF

  else
!   echo "$ac_t""no" 1>&4
! echo $ac_n "checking for GETB67""... $ac_c" 1>&4
  if eval "test \"`echo '${'ac_cv_func_GETB67'+set}'`\" = set"; then
!   echo $ac_n "(cached) $ac_c" 1>&4
  else
    cat > conftest.$ac_ext <<EOF
! #line 1624 "configure"
  #include "confdefs.h"
  #include <ctype.h> /* Arbitrary system header to define __stub macros. */
  /* Override any gcc2 internal prototype to avoid an error.  */
--- 1613,1631 ----

  fi
  if eval "test \"`echo '$ac_cv_func_'_getb67`\" = yes"; then
!   /bin/echo "$ac_t""yes" 1>&4
    cat >> confdefs.h <<\EOF
  #define CRAY_STACKSEG_END _getb67
  EOF

  else
!   /bin/echo "$ac_t""no" 1>&4
! /bin/echo $ac_n "checking for GETB67""... $ac_c" 1>&4
  if eval "test \"`echo '${'ac_cv_func_GETB67'+set}'`\" = set"; then
!   /bin/echo $ac_n "(cached) $ac_c" 1>&4
  else
    cat > conftest.$ac_ext <<EOF
! #line 1628 "configure"
  #include "confdefs.h"
  #include <ctype.h> /* Arbitrary system header to define __stub macros. */
  /* Override any gcc2 internal prototype to avoid an error.  */
***************
*** 1651,1669 ****

  fi
  if eval "test \"`echo '$ac_cv_func_'GETB67`\" = yes"; then
!   echo "$ac_t""yes" 1>&4
    cat >> confdefs.h <<\EOF
  #define CRAY_STACKSEG_END GETB67
  EOF

  else
!   echo "$ac_t""no" 1>&4
! echo $ac_n "checking for getb67""... $ac_c" 1>&4
  if eval "test \"`echo '${'ac_cv_func_getb67'+set}'`\" = set"; then
!   echo $ac_n "(cached) $ac_c" 1>&4
  else
    cat > conftest.$ac_ext <<EOF
! #line 1667 "configure"
  #include "confdefs.h"
  #include <ctype.h> /* Arbitrary system header to define __stub macros. */
  /* Override any gcc2 internal prototype to avoid an error.  */
--- 1656,1674 ----

  fi
  if eval "test \"`echo '$ac_cv_func_'GETB67`\" = yes"; then
!   /bin/echo "$ac_t""yes" 1>&4
    cat >> confdefs.h <<\EOF
  #define CRAY_STACKSEG_END GETB67
  EOF

  else
!   /bin/echo "$ac_t""no" 1>&4
! /bin/echo $ac_n "checking for getb67""... $ac_c" 1>&4
  if eval "test \"`echo '${'ac_cv_func_getb67'+set}'`\" = set"; then
!   /bin/echo $ac_n "(cached) $ac_c" 1>&4
  else
    cat > conftest.$ac_ext <<EOF
! #line 1671 "configure"
  #include "confdefs.h"
  #include <ctype.h> /* Arbitrary system header to define __stub macros. */
  /* Override any gcc2 internal prototype to avoid an error.  */
***************
*** 1694,1706 ****

  fi
  if eval "test \"`echo '$ac_cv_func_'getb67`\" = yes"; then
!   echo "$ac_t""yes" 1>&4
    cat >> confdefs.h <<\EOF
  #define CRAY_STACKSEG_END getb67
  EOF

  else
!   echo "$ac_t""no" 1>&4
  fi

  fi
--- 1699,1711 ----

  fi
  if eval "test \"`echo '$ac_cv_func_'getb67`\" = yes"; then
!   /bin/echo "$ac_t""yes" 1>&4
    cat >> confdefs.h <<\EOF
  #define CRAY_STACKSEG_END getb67
  EOF

  else
!   /bin/echo "$ac_t""no" 1>&4
  fi

  fi
***************
*** 1709,1723 ****

  fi

! echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&4
  if eval "test \"`echo '${'ac_cv_c_stack_direction'+set}'`\" = set"; then
!   echo $ac_n "(cached) $ac_c" 1>&4
  else
    if test "$cross_compiling" = yes; then
    ac_cv_c_stack_direction=0
  else
  cat > conftest.$ac_ext <<EOF
! #line 1721 "configure"
  #include "confdefs.h"
  find_stack_direction ()
  {
--- 1714,1728 ----

  fi

! /bin/echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&4
  if eval "test \"`echo '${'ac_cv_c_stack_direction'+set}'`\" = set"; then
!   /bin/echo $ac_n "(cached) $ac_c" 1>&4
  else
    if test "$cross_compiling" = yes; then
    ac_cv_c_stack_direction=0
  else
  cat > conftest.$ac_ext <<EOF
! #line 1725 "configure"
  #include "confdefs.h"
  find_stack_direction ()
  {
***************
*** 1745,1751 ****
  fi
  rm -fr conftest*
  fi
! echo "$ac_t""$ac_cv_c_stack_direction" 1>&4
  cat >> confdefs.h <<EOF
  #define STACK_DIRECTION $ac_cv_c_stack_direction
  EOF
--- 1750,1756 ----
  fi
  rm -fr conftest*
  fi
! /bin/echo "$ac_t""$ac_cv_c_stack_direction" 1>&4
  cat >> confdefs.h <<EOF
  #define STACK_DIRECTION $ac_cv_c_stack_direction
  EOF
***************
*** 1766,1777 ****

  fi

! echo $ac_n "checking for working const""... $ac_c" 1>&4
  if eval "test \"`echo '${'ac_cv_c_const'+set}'`\" = set"; then
!   echo $ac_n "(cached) $ac_c" 1>&4
  else
    cat > conftest.$ac_ext <<EOF
! #line 1775 "configure"
  #include "confdefs.h"

  int main() { return 0; }
--- 1771,1782 ----

  fi

! /bin/echo $ac_n "checking for working const""... $ac_c" 1>&4
  if eval "test \"`echo '${'ac_cv_c_const'+set}'`\" = set"; then
!   /bin/echo $ac_n "(cached) $ac_c" 1>&4
  else
    cat > conftest.$ac_ext <<EOF
! #line 1779 "configure"
  #include "confdefs.h"

  int main() { return 0; }
***************
*** 1831,1837 ****
  rm -f conftest*

  fi
! echo "$ac_t""$ac_cv_c_const" 1>&4
  if test $ac_cv_c_const = no; then
    cat >> confdefs.h <<\EOF
  #define const
--- 1836,1842 ----
  rm -f conftest*

  fi
! /bin/echo "$ac_t""$ac_cv_c_const" 1>&4
  if test $ac_cv_c_const = no; then
    cat >> confdefs.h <<\EOF
  #define const
***************
*** 1859,1867 ****
  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>&4
  if eval "test \"`echo '${'ac_cv_prog_F77'+set}'`\" = set"; then
!   echo $ac_n "(cached) $ac_c" 1>&4
  else
    if test -n "$F77"; then
    ac_cv_prog_F77="$F77" # Let the user override the test.
--- 1864,1872 ----
  do
  # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
! /bin/echo $ac_n "checking for $ac_word""... $ac_c" 1>&4
  if eval "test \"`echo '${'ac_cv_prog_F77'+set}'`\" = set"; then
!   /bin/echo $ac_n "(cached) $ac_c" 1>&4
  else
    if test -n "$F77"; then
    ac_cv_prog_F77="$F77" # Let the user override the test.
***************
*** 1879,1887 ****
  fi
  F77="$ac_cv_prog_F77"
  if test -n "$F77"; then
!   echo "$ac_t""$F77" 1>&4
  else
!   echo "$ac_t""no" 1>&4
  fi

  test -n "$F77" && break
--- 1884,1892 ----
  fi
  F77="$ac_cv_prog_F77"
  if test -n "$F77"; then
!   /bin/echo "$ac_t""$F77" 1>&4
  else
!   /bin/echo "$ac_t""no" 1>&4
  fi

  test -n "$F77" && break
***************
*** 1892,1904 ****
    # whether it might be compatible with f2c.

    if test -n "$F77"; then
!     echo $ac_n "checking $F77/f2c compatibility""... $ac_c" 1>&4
      export F77
      export CC
      tmpdef=`sh $srcdir/f2c-compat.sh $srcdir/flibs.sh`
      status=$?
      if test $status -eq 0; then
!       echo "$ac_t""yes" 1>&4
        if test "$tmpdef" = '-DF77_APPEND_UNDERSCORE=1'; then
          cat >> confdefs.h <<\EOF
  #define F77_APPEND_UNDERSCORE 1
--- 1897,1909 ----
    # whether it might be compatible with f2c.

    if test -n "$F77"; then
!     /bin/echo $ac_n "checking $F77/f2c compatibility""... $ac_c" 1>&4
      export F77
      export CC
      tmpdef=`sh $srcdir/f2c-compat.sh $srcdir/flibs.sh`
      status=$?
      if test $status -eq 0; then
!       /bin/echo "$ac_t""yes" 1>&4
        if test "$tmpdef" = '-DF77_APPEND_UNDERSCORE=1'; then
          cat >> confdefs.h <<\EOF
  #define F77_APPEND_UNDERSCORE 1
***************
*** 1906,1912 ****

        fi
      else
!       echo "$ac_t""no" 1>&4
        F77=
      fi
    fi
--- 1911,1917 ----

        fi
      else
!       /bin/echo "$ac_t""no" 1>&4
        F77=
      fi
    fi
***************
*** 1918,1926 ****
  if test -z "$F77"; then
    # 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>&4
  if eval "test \"`echo '${'ac_cv_prog_F2C'+set}'`\" = set"; then
!   echo $ac_n "(cached) $ac_c" 1>&4
  else
    if test -n "$F2C"; then
    ac_cv_prog_F2C="$F2C" # Let the user override the test.
--- 1923,1931 ----
  if test -z "$F77"; then
    # Extract the first word of "f2c", so it can be a program name with args.
  set dummy f2c; ac_word=$2
! /bin/echo $ac_n "checking for $ac_word""... $ac_c" 1>&4
  if eval "test \"`echo '${'ac_cv_prog_F2C'+set}'`\" = set"; then
!   /bin/echo $ac_n "(cached) $ac_c" 1>&4
  else
    if test -n "$F2C"; then
    ac_cv_prog_F2C="$F2C" # Let the user override the test.
***************
*** 1938,1946 ****
  fi
  F2C="$ac_cv_prog_F2C"
  if test -n "$F2C"; then
!   echo "$ac_t""$F2C" 1>&4
  else
!   echo "$ac_t""no" 1>&4
  fi

  fi
--- 1943,1951 ----
  fi
  F2C="$ac_cv_prog_F2C"
  if test -n "$F2C"; then
!   /bin/echo "$ac_t""$F2C" 1>&4
  else
!   /bin/echo "$ac_t""no" 1>&4
  fi

  fi
***************
*** 1951,1974 ****

  if test -z "$FFLAGS"; then
    FFLAGS="-O"
!   echo "$ac_t""defining FFLAGS to be $FFLAGS" 1>&4
  fi

  if test -n "$F77"; then
    export F77
    FLIBS=`sh $srcdir/flibs.sh`
!   echo "$ac_t""defining FLIBS to be $FLIBS" 1>&4
    DOT_C_FROM_DOT_F_CMD=
    DOT_O_FROM_DOT_F_PAT=
  elif test -n "$F2C" || $use_f2c; then
!   echo $ac_n "checking for -lf2c""... $ac_c" 1>&4
  if eval "test \"`echo '${'ac_cv_lib_f2c'+set}'`\" = set"; then
!   echo $ac_n "(cached) $ac_c" 1>&4
  else
    ac_save_LIBS="$LIBS"
  LIBS="$LIBS -lf2c "
  cat > conftest.$ac_ext <<EOF
! #line 1972 "configure"
  #include "confdefs.h"

  int main() { return 0; }
--- 1956,1979 ----

  if test -z "$FFLAGS"; then
    FFLAGS="-O"
!   /bin/echo "$ac_t""defining FFLAGS to be $FFLAGS" 1>&4
  fi

  if test -n "$F77"; then
    export F77
    FLIBS=`sh $srcdir/flibs.sh`
!   /bin/echo "$ac_t""defining FLIBS to be $FLIBS" 1>&4
    DOT_C_FROM_DOT_F_CMD=
    DOT_O_FROM_DOT_F_PAT=
  elif test -n "$F2C" || $use_f2c; then
!   /bin/echo $ac_n "checking for -lf2c""... $ac_c" 1>&4
  if eval "test \"`echo '${'ac_cv_lib_f2c'+set}'`\" = set"; then
!   /bin/echo $ac_n "(cached) $ac_c" 1>&4
  else
    ac_save_LIBS="$LIBS"
  LIBS="$LIBS -lf2c "
  cat > conftest.$ac_ext <<EOF
! #line 1976 "configure"
  #include "confdefs.h"

  int main() { return 0; }
***************
*** 1988,2008 ****

  fi
  if eval "test \"`echo '$ac_cv_lib_'f2c`\" = yes"; then
!   echo "$ac_t""yes" 1>&4
    FLIBS=-lf2c
  else
!   echo "$ac_t""no" 1>&4
  fi

    if test -z "$FLIBS" ; then
!     echo $ac_n "checking for -lF77""... $ac_c" 1>&4
  if eval "test \"`echo '${'ac_cv_lib_F77'+set}'`\" = set"; then
!   echo $ac_n "(cached) $ac_c" 1>&4
  else
    ac_save_LIBS="$LIBS"
  LIBS="$LIBS -lF77 "
  cat > conftest.$ac_ext <<EOF
! #line 2006 "configure"
  #include "confdefs.h"

  int main() { return 0; }
--- 1993,2013 ----

  fi
  if eval "test \"`echo '$ac_cv_lib_'f2c`\" = yes"; then
!   /bin/echo "$ac_t""yes" 1>&4
    FLIBS=-lf2c
  else
!   /bin/echo "$ac_t""no" 1>&4
  fi

    if test -z "$FLIBS" ; then
!     /bin/echo $ac_n "checking for -lF77""... $ac_c" 1>&4
  if eval "test \"`echo '${'ac_cv_lib_F77'+set}'`\" = set"; then
!   /bin/echo $ac_n "(cached) $ac_c" 1>&4
  else
    ac_save_LIBS="$LIBS"
  LIBS="$LIBS -lF77 "
  cat > conftest.$ac_ext <<EOF
! #line 2010 "configure"
  #include "confdefs.h"

  int main() { return 0; }
***************
*** 2022,2042 ****

  fi
  if eval "test \"`echo '$ac_cv_lib_'F77`\" = yes"; then
!   echo "$ac_t""yes" 1>&4
    FLIBS=-lF77
  else
!   echo "$ac_t""no" 1>&4
  fi

      if test -n "$FLIBS" ; then
!       echo $ac_n "checking for -lI77""... $ac_c" 1>&4
  if eval "test \"`echo '${'ac_cv_lib_I77'+set}'`\" = set"; then
!   echo $ac_n "(cached) $ac_c" 1>&4
  else
    ac_save_LIBS="$LIBS"
  LIBS="$LIBS -lI77 "
  cat > conftest.$ac_ext <<EOF
! #line 2040 "configure"
  #include "confdefs.h"

  int main() { return 0; }
--- 2027,2047 ----

  fi
  if eval "test \"`echo '$ac_cv_lib_'F77`\" = yes"; then
!   /bin/echo "$ac_t""yes" 1>&4
    FLIBS=-lF77
  else
!   /bin/echo "$ac_t""no" 1>&4
  fi

      if test -n "$FLIBS" ; then
!       /bin/echo $ac_n "checking for -lI77""... $ac_c" 1>&4
  if eval "test \"`echo '${'ac_cv_lib_I77'+set}'`\" = set"; then
!   /bin/echo $ac_n "(cached) $ac_c" 1>&4
  else
    ac_save_LIBS="$LIBS"
  LIBS="$LIBS -lI77 "
  cat > conftest.$ac_ext <<EOF
! #line 2044 "configure"
  #include "confdefs.h"

  int main() { return 0; }
***************
*** 2056,2065 ****

  fi
  if eval "test \"`echo '$ac_cv_lib_'I77`\" = yes"; then
!   echo "$ac_t""yes" 1>&4
    FLIBS="$FLIBS -lI77"
  else
!   echo "$ac_t""no" 1>&4
  fi

      fi
--- 2061,2070 ----

  fi
  if eval "test \"`echo '$ac_cv_lib_'I77`\" = yes"; then
!   /bin/echo "$ac_t""yes" 1>&4
    FLIBS="$FLIBS -lI77"
  else
!   /bin/echo "$ac_t""no" 1>&4
  fi

      fi
***************
*** 2068,2076 ****
      echo "configure: warning: I found f2c but not libf2c.a, or libF77.a and libI77.a" 1>&2
    fi
    DOT_C_FROM_DOT_F_CMD='    cat $< | $(F2C) $(F2CFLAGS) > $(@F)'
!   echo "$ac_t""defining DOT_C_FROM_DOT_F_CMD to be $DOT_C_FROM_DOT_F_CMD" 1>&4
    DOT_O_FROM_DOT_F_PAT='%.o : %.f'
!   echo "$ac_t""defining DOT_O_FROM_DOT_F_PAT to be $DOT_O_FROM_DOT_F_PAT" 1>&4
    cat >> confdefs.h <<\EOF
  #define F77_APPEND_UNDERSCORE 1
  EOF
--- 2073,2081 ----
      echo "configure: warning: I found f2c but not libf2c.a, or libF77.a and libI77.a" 1>&2
    fi
    DOT_C_FROM_DOT_F_CMD='    cat $< | $(F2C) $(F2CFLAGS) > $(@F)'
!   /bin/echo "$ac_t""defining DOT_C_FROM_DOT_F_CMD to be $DOT_C_FROM_DOT_F_CMD" 1>&4
    DOT_O_FROM_DOT_F_PAT='%.o : %.f'
!   /bin/echo "$ac_t""defining DOT_O_FROM_DOT_F_PAT to be $DOT_O_FROM_DOT_F_PAT" 1>&4
    cat >> confdefs.h <<\EOF
  #define F77_APPEND_UNDERSCORE 1
  EOF
***************
*** 2122,2132 ****
      -e 's/ [^ ]*\.o//g' \
      -e 's/^ *//' -e 's/ *$//' -e 's/  */:/g'`

! echo "$ac_t""defining FLIB_LIST to be $FLIB_LIST" 1>&4
! echo "$ac_t""defining FLIB_PATH to be $FLIB_PATH" 1>&4

! echo "$ac_t""defining CXXLIB_LIST to be $CXXLIB_LIST" 1>&4
! echo "$ac_t""defining CXXLIB_PATH to be $CXXLIB_PATH" 1>&4



--- 2127,2137 ----
      -e 's/ [^ ]*\.o//g' \
      -e 's/^ *//' -e 's/ *$//' -e 's/  */:/g'`

! /bin/echo "$ac_t""defining FLIB_LIST to be $FLIB_LIST" 1>&4
! /bin/echo "$ac_t""defining FLIB_PATH to be $FLIB_PATH" 1>&4

! /bin/echo "$ac_t""defining CXXLIB_LIST to be $CXXLIB_LIST" 1>&4
! /bin/echo "$ac_t""defining CXXLIB_PATH to be $CXXLIB_PATH" 1>&4



***************
*** 2136,2147 ****

  ### Checks for header files.

! echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&4
  if eval "test \"`echo '${'ac_cv_header_stdc'+set}'`\" = set"; then
!   echo $ac_n "(cached) $ac_c" 1>&4
  else
    cat > conftest.$ac_ext <<EOF
! #line 2145 "configure"
  #include "confdefs.h"
  #include <stdlib.h>
  #include <stdarg.h>
--- 2141,2152 ----

  ### Checks for header files.

! /bin/echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&4
  if eval "test \"`echo '${'ac_cv_header_stdc'+set}'`\" = set"; then
!   /bin/echo $ac_n "(cached) $ac_c" 1>&4
  else
    cat > conftest.$ac_ext <<EOF
! #line 2149 "configure"
  #include "confdefs.h"
  #include <stdlib.h>
  #include <stdarg.h>
***************
*** 2154,2160 ****
    rm -rf conftest*
    ac_cv_header_stdc=yes
  else
!   echo "$ac_err" >&5
    rm -rf conftest*
    ac_cv_header_stdc=no
  fi
--- 2159,2165 ----
    rm -rf conftest*
    ac_cv_header_stdc=yes
  else
!   /bin/echo "$ac_err" >&5
    rm -rf conftest*
    ac_cv_header_stdc=no
  fi
***************
*** 2163,2169 ****
  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
! #line 2167 "configure"
  #include "confdefs.h"
  #include <string.h>
  EOF
--- 2168,2174 ----
  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
! #line 2171 "configure"
  #include "confdefs.h"
  #include <string.h>
  EOF
***************
*** 2181,2187 ****
  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
! #line 2185 "configure"
  #include "confdefs.h"
  #include <stdlib.h>
  EOF
--- 2186,2192 ----
  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
! #line 2189 "configure"
  #include "confdefs.h"
  #include <stdlib.h>
  EOF
***************
*** 2202,2208 ****
    ac_cv_header_stdc=no
  else
  cat > conftest.$ac_ext <<EOF
! #line 2206 "configure"
  #include "confdefs.h"
  #include <ctype.h>
  #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
--- 2207,2213 ----
    ac_cv_header_stdc=no
  else
  cat > conftest.$ac_ext <<EOF
! #line 2210 "configure"
  #include "confdefs.h"
  #include <ctype.h>
  #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
***************
*** 2223,2229 ****
  rm -fr conftest*
  fi
  fi
! echo "$ac_t""$ac_cv_header_stdc" 1>&4
  if test $ac_cv_header_stdc = yes; then
    cat >> confdefs.h <<\EOF
  #define STDC_HEADERS 1
--- 2228,2234 ----
  rm -fr conftest*
  fi
  fi
! /bin/echo "$ac_t""$ac_cv_header_stdc" 1>&4
  if test $ac_cv_header_stdc = yes; then
    cat >> confdefs.h <<\EOF
  #define STDC_HEADERS 1
***************
*** 2233,2245 ****

  for ac_hdr in assert.h float.h limits.h memory.h pwd.h stdlib.h
  do
! ac_safe=`echo "$ac_hdr" | tr './\055' '___'`
! echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&4
  if eval "test \"`echo '${'ac_cv_header_$ac_safe'+set}'`\" = set"; then
!   echo $ac_n "(cached) $ac_c" 1>&4
  else
    cat > conftest.$ac_ext <<EOF
! #line 2243 "configure"
  #include "confdefs.h"
  #include <$ac_hdr>
  EOF
--- 2238,2250 ----

  for ac_hdr in assert.h float.h limits.h memory.h pwd.h stdlib.h
  do
! ac_safe=`/bin/echo "$ac_hdr" | tr './\055' '___'`
! /bin/echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&4
  if eval "test \"`echo '${'ac_cv_header_$ac_safe'+set}'`\" = set"; then
!   /bin/echo $ac_n "(cached) $ac_c" 1>&4
  else
    cat > conftest.$ac_ext <<EOF
! #line 2247 "configure"
  #include "confdefs.h"
  #include <$ac_hdr>
  EOF
***************
*** 2249,2281 ****
    rm -rf conftest*
    eval "ac_cv_header_$ac_safe=yes"
  else
!   echo "$ac_err" >&5
    rm -rf conftest*
    eval "ac_cv_header_$ac_safe=no"
  fi
  rm -f conftest*
  fi
  if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
!   echo "$ac_t""yes" 1>&4
!     ac_tr_hdr=HAVE_`echo $ac_hdr | tr '[a-z]./\055' '[A-Z]___'`
    cat >> confdefs.h <<EOF
  #define $ac_tr_hdr 1
  EOF

  else
!   echo "$ac_t""no" 1>&4
  fi
  done

  for ac_hdr in string.h varargs.h unistd.h floatingpoint.h
  do
! ac_safe=`echo "$ac_hdr" | tr './\055' '___'`
! echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&4
  if eval "test \"`echo '${'ac_cv_header_$ac_safe'+set}'`\" = set"; then
!   echo $ac_n "(cached) $ac_c" 1>&4
  else
    cat > conftest.$ac_ext <<EOF
! #line 2279 "configure"
  #include "confdefs.h"
  #include <$ac_hdr>
  EOF
--- 2254,2286 ----
    rm -rf conftest*
    eval "ac_cv_header_$ac_safe=yes"
  else
!   /bin/echo "$ac_err" >&5
    rm -rf conftest*
    eval "ac_cv_header_$ac_safe=no"
  fi
  rm -f conftest*
  fi
  if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
!   /bin/echo "$ac_t""yes" 1>&4
!     ac_tr_hdr=HAVE_`/bin/echo $ac_hdr | tr '[a-z]./\055' '[A-Z]___'`
    cat >> confdefs.h <<EOF
  #define $ac_tr_hdr 1
  EOF

  else
!   /bin/echo "$ac_t""no" 1>&4
  fi
  done

  for ac_hdr in string.h varargs.h unistd.h floatingpoint.h
  do
! ac_safe=`/bin/echo "$ac_hdr" | tr './\055' '___'`
! /bin/echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&4
  if eval "test \"`echo '${'ac_cv_header_$ac_safe'+set}'`\" = set"; then
!   /bin/echo $ac_n "(cached) $ac_c" 1>&4
  else
    cat > conftest.$ac_ext <<EOF
! #line 2283 "configure"
  #include "confdefs.h"
  #include <$ac_hdr>
  EOF
***************
*** 2285,2317 ****
    rm -rf conftest*
    eval "ac_cv_header_$ac_safe=yes"
  else
!   echo "$ac_err" >&5
    rm -rf conftest*
    eval "ac_cv_header_$ac_safe=no"
  fi
  rm -f conftest*
  fi
  if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
!   echo "$ac_t""yes" 1>&4
!     ac_tr_hdr=HAVE_`echo $ac_hdr | tr '[a-z]./\055' '[A-Z]___'`
    cat >> confdefs.h <<EOF
  #define $ac_tr_hdr 1
  EOF

  else
!   echo "$ac_t""no" 1>&4
  fi
  done

  for ac_hdr in sys/utsname.h sys/time.h sys/fcntl.h
  do
! ac_safe=`echo "$ac_hdr" | tr './\055' '___'`
! echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&4
  if eval "test \"`echo '${'ac_cv_header_$ac_safe'+set}'`\" = set"; then
!   echo $ac_n "(cached) $ac_c" 1>&4
  else
    cat > conftest.$ac_ext <<EOF
! #line 2315 "configure"
  #include "confdefs.h"
  #include <$ac_hdr>
  EOF
--- 2290,2322 ----
    rm -rf conftest*
    eval "ac_cv_header_$ac_safe=yes"
  else
!   /bin/echo "$ac_err" >&5
    rm -rf conftest*
    eval "ac_cv_header_$ac_safe=no"
  fi
  rm -f conftest*
  fi
  if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
!   /bin/echo "$ac_t""yes" 1>&4
!     ac_tr_hdr=HAVE_`/bin/echo $ac_hdr | tr '[a-z]./\055' '[A-Z]___'`
    cat >> confdefs.h <<EOF
  #define $ac_tr_hdr 1
  EOF

  else
!   /bin/echo "$ac_t""no" 1>&4
  fi
  done

  for ac_hdr in sys/utsname.h sys/time.h sys/fcntl.h
  do
! ac_safe=`/bin/echo "$ac_hdr" | tr './\055' '___'`
! /bin/echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&4
  if eval "test \"`echo '${'ac_cv_header_$ac_safe'+set}'`\" = set"; then
!   /bin/echo $ac_n "(cached) $ac_c" 1>&4
  else
    cat > conftest.$ac_ext <<EOF
! #line 2319 "configure"
  #include "confdefs.h"
  #include <$ac_hdr>
  EOF
***************
*** 2321,2353 ****
    rm -rf conftest*
    eval "ac_cv_header_$ac_safe=yes"
  else
!   echo "$ac_err" >&5
    rm -rf conftest*
    eval "ac_cv_header_$ac_safe=no"
  fi
  rm -f conftest*
  fi
  if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
!   echo "$ac_t""yes" 1>&4
!     ac_tr_hdr=HAVE_`echo $ac_hdr | tr '[a-z]./\055' '[A-Z]___'`
    cat >> confdefs.h <<EOF
  #define $ac_tr_hdr 1
  EOF

  else
!   echo "$ac_t""no" 1>&4
  fi
  done

  for ac_hdr in sys/ttold.h sys/ptem.h sys/select.h sys/resource.h
  do
! ac_safe=`echo "$ac_hdr" | tr './\055' '___'`
! echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&4
  if eval "test \"`echo '${'ac_cv_header_$ac_safe'+set}'`\" = set"; then
!   echo $ac_n "(cached) $ac_c" 1>&4
  else
    cat > conftest.$ac_ext <<EOF
! #line 2351 "configure"
  #include "confdefs.h"
  #include <$ac_hdr>
  EOF
--- 2326,2358 ----
    rm -rf conftest*
    eval "ac_cv_header_$ac_safe=yes"
  else
!   /bin/echo "$ac_err" >&5
    rm -rf conftest*
    eval "ac_cv_header_$ac_safe=no"
  fi
  rm -f conftest*
  fi
  if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
!   /bin/echo "$ac_t""yes" 1>&4
!     ac_tr_hdr=HAVE_`/bin/echo $ac_hdr | tr '[a-z]./\055' '[A-Z]___'`
    cat >> confdefs.h <<EOF
  #define $ac_tr_hdr 1
  EOF

  else
!   /bin/echo "$ac_t""no" 1>&4
  fi
  done

  for ac_hdr in sys/ttold.h sys/ptem.h sys/select.h sys/resource.h
  do
! ac_safe=`/bin/echo "$ac_hdr" | tr './\055' '___'`
! /bin/echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&4
  if eval "test \"`echo '${'ac_cv_header_$ac_safe'+set}'`\" = set"; then
!   /bin/echo $ac_n "(cached) $ac_c" 1>&4
  else
    cat > conftest.$ac_ext <<EOF
! #line 2355 "configure"
  #include "confdefs.h"
  #include <$ac_hdr>
  EOF
***************
*** 2357,2390 ****
    rm -rf conftest*
    eval "ac_cv_header_$ac_safe=yes"
  else
!   echo "$ac_err" >&5
    rm -rf conftest*
    eval "ac_cv_header_$ac_safe=no"
  fi
  rm -f conftest*
  fi
  if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
!   echo "$ac_t""yes" 1>&4
!     ac_tr_hdr=HAVE_`echo $ac_hdr | tr '[a-z]./\055' '[A-Z]___'`
    cat >> confdefs.h <<EOF
  #define $ac_tr_hdr 1
  EOF

  else
!   echo "$ac_t""no" 1>&4
  fi
  done

  ac_header_dirent=no
  for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h
  do
! ac_safe=`echo "$ac_hdr" | tr './\055' '___'`
! echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&4
  if eval "test \"`echo '${'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then
!   echo $ac_n "(cached) $ac_c" 1>&4
  else
    cat > conftest.$ac_ext <<EOF
! #line 2388 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #include <$ac_hdr>
--- 2362,2395 ----
    rm -rf conftest*
    eval "ac_cv_header_$ac_safe=yes"
  else
!   /bin/echo "$ac_err" >&5
    rm -rf conftest*
    eval "ac_cv_header_$ac_safe=no"
  fi
  rm -f conftest*
  fi
  if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
!   /bin/echo "$ac_t""yes" 1>&4
!     ac_tr_hdr=HAVE_`/bin/echo $ac_hdr | tr '[a-z]./\055' '[A-Z]___'`
    cat >> confdefs.h <<EOF
  #define $ac_tr_hdr 1
  EOF

  else
!   /bin/echo "$ac_t""no" 1>&4
  fi
  done

  ac_header_dirent=no
  for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h
  do
! ac_safe=`/bin/echo "$ac_hdr" | tr './\055' '___'`
! /bin/echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&4
  if eval "test \"`echo '${'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then
!   /bin/echo $ac_n "(cached) $ac_c" 1>&4
  else
    cat > conftest.$ac_ext <<EOF
! #line 2392 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #include <$ac_hdr>
***************
*** 2403,2429 ****
  rm -f conftest*

  fi
! if eval "test \"`echo '$ac_cv_header_dirent_'$ac_safe`\" = yes"; then
!   echo "$ac_t""yes" 1>&4
!     ac_tr_hdr=HAVE_`echo $ac_hdr | tr '[a-z]./\055' '[A-Z]___'`
    cat >> confdefs.h <<EOF
  #define $ac_tr_hdr 1
  EOF
   ac_header_dirent=$ac_hdr; break
  else
!   echo "$ac_t""no" 1>&4
  fi
  done
  # 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 -ldir""... $ac_c" 1>&4
  if eval "test \"`echo '${'ac_cv_lib_dir'+set}'`\" = set"; then
!   echo $ac_n "(cached) $ac_c" 1>&4
  else
    ac_save_LIBS="$LIBS"
  LIBS="$LIBS -ldir "
  cat > conftest.$ac_ext <<EOF
! #line 2427 "configure"
  #include "confdefs.h"

  int main() { return 0; }
--- 2408,2434 ----
  rm -f conftest*

  fi
! if eval "test \"`/bin/echo '$ac_cv_header_dirent_'$ac_safe`\" = yes"; then
!   /bin/echo "$ac_t""yes" 1>&4
!     ac_tr_hdr=HAVE_`/bin/echo $ac_hdr | tr '[a-z]./\055' '[A-Z]___'`
    cat >> confdefs.h <<EOF
  #define $ac_tr_hdr 1
  EOF
   ac_header_dirent=$ac_hdr; break
  else
!   /bin/echo "$ac_t""no" 1>&4
  fi
  done
  # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
  if test $ac_header_dirent = dirent.h; then
! /bin/echo $ac_n "checking for -ldir""... $ac_c" 1>&4
  if eval "test \"`echo '${'ac_cv_lib_dir'+set}'`\" = set"; then
!   /bin/echo $ac_n "(cached) $ac_c" 1>&4
  else
    ac_save_LIBS="$LIBS"
  LIBS="$LIBS -ldir "
  cat > conftest.$ac_ext <<EOF
! #line 2431 "configure"
  #include "confdefs.h"

  int main() { return 0; }
***************
*** 2443,2463 ****

  fi
  if eval "test \"`echo '$ac_cv_lib_'dir`\" = yes"; then
!   echo "$ac_t""yes" 1>&4
    LIBS="$LIBS -ldir"
  else
!   echo "$ac_t""no" 1>&4
  fi

  else
! echo $ac_n "checking for -lx""... $ac_c" 1>&4
  if eval "test \"`echo '${'ac_cv_lib_x'+set}'`\" = set"; then
!   echo $ac_n "(cached) $ac_c" 1>&4
  else
    ac_save_LIBS="$LIBS"
  LIBS="$LIBS -lx "
  cat > conftest.$ac_ext <<EOF
! #line 2461 "configure"
  #include "confdefs.h"

  int main() { return 0; }
--- 2448,2468 ----

  fi
  if eval "test \"`echo '$ac_cv_lib_'dir`\" = yes"; then
!   /bin/echo "$ac_t""yes" 1>&4
    LIBS="$LIBS -ldir"
  else
!   /bin/echo "$ac_t""no" 1>&4
  fi

  else
! /bin/echo $ac_n "checking for -lx""... $ac_c" 1>&4
  if eval "test \"`echo '${'ac_cv_lib_x'+set}'`\" = set"; then
!   /bin/echo $ac_n "(cached) $ac_c" 1>&4
  else
    ac_save_LIBS="$LIBS"
  LIBS="$LIBS -lx "
  cat > conftest.$ac_ext <<EOF
! #line 2465 "configure"
  #include "confdefs.h"

  int main() { return 0; }
***************
*** 2477,2496 ****

  fi
  if eval "test \"`echo '$ac_cv_lib_'x`\" = yes"; then
!   echo "$ac_t""yes" 1>&4
    LIBS="$LIBS -lx"
  else
!   echo "$ac_t""no" 1>&4
  fi

  fi

! echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&4
  if eval "test \"`echo '${'ac_cv_header_time'+set}'`\" = set"; then
!   echo $ac_n "(cached) $ac_c" 1>&4
  else
    cat > conftest.$ac_ext <<EOF
! #line 2494 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #include <sys/time.h>
--- 2482,2501 ----

  fi
  if eval "test \"`echo '$ac_cv_lib_'x`\" = yes"; then
!   /bin/echo "$ac_t""yes" 1>&4
    LIBS="$LIBS -lx"
  else
!   /bin/echo "$ac_t""no" 1>&4
  fi

  fi

! /bin/echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&4
  if eval "test \"`echo '${'ac_cv_header_time'+set}'`\" = set"; then
!   /bin/echo $ac_n "(cached) $ac_c" 1>&4
  else
    cat > conftest.$ac_ext <<EOF
! #line 2498 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #include <sys/time.h>
***************
*** 2510,2516 ****
  rm -f conftest*

  fi
! echo "$ac_t""$ac_cv_header_time" 1>&4
  if test $ac_cv_header_time = yes; then
    cat >> confdefs.h <<\EOF
  #define TIME_WITH_SYS_TIME 1
--- 2515,2521 ----
  rm -f conftest*

  fi
! /bin/echo "$ac_t""$ac_cv_header_time" 1>&4
  if test $ac_cv_header_time = yes; then
    cat >> confdefs.h <<\EOF
  #define TIME_WITH_SYS_TIME 1
***************
*** 2525,2537 ****

  case "$canonical_host_type" in
    mips-dec-ultrix* | alpha-dec-osf*)
!     ac_safe=`echo "sgtty.h" | tr './\055' '___'`
! echo $ac_n "checking for sgtty.h""... $ac_c" 1>&4
  if eval "test \"`echo '${'ac_cv_header_$ac_safe'+set}'`\" = set"; then
!   echo $ac_n "(cached) $ac_c" 1>&4
  else
    cat > conftest.$ac_ext <<EOF
! #line 2535 "configure"
  #include "confdefs.h"
  #include <sgtty.h>
  EOF
--- 2530,2542 ----

  case "$canonical_host_type" in
    mips-dec-ultrix* | alpha-dec-osf*)
!     ac_safe=`/bin/echo "sgtty.h" | tr './\055' '___'`
! /bin/echo $ac_n "checking for sgtty.h""... $ac_c" 1>&4
  if eval "test \"`echo '${'ac_cv_header_$ac_safe'+set}'`\" = set"; then
!   /bin/echo $ac_n "(cached) $ac_c" 1>&4
  else
    cat > conftest.$ac_ext <<EOF
! #line 2539 "configure"
  #include "confdefs.h"
  #include <sgtty.h>
  EOF
***************
*** 2541,2573 ****
    rm -rf conftest*
    eval "ac_cv_header_$ac_safe=yes"
  else
!   echo "$ac_err" >&5
    rm -rf conftest*
    eval "ac_cv_header_$ac_safe=no"
  fi
  rm -f conftest*
  fi
  if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
!   echo "$ac_t""yes" 1>&4
    cat >> confdefs.h <<\EOF
  #define HAVE_SGTTY_H 1
  EOF

  else
!   echo "$ac_t""no" 1>&4
  fi


      if test "$ac_cv_header_sgtty_h" = no; then
        for ac_hdr in termios.h termio.h sgtty.h
  do
! ac_safe=`echo "$ac_hdr" | tr './\055' '___'`
! echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&4
  if eval "test \"`echo '${'ac_cv_header_$ac_safe'+set}'`\" = set"; then
!   echo $ac_n "(cached) $ac_c" 1>&4
  else
    cat > conftest.$ac_ext <<EOF
! #line 2571 "configure"
  #include "confdefs.h"
  #include <$ac_hdr>
  EOF
--- 2546,2578 ----
    rm -rf conftest*
    eval "ac_cv_header_$ac_safe=yes"
  else
!   /bin/echo "$ac_err" >&5
    rm -rf conftest*
    eval "ac_cv_header_$ac_safe=no"
  fi
  rm -f conftest*
  fi
  if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
!   /bin/echo "$ac_t""yes" 1>&4
    cat >> confdefs.h <<\EOF
  #define HAVE_SGTTY_H 1
  EOF

  else
!   /bin/echo "$ac_t""no" 1>&4
  fi


      if test "$ac_cv_header_sgtty_h" = no; then
        for ac_hdr in termios.h termio.h sgtty.h
  do
! ac_safe=`/bin/echo "$ac_hdr" | tr './\055' '___'`
! /bin/echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&4
  if eval "test \"`echo '${'ac_cv_header_$ac_safe'+set}'`\" = set"; then
!   /bin/echo $ac_n "(cached) $ac_c" 1>&4
  else
    cat > conftest.$ac_ext <<EOF
! #line 2575 "configure"
  #include "confdefs.h"
  #include <$ac_hdr>
  EOF
***************
*** 2577,2597 ****
    rm -rf conftest*
    eval "ac_cv_header_$ac_safe=yes"
  else
!   echo "$ac_err" >&5
    rm -rf conftest*
    eval "ac_cv_header_$ac_safe=no"
  fi
  rm -f conftest*
  fi
  if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
!   echo "$ac_t""yes" 1>&4
!     ac_tr_hdr=HAVE_`echo $ac_hdr | tr '[a-z]./\055' '[A-Z]___'`
    cat >> confdefs.h <<EOF
  #define $ac_tr_hdr 1
  EOF
   break
  else
!   echo "$ac_t""no" 1>&4
  fi
  done

--- 2582,2602 ----
    rm -rf conftest*
    eval "ac_cv_header_$ac_safe=yes"
  else
!   /bin/echo "$ac_err" >&5
    rm -rf conftest*
    eval "ac_cv_header_$ac_safe=no"
  fi
  rm -f conftest*
  fi
  if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
!   /bin/echo "$ac_t""yes" 1>&4
!     ac_tr_hdr=HAVE_`/bin/echo $ac_hdr | tr '[a-z]./\055' '[A-Z]___'`
    cat >> confdefs.h <<EOF
  #define $ac_tr_hdr 1
  EOF
   break
  else
!   /bin/echo "$ac_t""no" 1>&4
  fi
  done

***************
*** 2600,2612 ****
    *)
      for ac_hdr in termios.h termio.h sgtty.h
  do
! ac_safe=`echo "$ac_hdr" | tr './\055' '___'`
! echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&4
  if eval "test \"`echo '${'ac_cv_header_$ac_safe'+set}'`\" = set"; then
!   echo $ac_n "(cached) $ac_c" 1>&4
  else
    cat > conftest.$ac_ext <<EOF
! #line 2610 "configure"
  #include "confdefs.h"
  #include <$ac_hdr>
  EOF
--- 2605,2617 ----
    *)
      for ac_hdr in termios.h termio.h sgtty.h
  do
! ac_safe=`/bin/echo "$ac_hdr" | tr './\055' '___'`
! /bin/echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&4
  if eval "test \"`echo '${'ac_cv_header_$ac_safe'+set}'`\" = set"; then
!   /bin/echo $ac_n "(cached) $ac_c" 1>&4
  else
    cat > conftest.$ac_ext <<EOF
! #line 2614 "configure"
  #include "confdefs.h"
  #include <$ac_hdr>
  EOF
***************
*** 2616,2636 ****
    rm -rf conftest*
    eval "ac_cv_header_$ac_safe=yes"
  else
!   echo "$ac_err" >&5
    rm -rf conftest*
    eval "ac_cv_header_$ac_safe=no"
  fi
  rm -f conftest*
  fi
  if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
!   echo "$ac_t""yes" 1>&4
!     ac_tr_hdr=HAVE_`echo $ac_hdr | tr '[a-z]./\055' '[A-Z]___'`
    cat >> confdefs.h <<EOF
  #define $ac_tr_hdr 1
  EOF
   break
  else
!   echo "$ac_t""no" 1>&4
  fi
  done

--- 2621,2641 ----
    rm -rf conftest*
    eval "ac_cv_header_$ac_safe=yes"
  else
!   /bin/echo "$ac_err" >&5
    rm -rf conftest*
    eval "ac_cv_header_$ac_safe=no"
  fi
  rm -f conftest*
  fi
  if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
!   /bin/echo "$ac_t""yes" 1>&4
!     ac_tr_hdr=HAVE_`/bin/echo $ac_hdr | tr '[a-z]./\055' '[A-Z]___'`
    cat >> confdefs.h <<EOF
  #define $ac_tr_hdr 1
  EOF
   break
  else
!   /bin/echo "$ac_t""no" 1>&4
  fi
  done

***************
*** 2649,2660 ****

  for ac_func in setvbuf getcwd gethostname bzero bcopy rindex vfprintf vsprintf
  do
! echo $ac_n "checking for $ac_func""... $ac_c" 1>&4
  if eval "test \"`echo '${'ac_cv_func_$ac_func'+set}'`\" = set"; then
!   echo $ac_n "(cached) $ac_c" 1>&4
  else
    cat > conftest.$ac_ext <<EOF
! #line 2658 "configure"
  #include "confdefs.h"
  #include <ctype.h> /* Arbitrary system header to define __stub macros. */
  /* Override any gcc2 internal prototype to avoid an error.  */
--- 2654,2665 ----

  for ac_func in setvbuf getcwd gethostname bzero bcopy rindex vfprintf vsprintf
  do
! /bin/echo $ac_n "checking for $ac_func""... $ac_c" 1>&4
  if eval "test \"`echo '${'ac_cv_func_$ac_func'+set}'`\" = set"; then
!   /bin/echo $ac_n "(cached) $ac_c" 1>&4
  else
    cat > conftest.$ac_ext <<EOF
! #line 2662 "configure"
  #include "confdefs.h"
  #include <ctype.h> /* Arbitrary system header to define __stub macros. */
  /* Override any gcc2 internal prototype to avoid an error.  */
***************
*** 2685,2709 ****

  fi
  if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
!   echo "$ac_t""yes" 1>&4
!     ac_tr_func=HAVE_`echo $ac_func | tr '[a-z]' '[A-Z]'`
    cat >> confdefs.h <<EOF
  #define $ac_tr_func 1
  EOF

  else
!   echo "$ac_t""no" 1>&4
  fi
  done

  for ac_func in stricmp strnicmp strcasecmp strncasecmp strerror atexit
  do
! echo $ac_n "checking for $ac_func""... $ac_c" 1>&4
  if eval "test \"`echo '${'ac_cv_func_$ac_func'+set}'`\" = set"; then
!   echo $ac_n "(cached) $ac_c" 1>&4
  else
    cat > conftest.$ac_ext <<EOF
! #line 2707 "configure"
  #include "confdefs.h"
  #include <ctype.h> /* Arbitrary system header to define __stub macros. */
  /* Override any gcc2 internal prototype to avoid an error.  */
--- 2690,2714 ----

  fi
  if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
!   /bin/echo "$ac_t""yes" 1>&4
!     ac_tr_func=HAVE_`/bin/echo $ac_func | tr '[a-z]' '[A-Z]'`
    cat >> confdefs.h <<EOF
  #define $ac_tr_func 1
  EOF

  else
!   /bin/echo "$ac_t""no" 1>&4
  fi
  done

  for ac_func in stricmp strnicmp strcasecmp strncasecmp strerror atexit
  do
! /bin/echo $ac_n "checking for $ac_func""... $ac_c" 1>&4
  if eval "test \"`echo '${'ac_cv_func_$ac_func'+set}'`\" = set"; then
!   /bin/echo $ac_n "(cached) $ac_c" 1>&4
  else
    cat > conftest.$ac_ext <<EOF
! #line 2711 "configure"
  #include "confdefs.h"
  #include <ctype.h> /* Arbitrary system header to define __stub macros. */
  /* Override any gcc2 internal prototype to avoid an error.  */
***************
*** 2734,2758 ****

  fi
  if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
!   echo "$ac_t""yes" 1>&4
!     ac_tr_func=HAVE_`echo $ac_func | tr '[a-z]' '[A-Z]'`
    cat >> confdefs.h <<EOF
  #define $ac_tr_func 1
  EOF

  else
!   echo "$ac_t""no" 1>&4
  fi
  done

  for ac_func in on_exit tempnam memmove putenv gettimeofday getrusage
  do
! echo $ac_n "checking for $ac_func""... $ac_c" 1>&4
  if eval "test \"`echo '${'ac_cv_func_$ac_func'+set}'`\" = set"; then
!   echo $ac_n "(cached) $ac_c" 1>&4
  else
    cat > conftest.$ac_ext <<EOF
! #line 2756 "configure"
  #include "confdefs.h"
  #include <ctype.h> /* Arbitrary system header to define __stub macros. */
  /* Override any gcc2 internal prototype to avoid an error.  */
--- 2739,2763 ----

  fi
  if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
!   /bin/echo "$ac_t""yes" 1>&4
!     ac_tr_func=HAVE_`/bin/echo $ac_func | tr '[a-z]' '[A-Z]'`
    cat >> confdefs.h <<EOF
  #define $ac_tr_func 1
  EOF

  else
!   /bin/echo "$ac_t""no" 1>&4
  fi
  done

  for ac_func in on_exit tempnam memmove putenv gettimeofday getrusage
  do
! /bin/echo $ac_n "checking for $ac_func""... $ac_c" 1>&4
  if eval "test \"`echo '${'ac_cv_func_$ac_func'+set}'`\" = set"; then
!   /bin/echo $ac_n "(cached) $ac_c" 1>&4
  else
    cat > conftest.$ac_ext <<EOF
! #line 2760 "configure"
  #include "confdefs.h"
  #include <ctype.h> /* Arbitrary system header to define __stub macros. */
  /* Override any gcc2 internal prototype to avoid an error.  */
***************
*** 2783,2796 ****

  fi
  if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
!   echo "$ac_t""yes" 1>&4
!     ac_tr_func=HAVE_`echo $ac_func | tr '[a-z]' '[A-Z]'`
    cat >> confdefs.h <<EOF
  #define $ac_tr_func 1
  EOF

  else
!   echo "$ac_t""no" 1>&4
  fi
  done

--- 2788,2801 ----

  fi
  if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
!   /bin/echo "$ac_t""yes" 1>&4
!     ac_tr_func=HAVE_`/bin/echo $ac_func | tr '[a-z]' '[A-Z]'`
    cat >> confdefs.h <<EOF
  #define $ac_tr_func 1
  EOF

  else
!   /bin/echo "$ac_t""no" 1>&4
  fi
  done

***************
*** 2805,2818 ****
  ### are often available.  If they are missing, we try to replace them
  ### with functions from the BSD/NET2 math library.

! echo $ac_n "checking for -lsunmath""... $ac_c" 1>&4
  if eval "test \"`echo '${'ac_cv_lib_sunmath'+set}'`\" = set"; then
!   echo $ac_n "(cached) $ac_c" 1>&4
  else
    ac_save_LIBS="$LIBS"
  LIBS="$LIBS -lsunmath "
  cat > conftest.$ac_ext <<EOF
! #line 2816 "configure"
  #include "confdefs.h"

  int main() { return 0; }
--- 2810,2823 ----
  ### are often available.  If they are missing, we try to replace them
  ### with functions from the BSD/NET2 math library.

! /bin/echo $ac_n "checking for -lsunmath""... $ac_c" 1>&4
  if eval "test \"`echo '${'ac_cv_lib_sunmath'+set}'`\" = set"; then
!   /bin/echo $ac_n "(cached) $ac_c" 1>&4
  else
    ac_save_LIBS="$LIBS"
  LIBS="$LIBS -lsunmath "
  cat > conftest.$ac_ext <<EOF
! #line 2820 "configure"
  #include "confdefs.h"

  int main() { return 0; }
***************
*** 2832,2839 ****

  fi
  if eval "test \"`echo '$ac_cv_lib_'sunmath`\" = yes"; then
!   echo "$ac_t""yes" 1>&4
!     ac_tr_lib=HAVE_LIB`echo sunmath | tr '[a-z]' '[A-Z]'`
    cat >> confdefs.h <<EOF
  #define $ac_tr_lib 1
  EOF
--- 2837,2844 ----

  fi
  if eval "test \"`echo '$ac_cv_lib_'sunmath`\" = yes"; then
!   /bin/echo "$ac_t""yes" 1>&4
!     ac_tr_lib=HAVE_LIB`/bin/echo sunmath | tr '[a-z]' '[A-Z]'`
    cat >> confdefs.h <<EOF
  #define $ac_tr_lib 1
  EOF
***************
*** 2841,2861 ****
    LIBS="$LIBS -lsunmath"

  else
!   echo "$ac_t""no" 1>&4
  fi



  case "$canonical_host_type" in
    *-*-linux*)
!     echo $ac_n "checking for -lm""... $ac_c" 1>&4
  if eval "test \"`echo '${'ac_cv_lib_m'+set}'`\" = set"; then
!   echo $ac_n "(cached) $ac_c" 1>&4
  else
    ac_save_LIBS="$LIBS"
  LIBS="$LIBS -lm -lc"
  cat > conftest.$ac_ext <<EOF
! #line 2859 "configure"
  #include "confdefs.h"

  int main() { return 0; }
--- 2846,2866 ----
    LIBS="$LIBS -lsunmath"

  else
!   /bin/echo "$ac_t""no" 1>&4
  fi



  case "$canonical_host_type" in
    *-*-linux*)
!     /bin/echo $ac_n "checking for -lm""... $ac_c" 1>&4
  if eval "test \"`echo '${'ac_cv_lib_m'+set}'`\" = set"; then
!   /bin/echo $ac_n "(cached) $ac_c" 1>&4
  else
    ac_save_LIBS="$LIBS"
  LIBS="$LIBS -lm -lc"
  cat > conftest.$ac_ext <<EOF
! #line 2863 "configure"
  #include "confdefs.h"

  int main() { return 0; }
***************
*** 2875,2882 ****

  fi
  if eval "test \"`echo '$ac_cv_lib_'m`\" = yes"; then
!   echo "$ac_t""yes" 1>&4
!     ac_tr_lib=HAVE_LIB`echo m | tr '[a-z]' '[A-Z]'`
    cat >> confdefs.h <<EOF
  #define $ac_tr_lib 1
  EOF
--- 2880,2887 ----

  fi
  if eval "test \"`echo '$ac_cv_lib_'m`\" = yes"; then
!   /bin/echo "$ac_t""yes" 1>&4
!     ac_tr_lib=HAVE_LIB`/bin/echo m | tr '[a-z]' '[A-Z]'`
    cat >> confdefs.h <<EOF
  #define $ac_tr_lib 1
  EOF
***************
*** 2884,2902 ****
    LIBS="$LIBS -lm"

  else
!   echo "$ac_t""no" 1>&4
  fi

    ;;
    *)
!     echo $ac_n "checking for -lm""... $ac_c" 1>&4
  if eval "test \"`echo '${'ac_cv_lib_m'+set}'`\" = set"; then
!   echo $ac_n "(cached) $ac_c" 1>&4
  else
    ac_save_LIBS="$LIBS"
  LIBS="$LIBS -lm "
  cat > conftest.$ac_ext <<EOF
! #line 2900 "configure"
  #include "confdefs.h"

  int main() { return 0; }
--- 2889,2907 ----
    LIBS="$LIBS -lm"

  else
!   /bin/echo "$ac_t""no" 1>&4
  fi

    ;;
    *)
!     /bin/echo $ac_n "checking for -lm""... $ac_c" 1>&4
  if eval "test \"`echo '${'ac_cv_lib_m'+set}'`\" = set"; then
!   /bin/echo $ac_n "(cached) $ac_c" 1>&4
  else
    ac_save_LIBS="$LIBS"
  LIBS="$LIBS -lm "
  cat > conftest.$ac_ext <<EOF
! #line 2904 "configure"
  #include "confdefs.h"

  int main() { return 0; }
***************
*** 2916,2923 ****

  fi
  if eval "test \"`echo '$ac_cv_lib_'m`\" = yes"; then
!   echo "$ac_t""yes" 1>&4
!     ac_tr_lib=HAVE_LIB`echo m | tr '[a-z]' '[A-Z]'`
    cat >> confdefs.h <<EOF
  #define $ac_tr_lib 1
  EOF
--- 2921,2928 ----

  fi
  if eval "test \"`echo '$ac_cv_lib_'m`\" = yes"; then
!   /bin/echo "$ac_t""yes" 1>&4
!     ac_tr_lib=HAVE_LIB`/bin/echo m | tr '[a-z]' '[A-Z]'`
    cat >> confdefs.h <<EOF
  #define $ac_tr_lib 1
  EOF
***************
*** 2925,2931 ****
    LIBS="$LIBS -lm"

  else
!   echo "$ac_t""no" 1>&4
  fi

    ;;
--- 2930,2936 ----
    LIBS="$LIBS -lm"

  else
!   /bin/echo "$ac_t""no" 1>&4
  fi

    ;;
***************
*** 2943,2954 ****
    *)
      for ac_func in finite isnan isinf infinity quiet_nan
  do
! echo $ac_n "checking for $ac_func""... $ac_c" 1>&4
  if eval "test \"`echo '${'ac_cv_func_$ac_func'+set}'`\" = set"; then
!   echo $ac_n "(cached) $ac_c" 1>&4
  else
    cat > conftest.$ac_ext <<EOF
! #line 2952 "configure"
  #include "confdefs.h"
  #include <ctype.h> /* Arbitrary system header to define __stub macros. */
  /* Override any gcc2 internal prototype to avoid an error.  */
--- 2948,2959 ----
    *)
      for ac_func in finite isnan isinf infinity quiet_nan
  do
! /bin/echo $ac_n "checking for $ac_func""... $ac_c" 1>&4
  if eval "test \"`echo '${'ac_cv_func_$ac_func'+set}'`\" = set"; then
!   /bin/echo $ac_n "(cached) $ac_c" 1>&4
  else
    cat > conftest.$ac_ext <<EOF
! #line 2956 "configure"
  #include "confdefs.h"
  #include <ctype.h> /* Arbitrary system header to define __stub macros. */
  /* Override any gcc2 internal prototype to avoid an error.  */
***************
*** 2979,2992 ****

  fi
  if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
!   echo "$ac_t""yes" 1>&4
!     ac_tr_func=HAVE_`echo $ac_func | tr '[a-z]' '[A-Z]'`
    cat >> confdefs.h <<EOF
  #define $ac_tr_func 1
  EOF

  else
!   echo "$ac_t""no" 1>&4
  fi
  done

--- 2984,2997 ----

  fi
  if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
!   /bin/echo "$ac_t""yes" 1>&4
!     ac_tr_func=HAVE_`/bin/echo $ac_func | tr '[a-z]' '[A-Z]'`
    cat >> confdefs.h <<EOF
  #define $ac_tr_func 1
  EOF

  else
!   /bin/echo "$ac_t""no" 1>&4
  fi
  done

***************
*** 2997,3008 ****

  for ac_func in acosh asinh atanh erf erfc lgamma
  do
! echo $ac_n "checking for $ac_func""... $ac_c" 1>&4
  if eval "test \"`echo '${'ac_cv_func_$ac_func'+set}'`\" = set"; then
!   echo $ac_n "(cached) $ac_c" 1>&4
  else
    cat > conftest.$ac_ext <<EOF
! #line 3006 "configure"
  #include "confdefs.h"
  #include <ctype.h> /* Arbitrary system header to define __stub macros. */
  /* Override any gcc2 internal prototype to avoid an error.  */
--- 3002,3013 ----

  for ac_func in acosh asinh atanh erf erfc lgamma
  do
! /bin/echo $ac_n "checking for $ac_func""... $ac_c" 1>&4
  if eval "test \"`echo '${'ac_cv_func_$ac_func'+set}'`\" = set"; then
!   /bin/echo $ac_n "(cached) $ac_c" 1>&4
  else
    cat > conftest.$ac_ext <<EOF
! #line 3010 "configure"
  #include "confdefs.h"
  #include <ctype.h> /* Arbitrary system header to define __stub macros. */
  /* Override any gcc2 internal prototype to avoid an error.  */
***************
*** 3033,3053 ****

  fi
  if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
!   echo "$ac_t""yes" 1>&4
!     ac_tr_func=HAVE_`echo $ac_func | tr '[a-z]' '[A-Z]'`
    cat >> confdefs.h <<EOF
  #define $ac_tr_func 1
  EOF

  else
!   echo "$ac_t""no" 1>&4
  fi
  done


! echo $ac_n "checking for signgam declaration in math.h""... $ac_c" 1>&4
  cat > conftest.$ac_ext <<EOF
! #line 3051 "configure"
  #include "confdefs.h"
  #include <math.h>
  int main() { return 0; }
--- 3038,3058 ----

  fi
  if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
!   /bin/echo "$ac_t""yes" 1>&4
!     ac_tr_func=HAVE_`/bin/echo $ac_func | tr '[a-z]' '[A-Z]'`
    cat >> confdefs.h <<EOF
  #define $ac_tr_func 1
  EOF

  else
!   /bin/echo "$ac_t""no" 1>&4
  fi
  done


! /bin/echo $ac_n "checking for signgam declaration in math.h""... $ac_c" 1>&4
  cat > conftest.$ac_ext <<EOF
! #line 3055 "configure"
  #include "confdefs.h"
  #include <math.h>
  int main() { return 0; }
***************
*** 3057,3070 ****
  EOF
  if eval $ac_link; then
    rm -rf conftest*
!   echo "$ac_t""yes" 1>&4
    cat >> confdefs.h <<\EOF
  #define SIGNGAM_DECLARED 1
  EOF

  else
    rm -rf conftest*
!   echo "$ac_t""no" 1>&4
  fi
  rm -f conftest*

--- 3062,3075 ----
  EOF
  if eval $ac_link; then
    rm -rf conftest*
!   /bin/echo "$ac_t""yes" 1>&4
    cat >> confdefs.h <<\EOF
  #define SIGNGAM_DECLARED 1
  EOF

  else
    rm -rf conftest*
!   /bin/echo "$ac_t""no" 1>&4
  fi
  rm -f conftest*

***************
*** 3073,3084 ****

  ### Checks for OS specific cruft.

! echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&4
  if eval "test \"`echo '${'ac_cv_struct_tm'+set}'`\" = set"; then
!   echo $ac_n "(cached) $ac_c" 1>&4
  else
    cat > conftest.$ac_ext <<EOF
! #line 3082 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #include <time.h>
--- 3078,3089 ----

  ### Checks for OS specific cruft.

! /bin/echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&4
  if eval "test \"`echo '${'ac_cv_struct_tm'+set}'`\" = set"; then
!   /bin/echo $ac_n "(cached) $ac_c" 1>&4
  else
    cat > conftest.$ac_ext <<EOF
! #line 3086 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #include <time.h>
***************
*** 3097,3103 ****
  rm -f conftest*

  fi
! echo "$ac_t""$ac_cv_struct_tm" 1>&4
  if test $ac_cv_struct_tm = sys/time.h; then
    cat >> confdefs.h <<\EOF
  #define TM_IN_SYS_TIME 1
--- 3102,3108 ----
  rm -f conftest*

  fi
! /bin/echo "$ac_t""$ac_cv_struct_tm" 1>&4
  if test $ac_cv_struct_tm = sys/time.h; then
    cat >> confdefs.h <<\EOF
  #define TM_IN_SYS_TIME 1
***************
*** 3105,3123 ****

  fi

! echo $ac_n "checking whether setvbuf arguments are reversed""... $ac_c" 1>&4
  if eval "test \"`echo '${'ac_cv_func_setvbuf_reversed'+set}'`\" = set"; then
!   echo $ac_n "(cached) $ac_c" 1>&4
  else
    if test "$cross_compiling" = yes; then
      { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
  else
  cat > conftest.$ac_ext <<EOF
! #line 3117 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  /* If setvbuf has the reversed format, exit 0. */
  main () {
    /* This call has the arguments reversed.
       A reversed system may check and see that the address of main
       is not _IOLBF, _IONBF, or _IOFBF, and return nonzero.  */
--- 3110,3135 ----

  fi

! /bin/echo $ac_n "checking whether setvbuf arguments are reversed""... $ac_c" 1>&4
  if eval "test \"`echo '${'ac_cv_func_setvbuf_reversed'+set}'`\" = set"; then
!   /bin/echo $ac_n "(cached) $ac_c" 1>&4
  else
    if test "$cross_compiling" = yes; then
      { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
  else
  cat > conftest.$ac_ext <<EOF
! #line 3121 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  /* If setvbuf has the reversed format, exit 0. */
  main () {
+ #ifdef __amigados__
+   /* AmigaDOS is a non-reversed system.  Instead of the test program
+      getting a segfault (no memory protection), it causes enforcer hits
+      or other nastiness, so don't run the test program, just exit with
+      status 1 to indicate that it is non-reversed.  -fnf */
+   exit(1);
+ #endif
    /* This call has the arguments reversed.
       A reversed system may check and see that the address of main
       is not _IOLBF, _IONBF, or _IOFBF, and return nonzero.  */
***************
*** 3137,3143 ****
  rm -fr conftest*
  rm -f core
  fi
! echo "$ac_t""$ac_cv_func_setvbuf_reversed" 1>&4
  if test $ac_cv_func_setvbuf_reversed = yes; then
    cat >> confdefs.h <<\EOF
  #define SETVBUF_REVERSED 1
--- 3149,3155 ----
  rm -fr conftest*
  rm -f core
  fi
! /bin/echo "$ac_t""$ac_cv_func_setvbuf_reversed" 1>&4
  if test $ac_cv_func_setvbuf_reversed = yes; then
    cat >> confdefs.h <<\EOF
  #define SETVBUF_REVERSED 1
***************
*** 3147,3160 ****

  TERMLIBS=""
  for termlib in termcap terminfo curses termlib ; do
!   echo $ac_n "checking for -l${termlib}""... $ac_c" 1>&4
  if eval "test \"`echo '${'ac_cv_lib_${termlib}'+set}'`\" = set"; then
!   echo $ac_n "(cached) $ac_c" 1>&4
  else
    ac_save_LIBS="$LIBS"
  LIBS="$LIBS -l${termlib} "
  cat > conftest.$ac_ext <<EOF
! #line 3158 "configure"
  #include "confdefs.h"

  int main() { return 0; }
--- 3159,3172 ----

  TERMLIBS=""
  for termlib in termcap terminfo curses termlib ; do
!   /bin/echo $ac_n "checking for -l${termlib}""... $ac_c" 1>&4
  if eval "test \"`echo '${'ac_cv_lib_${termlib}'+set}'`\" = set"; then
!   /bin/echo $ac_n "(cached) $ac_c" 1>&4
  else
    ac_save_LIBS="$LIBS"
  LIBS="$LIBS -l${termlib} "
  cat > conftest.$ac_ext <<EOF
! #line 3169 "configure"
  #include "confdefs.h"

  int main() { return 0; }
***************
*** 3174,3196 ****

  fi
  if eval "test \"`echo '$ac_cv_lib_'${termlib}`\" = yes"; then
!   echo "$ac_t""yes" 1>&4
    TERMLIBS="${TERMLIBS} -l${termlib}"
  else
!   echo "$ac_t""no" 1>&4
  fi

    case "${TERMLIBS}" in
      *-l${termlib}*)
!       echo "$ac_t""defining TERMLIBS to be $TERMLIBS" 1>&4
        break
      ;;
    esac
  done

! echo $ac_n "checking for struct exception in math.h""... $ac_c" 1>&4
  cat > conftest.$ac_ext <<EOF
! #line 3194 "configure"
  #include "confdefs.h"
  #include <math.h>
  int main() { return 0; }
--- 3186,3208 ----

  fi
  if eval "test \"`echo '$ac_cv_lib_'${termlib}`\" = yes"; then
!   /bin/echo "$ac_t""yes" 1>&4
    TERMLIBS="${TERMLIBS} -l${termlib}"
  else
!   /bin/echo "$ac_t""no" 1>&4
  fi

    case "${TERMLIBS}" in
      *-l${termlib}*)
!       /bin/echo "$ac_t""defining TERMLIBS to be $TERMLIBS" 1>&4
        break
      ;;
    esac
  done

! /bin/echo $ac_n "checking for struct exception in math.h""... $ac_c" 1>&4
  cat > conftest.$ac_ext <<EOF
! #line 3205 "configure"
  #include "confdefs.h"
  #include <math.h>
  int main() { return 0; }
***************
*** 3200,3213 ****
  EOF
  if eval $ac_link; then
    rm -rf conftest*
!   echo "$ac_t""yes" 1>&4
    cat >> confdefs.h <<\EOF
  #define EXCEPTION_IN_MATH 1
  EOF

  else
    rm -rf conftest*
!   echo "$ac_t""no" 1>&4
  fi
  rm -f conftest*

--- 3212,3225 ----
  EOF
  if eval $ac_link; then
    rm -rf conftest*
!   /bin/echo "$ac_t""yes" 1>&4
    cat >> confdefs.h <<\EOF
  #define EXCEPTION_IN_MATH 1
  EOF

  else
    rm -rf conftest*
!   /bin/echo "$ac_t""no" 1>&4
  fi
  rm -f conftest*

***************
*** 3216,3227 ****

  ### Signal stuff.

! echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&4
  if eval "test \"`echo '${'ac_cv_type_signal'+set}'`\" = set"; then
!   echo $ac_n "(cached) $ac_c" 1>&4
  else
    cat > conftest.$ac_ext <<EOF
! #line 3225 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #include <signal.h>
--- 3228,3239 ----

  ### Signal stuff.

! /bin/echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&4
  if eval "test \"`echo '${'ac_cv_type_signal'+set}'`\" = set"; then
!   /bin/echo $ac_n "(cached) $ac_c" 1>&4
  else
    cat > conftest.$ac_ext <<EOF
! #line 3236 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #include <signal.h>
***************
*** 3244,3261 ****
  rm -f conftest*

  fi
! echo "$ac_t""$ac_cv_type_signal" 1>&4
  cat >> confdefs.h <<EOF
  #define RETSIGTYPE $ac_cv_type_signal
  EOF


! echo $ac_n "checking for sys_siglist declaration in signal.h or unistd.h""... $ac_c" 1>&4
  if eval "test \"`echo '${'ac_cv_decl_sys_siglist'+set}'`\" = set"; then
!   echo $ac_n "(cached) $ac_c" 1>&4
  else
    cat > conftest.$ac_ext <<EOF
! #line 3259 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #include <signal.h>
--- 3256,3273 ----
  rm -f conftest*

  fi
! /bin/echo "$ac_t""$ac_cv_type_signal" 1>&4
  cat >> confdefs.h <<EOF
  #define RETSIGTYPE $ac_cv_type_signal
  EOF


! /bin/echo $ac_n "checking for sys_siglist declaration in signal.h or unistd.h""... $ac_c" 1>&4
  if eval "test \"`echo '${'ac_cv_decl_sys_siglist'+set}'`\" = set"; then
!   /bin/echo $ac_n "(cached) $ac_c" 1>&4
  else
    cat > conftest.$ac_ext <<EOF
! #line 3270 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #include <signal.h>
***************
*** 3278,3284 ****
  rm -f conftest*

  fi
! echo "$ac_t""$ac_cv_decl_sys_siglist" 1>&4
  if test $ac_cv_decl_sys_siglist = yes; then
    cat >> confdefs.h <<\EOF
  #define SYS_SIGLIST_DECLARED 1
--- 3290,3296 ----
  rm -f conftest*

  fi
! /bin/echo "$ac_t""$ac_cv_decl_sys_siglist" 1>&4
  if test $ac_cv_decl_sys_siglist = yes; then
    cat >> confdefs.h <<\EOF
  #define SYS_SIGLIST_DECLARED 1
***************
*** 3286,3294 ****

  fi

! echo $ac_n "checking for sys_siglist variable""... $ac_c" 1>&4
  cat > conftest.$ac_ext <<EOF
! #line 3292 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  int main() { return 0; }
--- 3298,3306 ----

  fi

! /bin/echo $ac_n "checking for sys_siglist variable""... $ac_c" 1>&4
  cat > conftest.$ac_ext <<EOF
! #line 3303 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  int main() { return 0; }
***************
*** 3298,3311 ****
  EOF
  if eval $ac_link; then
    rm -rf conftest*
!   echo "$ac_t""yes" 1>&4
    cat >> confdefs.h <<\EOF
  #define HAVE_SYS_SIGLIST 1
  EOF

  else
    rm -rf conftest*
!   echo "$ac_t""no" 1>&4
  fi
  rm -f conftest*

--- 3310,3323 ----
  EOF
  if eval $ac_link; then
    rm -rf conftest*
!   /bin/echo "$ac_t""yes" 1>&4
    cat >> confdefs.h <<\EOF
  #define HAVE_SYS_SIGLIST 1
  EOF

  else
    rm -rf conftest*
!   /bin/echo "$ac_t""no" 1>&4
  fi
  rm -f conftest*

***************
*** 3317,3323 ****
    ;;
    *)
      VOID_SIGHANDLER="-DVOID_SIGHANDLER=1"
!     echo "$ac_t""defining VOID_SIGHANDLER to be 1" 1>&4
    ;;
  esac

--- 3329,3335 ----
    ;;
    *)
      VOID_SIGHANDLER="-DVOID_SIGHANDLER=1"
!     /bin/echo "$ac_t""defining VOID_SIGHANDLER to be 1" 1>&4
    ;;
  esac

***************
*** 3333,3341 ****

  # 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>&4
  if eval "test \"`echo '${'ac_cv_prog_LEX'+set}'`\" = set"; then
!   echo $ac_n "(cached) $ac_c" 1>&4
  else
    if test -n "$LEX"; then
    ac_cv_prog_LEX="$LEX" # Let the user override the test.
--- 3345,3353 ----

  # Extract the first word of "flex", so it can be a program name with args.
  set dummy flex; ac_word=$2
! /bin/echo $ac_n "checking for $ac_word""... $ac_c" 1>&4
  if eval "test \"`echo '${'ac_cv_prog_LEX'+set}'`\" = set"; then
!   /bin/echo $ac_n "(cached) $ac_c" 1>&4
  else
    if test -n "$LEX"; then
    ac_cv_prog_LEX="$LEX" # Let the user override the test.
***************
*** 3354,3362 ****
  fi
  LEX="$ac_cv_prog_LEX"
  if test -n "$LEX"; then
!   echo "$ac_t""$LEX" 1>&4
  else
!   echo "$ac_t""no" 1>&4
  fi

  if test -z "$LEXLIB"
--- 3366,3374 ----
  fi
  LEX="$ac_cv_prog_LEX"
  if test -n "$LEX"; then
!   /bin/echo "$ac_t""$LEX" 1>&4
  else
!   /bin/echo "$ac_t""no" 1>&4
  fi

  if test -z "$LEXLIB"
***************
*** 3365,3378 ****
    flex*) ac_lib=fl ;;
    *) ac_lib=l ;;
    esac
!   echo $ac_n "checking for -l$ac_lib""... $ac_c" 1>&4
  if eval "test \"`echo '${'ac_cv_lib_$ac_lib'+set}'`\" = set"; then
!   echo $ac_n "(cached) $ac_c" 1>&4
  else
    ac_save_LIBS="$LIBS"
  LIBS="$LIBS -l$ac_lib "
  cat > conftest.$ac_ext <<EOF
! #line 3376 "configure"
  #include "confdefs.h"

  int main() { return 0; }
--- 3377,3390 ----
    flex*) ac_lib=fl ;;
    *) ac_lib=l ;;
    esac
!   /bin/echo $ac_n "checking for -l$ac_lib""... $ac_c" 1>&4
  if eval "test \"`echo '${'ac_cv_lib_$ac_lib'+set}'`\" = set"; then
!   /bin/echo $ac_n "(cached) $ac_c" 1>&4
  else
    ac_save_LIBS="$LIBS"
  LIBS="$LIBS -l$ac_lib "
  cat > conftest.$ac_ext <<EOF
! #line 3387 "configure"
  #include "confdefs.h"

  int main() { return 0; }
***************
*** 3392,3401 ****

  fi
  if eval "test \"`echo '$ac_cv_lib_'$ac_lib`\" = yes"; then
!   echo "$ac_t""yes" 1>&4
    LEXLIB="-l$ac_lib"
  else
!   echo "$ac_t""no" 1>&4
  fi

  fi
--- 3404,3413 ----

  fi
  if eval "test \"`echo '$ac_cv_lib_'$ac_lib`\" = yes"; then
!   /bin/echo "$ac_t""yes" 1>&4
    LEXLIB="-l$ac_lib"
  else
!   /bin/echo "$ac_t""no" 1>&4
  fi

  fi
***************
*** 3403,3414 ****
  case "$LEX" in
    flex*)
      LFLAGS="-t -I"
!     echo "$ac_t""defining LFLAGS to be $LFLAGS" 1>&4
      LEXLIB=
    ;;
    *)
      LFLAGS="-t"
!     echo "$ac_t""defining LFLAGS to be $LFLAGS" 1>&4
      echo "configure: warning: I didn't find flex, but that's only a problem" 1>&2
      echo "configure: warning: if you need to reconstruct lex.cc" 1>&2
    ;;
--- 3415,3426 ----
  case "$LEX" in
    flex*)
      LFLAGS="-t -I"
!     /bin/echo "$ac_t""defining LFLAGS to be $LFLAGS" 1>&4
      LEXLIB=
    ;;
    *)
      LFLAGS="-t"
!     /bin/echo "$ac_t""defining LFLAGS to be $LFLAGS" 1>&4
      echo "configure: warning: I didn't find flex, but that's only a problem" 1>&2
      echo "configure: warning: if you need to reconstruct lex.cc" 1>&2
    ;;
***************
*** 3419,3427 ****
  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>&4
  if eval "test \"`echo '${'ac_cv_prog_YACC'+set}'`\" = set"; then
!   echo $ac_n "(cached) $ac_c" 1>&4
  else
    if test -n "$YACC"; then
    ac_cv_prog_YACC="$YACC" # Let the user override the test.
--- 3431,3439 ----
  do
  # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
! /bin/echo $ac_n "checking for $ac_word""... $ac_c" 1>&4
  if eval "test \"`echo '${'ac_cv_prog_YACC'+set}'`\" = set"; then
!   /bin/echo $ac_n "(cached) $ac_c" 1>&4
  else
    if test -n "$YACC"; then
    ac_cv_prog_YACC="$YACC" # Let the user override the test.
***************
*** 3439,3447 ****
  fi
  YACC="$ac_cv_prog_YACC"
  if test -n "$YACC"; then
!   echo "$ac_t""$YACC" 1>&4
  else
!   echo "$ac_t""no" 1>&4
  fi

  test -n "$YACC" && break
--- 3451,3459 ----
  fi
  YACC="$ac_cv_prog_YACC"
  if test -n "$YACC"; then
!   /bin/echo "$ac_t""$YACC" 1>&4
  else
!   /bin/echo "$ac_t""no" 1>&4
  fi

  test -n "$YACC" && break
***************
*** 3459,3467 ****

  # 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>&4
  if eval "test \"`echo '${'ac_cv_prog_RANLIB'+set}'`\" = set"; then
!   echo $ac_n "(cached) $ac_c" 1>&4
  else
    if test -n "$RANLIB"; then
    ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
--- 3471,3479 ----

  # Extract the first word of "ranlib", so it can be a program name with args.
  set dummy ranlib; ac_word=$2
! /bin/echo $ac_n "checking for $ac_word""... $ac_c" 1>&4
  if eval "test \"`echo '${'ac_cv_prog_RANLIB'+set}'`\" = set"; then
!   /bin/echo $ac_n "(cached) $ac_c" 1>&4
  else
    if test -n "$RANLIB"; then
    ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
***************
*** 3480,3496 ****
  fi
  RANLIB="$ac_cv_prog_RANLIB"
  if test -n "$RANLIB"; then
!   echo "$ac_t""$RANLIB" 1>&4
  else
!   echo "$ac_t""no" 1>&4
  fi


  # 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>&4
  if eval "test \"`echo '${'ac_cv_prog_RUNTEST'+set}'`\" = set"; then
!   echo $ac_n "(cached) $ac_c" 1>&4
  else
    if test -n "$RUNTEST"; then
    ac_cv_prog_RUNTEST="$RUNTEST" # Let the user override the test.
--- 3492,3508 ----
  fi
  RANLIB="$ac_cv_prog_RANLIB"
  if test -n "$RANLIB"; then
!   /bin/echo "$ac_t""$RANLIB" 1>&4
  else
!   /bin/echo "$ac_t""no" 1>&4
  fi


  # Extract the first word of "runtest", so it can be a program name with args.
  set dummy runtest; ac_word=$2
! /bin/echo $ac_n "checking for $ac_word""... $ac_c" 1>&4
  if eval "test \"`echo '${'ac_cv_prog_RUNTEST'+set}'`\" = set"; then
!   /bin/echo $ac_n "(cached) $ac_c" 1>&4
  else
    if test -n "$RUNTEST"; then
    ac_cv_prog_RUNTEST="$RUNTEST" # Let the user override the test.
***************
*** 3508,3523 ****
  fi
  RUNTEST="$ac_cv_prog_RUNTEST"
  if test -n "$RUNTEST"; then
!   echo "$ac_t""$RUNTEST" 1>&4
  else
!   echo "$ac_t""no" 1>&4
  fi

  # Extract the first word of "expect", so it can be a program name with args.
  set dummy expect; ac_word=$2
! echo $ac_n "checking for $ac_word""... $ac_c" 1>&4
  if eval "test \"`echo '${'ac_cv_prog_EXPECT'+set}'`\" = set"; then
!   echo $ac_n "(cached) $ac_c" 1>&4
  else
    if test -n "$EXPECT"; then
    ac_cv_prog_EXPECT="$EXPECT" # Let the user override the test.
--- 3520,3535 ----
  fi
  RUNTEST="$ac_cv_prog_RUNTEST"
  if test -n "$RUNTEST"; then
!   /bin/echo "$ac_t""$RUNTEST" 1>&4
  else
!   /bin/echo "$ac_t""no" 1>&4
  fi

  # Extract the first word of "expect", so it can be a program name with args.
  set dummy expect; ac_word=$2
! /bin/echo $ac_n "checking for $ac_word""... $ac_c" 1>&4
  if eval "test \"`echo '${'ac_cv_prog_EXPECT'+set}'`\" = set"; then
!   /bin/echo $ac_n "(cached) $ac_c" 1>&4
  else
    if test -n "$EXPECT"; then
    ac_cv_prog_EXPECT="$EXPECT" # Let the user override the test.
***************
*** 3535,3543 ****
  fi
  EXPECT="$ac_cv_prog_EXPECT"
  if test -n "$EXPECT"; then
!   echo "$ac_t""$EXPECT" 1>&4
  else
!   echo "$ac_t""no" 1>&4
  fi

  if test -z "$EXPECT" ; then
--- 3547,3555 ----
  fi
  EXPECT="$ac_cv_prog_EXPECT"
  if test -n "$EXPECT"; then
!   /bin/echo "$ac_t""$EXPECT" 1>&4
  else
!   /bin/echo "$ac_t""no" 1>&4
  fi

  if test -z "$EXPECT" ; then
***************
*** 3555,3569 ****
  # 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>&4
  if test -z "$INSTALL"; then
  if eval "test \"`echo '${'ac_cv_path_install'+set}'`\" = set"; then
!   echo $ac_n "(cached) $ac_c" 1>&4
  else
      IFS="${IFS=     }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
    for ac_dir in $PATH; do
      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
--- 3567,3581 ----
  # 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.
! /bin/echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&4
  if test -z "$INSTALL"; then
  if eval "test \"`echo '${'ac_cv_path_install'+set}'`\" = set"; then
!   /bin/echo $ac_n "(cached) $ac_c" 1>&4
  else
      IFS="${IFS=     }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
    for ac_dir in $PATH; do
      case "$ac_dir" in
!     ''|.|/gnu/etc) ;;
      *)
        # OSF1 and SCO ODT 3.0 have their own names for install.
        for ac_prog in ginstall installbsd scoinst install; do
***************
*** 3588,3594 ****
  fi
    INSTALL="$ac_cv_path_install"
  fi
! echo "$ac_t""$INSTALL" 1>&4

  # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
  # It thinks the first close brace ends the variable substitution.
--- 3600,3606 ----
  fi
    INSTALL="$ac_cv_path_install"
  fi
! /bin/echo "$ac_t""$INSTALL" 1>&4

  # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
  # It thinks the first close brace ends the variable substitution.
***************
*** 3599,3607 ****

  # 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>&4
  if eval "test \"`echo '${'ac_cv_prog_GNUPLOT_BINARY'+set}'`\" = set"; then
!   echo $ac_n "(cached) $ac_c" 1>&4
  else
    if test -n "$GNUPLOT_BINARY"; then
    ac_cv_prog_GNUPLOT_BINARY="$GNUPLOT_BINARY" # Let the user override the test.
--- 3611,3619 ----

  # Extract the first word of "gnuplot", so it can be a program name with args.
  set dummy gnuplot; ac_word=$2
! /bin/echo $ac_n "checking for $ac_word""... $ac_c" 1>&4
  if eval "test \"`echo '${'ac_cv_prog_GNUPLOT_BINARY'+set}'`\" = set"; then
!   /bin/echo $ac_n "(cached) $ac_c" 1>&4
  else
    if test -n "$GNUPLOT_BINARY"; then
    ac_cv_prog_GNUPLOT_BINARY="$GNUPLOT_BINARY" # Let the user override the test.
***************
*** 3619,3627 ****
  fi
  GNUPLOT_BINARY="$ac_cv_prog_GNUPLOT_BINARY"
  if test -n "$GNUPLOT_BINARY"; then
!   echo "$ac_t""$GNUPLOT_BINARY" 1>&4
  else
!   echo "$ac_t""no" 1>&4
  fi

  if test -z "$GNUPLOT_BINARY"; then
--- 3631,3639 ----
  fi
  GNUPLOT_BINARY="$ac_cv_prog_GNUPLOT_BINARY"
  if test -n "$GNUPLOT_BINARY"; then
!   /bin/echo "$ac_t""$GNUPLOT_BINARY" 1>&4
  else
!   /bin/echo "$ac_t""no" 1>&4
  fi

  if test -z "$GNUPLOT_BINARY"; then
***************
*** 3641,3649 ****
  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>&4
  if eval "test \"`echo '${'ac_cv_prog_DEFAULT_PAGER'+set}'`\" = set"; then
!   echo $ac_n "(cached) $ac_c" 1>&4
  else
    if test -n "$DEFAULT_PAGER"; then
    ac_cv_prog_DEFAULT_PAGER="$DEFAULT_PAGER" # Let the user override the test.
--- 3653,3661 ----
  do
  # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
! /bin/echo $ac_n "checking for $ac_word""... $ac_c" 1>&4
  if eval "test \"`echo '${'ac_cv_prog_DEFAULT_PAGER'+set}'`\" = set"; then
!   /bin/echo $ac_n "(cached) $ac_c" 1>&4
  else
    if test -n "$DEFAULT_PAGER"; then
    ac_cv_prog_DEFAULT_PAGER="$DEFAULT_PAGER" # Let the user override the test.
***************
*** 3661,3669 ****
  fi
  DEFAULT_PAGER="$ac_cv_prog_DEFAULT_PAGER"
  if test -n "$DEFAULT_PAGER"; then
!   echo "$ac_t""$DEFAULT_PAGER" 1>&4
  else
!   echo "$ac_t""no" 1>&4
  fi

  test -n "$DEFAULT_PAGER" && break
--- 3673,3681 ----
  fi
  DEFAULT_PAGER="$ac_cv_prog_DEFAULT_PAGER"
  if test -n "$DEFAULT_PAGER"; then
!   /bin/echo "$ac_t""$DEFAULT_PAGER" 1>&4
  else
!   /bin/echo "$ac_t""no" 1>&4
  fi

  test -n "$DEFAULT_PAGER" && break
***************
*** 3673,3679 ****
    echo "configure: warning: I couldn't find `less', `more', `page', or `pg'" 1>&2
  elif test "$DEFAULT_PAGER" = less; then
    DEFAULT_PAGER="less -e"
!   echo "$ac_t""defining DEFAULT_PAGER to be $DEFAULT_PAGER" 1>&4
  fi

  ### Even though we include config.h in most files, some need to be
--- 3685,3691 ----
    echo "configure: warning: I couldn't find `less', `more', `page', or `pg'" 1>&2
  elif test "$DEFAULT_PAGER" = less; then
    DEFAULT_PAGER="less -e"
!   /bin/echo "$ac_t""defining DEFAULT_PAGER to be $DEFAULT_PAGER" 1>&4
  fi

  ### Even though we include config.h in most files, some need to be
***************
*** 3694,3700 ****
  rm -f conftest.defs

  UGLY_DEFS="$DEFS"
! echo "$ac_t""defining UGLY_DEFS to be $UGLY_DEFS" 1>&4


  ### Maybe add -Wall to compiler flags now that we're done feature
--- 3706,3712 ----
  rm -f conftest.defs

  UGLY_DEFS="$DEFS"
! /bin/echo "$ac_t""defining UGLY_DEFS to be $UGLY_DEFS" 1>&4


  ### Maybe add -Wall to compiler flags now that we're done feature
***************
*** 3722,3732 ****

  if $ADD_CXX_WALL; then
    CXXFLAGS="$CXXFLAGS -Wall"
!   echo "$ac_t""adding -Wall to CXXFLAGS" 1>&4
  fi
  if $ADD_CC_WALL; then
    CFLAGS="$CFLAGS -Wall"
!   echo "$ac_t""adding -Wall to CFLAGS" 1>&4
  fi

  ### Do the substitutions in all the Makefiles.
--- 3734,3744 ----

  if $ADD_CXX_WALL; then
    CXXFLAGS="$CXXFLAGS -Wall"
!   /bin/echo "$ac_t""adding -Wall to CXXFLAGS" 1>&4
  fi
  if $ADD_CC_WALL; then
    CFLAGS="$CFLAGS -Wall"
!   /bin/echo "$ac_t""adding -Wall to CFLAGS" 1>&4
  fi

  ### Do the substitutions in all the Makefiles.
***************
*** 3783,3789 ****
  : ${CONFIG_STATUS=./config.status}

  echo creating $CONFIG_STATUS
! rm -f $CONFIG_STATUS
  cat > $CONFIG_STATUS <<EOF
  #!/bin/sh
  # Generated automatically by configure.
--- 3795,3803 ----
  : ${CONFIG_STATUS=./config.status}

  echo creating $CONFIG_STATUS
! # Some systems, like AmigaDOS, won't allow you to remove a script that is
! # being executed, so just move it out of the way instead.
! if test -f $CONFIG_STATUS; then mv $CONFIG_STATUS $CONFIG_STATUS.old; else true; fi
  cat > $CONFIG_STATUS <<EOF
  #!/bin/sh
  # Generated automatically by configure.
***************
*** 3804,3810 ****
      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.1"
      exit 0 ;;
    -help | --help | --hel | --he | --h)
      echo "\$ac_cs_usage"; exit 0 ;;
--- 3818,3824 ----
      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)
!     /bin/echo "$CONFIG_STATUS generated by autoconf version 2.1"
      exit 0 ;;
    -help | --help | --hel | --he | --h)
      echo "\$ac_cs_usage"; exit 0 ;;
***************
*** 3904,3924 ****
  for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
    # Support "outfile[:infile]", defaulting infile="outfile.in".
    case "$ac_file" in
!   *:*) ac_file_in=`echo "$ac_file"|sed 's%.*:%%'`
!        ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
    *) ac_file_in="${ac_file}.in" ;;
    esac

    # Adjust relative srcdir, etc. for subdirectories.

    # Remove last slash and all that follows it.  Not all systems have dirname.
!   ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
    if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
      # The file is in a subdirectory.
      test ! -d "$ac_dir" && mkdir "$ac_dir"
      ac_dir_suffix="/$ac_dir"
      # A "../" for each directory in $ac_dir_suffix.
!     ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'`
    else
      ac_dir_suffix= ac_dots=
    fi
--- 3918,3938 ----
  for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
    # Support "outfile[:infile]", defaulting infile="outfile.in".
    case "$ac_file" in
!   *:*) ac_file_in=`/bin/echo "$ac_file"|sed 's%.*:%%'`
!        ac_file=`/bin/echo "$ac_file"|sed 's%:.*%%'` ;;
    *) ac_file_in="${ac_file}.in" ;;
    esac

    # Adjust relative srcdir, etc. for subdirectories.

    # Remove last slash and all that follows it.  Not all systems have dirname.
!   ac_dir=`/bin/echo $ac_file|sed 's%/[^/][^/]*$%%'`
    if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
      # The file is in a subdirectory.
      test ! -d "$ac_dir" && mkdir "$ac_dir"
      ac_dir_suffix="/$ac_dir"
      # A "../" for each directory in $ac_dir_suffix.
!     ac_dots=`/bin/echo $ac_dir_suffix|sed 's%/[^/]*%../%g'`
    else
      ac_dir_suffix= ac_dots=
    fi
***************
*** 3926,3932 ****
    case "$ac_given_srcdir" in
    .)  srcdir=.
        if test -z "$ac_dots"; then top_srcdir=.
!       else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;;
    /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;;
    *) # Relative path.
      srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
--- 3940,3946 ----
    case "$ac_given_srcdir" in
    .)  srcdir=.
        if test -z "$ac_dots"; then top_srcdir=.
!       else top_srcdir=`/bin/echo $ac_dots|sed 's%/$%%'`; fi ;;
    /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;;
    *) # Relative path.
      srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
***************
*** 3939,3945 ****
    esac
    echo creating "$ac_file"
    rm -f "$ac_file"
!   configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
    case "$ac_file" in
    *Makefile*) ac_comsub="1i\\
  # $configure_input" ;;
--- 3953,3959 ----
    esac
    echo creating "$ac_file"
    rm -f "$ac_file"
!   configure_input="Generated automatically from `/bin/echo $ac_file_in|sed 's%.*/%%'` by configure."
    case "$ac_file" in
    *Makefile*) ac_comsub="1i\\
  # $configure_input" ;;
***************
*** 3977,3984 ****
  for ac_file in .. $CONFIG_HEADERS; do if test "x$ac_file" != x..; then
    # Support "outfile[:infile]", defaulting infile="outfile.in".
    case "$ac_file" in
!   *:*) ac_file_in=`echo "$ac_file"|sed 's%.*:%%'`
!        ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
    *) ac_file_in="${ac_file}.in" ;;
    esac

--- 3991,3998 ----
  for ac_file in .. $CONFIG_HEADERS; do if test "x$ac_file" != x..; then
    # Support "outfile[:infile]", defaulting infile="outfile.in".
    case "$ac_file" in
!   *:*) ac_file_in=`/bin/echo "$ac_file"|sed 's%.*:%%'`
!        ac_file=`/bin/echo "$ac_file"|sed 's%:.*%%'` ;;
    *) ac_file_in="${ac_file}.in" ;;
    esac

***************
*** 4042,4048 ****
    cat conftest.in >> conftest.h
    rm -f conftest.in
    if cmp -s $ac_file conftest.h 2>/dev/null; then
!     echo "$ac_file is unchanged"
      rm -f conftest.h
    else
      rm -f $ac_file
--- 4056,4062 ----
    cat conftest.in >> conftest.h
    rm -f conftest.in
    if cmp -s $ac_file conftest.h 2>/dev/null; then
!     /bin/echo "$ac_file is unchanged"
      rm -f conftest.h
    else
      rm -f $ac_file
diff -rc --new-file octave-1.1.1-base/configure.in octave-1.1.1/configure.in
*** octave-1.1.1-base/configure.in    Tue Feb 14 22:12:35 1995
--- octave-1.1.1/configure.in    Sat Mar 25 07:56:36 1995
***************
*** 41,50 ****
  AC_SUBST(target_host_type)

  ### Allow the user to force us to use f2c.

  AC_ARG_WITH(f2c,
    [  --with-f2c              use f2c even if Fortran compiler is available],
!   use_f2c=true, use_f2c=false)

  ### Allow the user to experiment with dynamic linking using GNU dld.

--- 41,51 ----
  AC_SUBST(target_host_type)

  ### Allow the user to force us to use f2c.
+ ### Amiga hack -- the GNU f77 compiler won't quite work yet so force this.

  AC_ARG_WITH(f2c,
    [  --with-f2c              use f2c even if Fortran compiler is available],
!   use_f2c=true, use_f2c=true)

  ### Allow the user to experiment with dynamic linking using GNU dld.

***************
*** 66,72 ****

  ### some defaults

! AC_PREFIX_DEFAULT(/usr/local)

  exec_prefix='$(prefix)'
  bindir='$(exec_prefix)/bin'
--- 67,73 ----

  ### some defaults

! AC_PREFIX_DEFAULT(/gnu)

  exec_prefix='$(prefix)'
  bindir='$(exec_prefix)/bin'
***************
*** 211,217 ****
    2.[6789].*|2.[123456789][0123456789].*)
  changequote([,])dnl
      if test -z "$CXXFLAGS"; then
!       CXXFLAGS="-g -O"
        AC_MSG_RESULT([defining CXXFLAGS to be $CXXFLAGS])
        ADD_CXX_WALL=true
      fi
--- 212,218 ----
    2.[6789].*|2.[123456789][0123456789].*)
  changequote([,])dnl
      if test -z "$CXXFLAGS"; then
!       CXXFLAGS="-O"
        AC_MSG_RESULT([defining CXXFLAGS to be $CXXFLAGS])
        ADD_CXX_WALL=true
      fi
***************
*** 265,276 ****
  case "$gcc_version" in
    2.*)
      if test -z "$CFLAGS"; then
!       CFLAGS="-g -O"
        AC_MSG_RESULT([defining CFLAGS to be $CFLAGS])
        ADD_CC_WALL=true
      fi
      if test -z "$LDFLAGS"; then
!       LDFLAGS="-g"
        AC_MSG_RESULT([defining LDFLAGS to be $LDFLAGS])
      fi
    ;;
--- 266,277 ----
  case "$gcc_version" in
    2.*)
      if test -z "$CFLAGS"; then
!       CFLAGS="-O"
        AC_MSG_RESULT([defining CFLAGS to be $CFLAGS])
        ADD_CC_WALL=true
      fi
      if test -z "$LDFLAGS"; then
!       LDFLAGS="-s"    # Amiga version won't run if not stripped -FIXME!
        AC_MSG_RESULT([defining LDFLAGS to be $LDFLAGS])
      fi
    ;;
diff -rc --new-file octave-1.1.1-base/doc/Makefile.in octave-1.1.1/doc/Makefile.in
*** octave-1.1.1-base/doc/Makefile.in    Tue Jan 24 21:05:45 1995
--- octave-1.1.1/doc/Makefile.in    Fri Mar 24 09:51:20 1995
***************
*** 64,70 ****
      -makeinfo -I$(srcdir) octave.texi

  octave.dvi: $(TEXINFO) conf.texi
!     texi2dvi $(srcdir)/octave.texi

  octave.ps: octave.dvi
      dvips -o octave.ps octave.dvi
--- 64,70 ----
      -makeinfo -I$(srcdir) octave.texi

  octave.dvi: $(TEXINFO) conf.texi
!     -texi2dvi $(srcdir)/octave.texi

  octave.ps: octave.dvi
      dvips -o octave.ps octave.dvi
***************
*** 73,79 ****
      -makeinfo -I$(srcdir) FAQ.texi

  FAQ.dvi: FAQ.texi
!     texi2dvi $(srcdir)/FAQ.texi

  FAQ.ps: FAQ.dvi
      dvips -o FAQ.ps FAQ.dvi
--- 73,79 ----
      -makeinfo -I$(srcdir) FAQ.texi

  FAQ.dvi: FAQ.texi
!     -texi2dvi $(srcdir)/FAQ.texi

  FAQ.ps: FAQ.dvi
      dvips -o FAQ.ps FAQ.dvi
***************
*** 82,88 ****
      -makeinfo -I$(srcdir) liboctave.texi

  liboctave.dvi: $(LIB_TEXINFO) conf.texi
!     texi2dvi $(srcdir)/liboctave.texi

  liboctave.ps: liboctave.dvi
      dvips -o liboctave.ps liboctave.dvi
--- 82,88 ----
      -makeinfo -I$(srcdir) liboctave.texi

  liboctave.dvi: $(LIB_TEXINFO) conf.texi
!     -texi2dvi $(srcdir)/liboctave.texi

  liboctave.ps: liboctave.dvi
      dvips -o liboctave.ps liboctave.dvi
diff -rc --new-file octave-1.1.1-base/f2c-compat.sh octave-1.1.1/f2c-compat.sh
*** octave-1.1.1-base/f2c-compat.sh    Wed Jan  5 17:48:06 1994
--- octave-1.1.1/f2c-compat.sh    Fri Mar 24 15:28:52 1995
***************
*** 62,72 ****
  }
  EOF

! ${CC-cc} -c ctest.c > /dev/null 2>&1

  FLIBS=`F77="${F77-f77}" $FLIBS_SH`

! ${CC-cc} -o ctest ctest.o ftest.o $FLIBS -lm > /dev/null 2>&1

  ctest_output=`./ctest 2>&1`
  status=$?
--- 62,72 ----
  }
  EOF

! ${CC-gcc} -c ctest.c > /dev/null 2>&1

  FLIBS=`F77="${F77-f77}" $FLIBS_SH`

! ${CC-gcc} -o ctest ctest.o ftest.o $FLIBS -lm > /dev/null 2>&1

  ctest_output=`./ctest 2>&1`
  status=$?
***************
*** 100,108 ****
  }
  EOF

!   ${CC-cc} -c ctest.c > /dev/null 2>&1

!   ${CC-cc} -o ctest ctest.o ftest.o $FLIBS -lm > /dev/null 2>&1

    ctest_output=`./ctest 2>&1`
    status=$?
--- 100,108 ----
  }
  EOF

!   ${CC-gcc} -c ctest.c > /dev/null 2>&1

!   ${CC-gcc} -o ctest ctest.o ftest.o $FLIBS -lm > /dev/null 2>&1

    ctest_output=`./ctest 2>&1`
    status=$?
diff -rc --new-file octave-1.1.1-base/flibs.sh octave-1.1.1/flibs.sh
*** octave-1.1.1-base/flibs.sh    Wed Jan 25 15:44:19 1995
--- octave-1.1.1/flibs.sh    Fri Mar 24 15:29:18 1995
***************
*** 32,40 ****
    foutput=`echo $foutput | sed 's/,/ /g'`
  fi

! ld_run_path=`echo $foutput | \
!   sed -n -e 's/.*\(LD_RUN_PATH *= *[^ ]*\).*/\1/p' | \
!   sed -e 's/LD_RUN_PATH *= *//'`

  # We are only supposed to find this on Solaris systems, and this
  # substitution is probably only going to work with gcc on those
--- 32,42 ----
    foutput=`echo $foutput | sed 's/,/ /g'`
  fi

! #Begin amiga hack - sed command crashes amiga
! #ld_run_path=`echo $foutput | \
! #  sed -n -e 's/.*\(LD_RUN_PATH *= *[^ ]*\).*/\1/p' | \
! #  sed -e 's/LD_RUN_PATH *= *//'`
! #End amiga hack

  # We are only supposed to find this on Solaris systems, and this
  # substitution is probably only going to work with gcc on those
diff -rc --new-file octave-1.1.1-base/info/Makefile.in octave-1.1.1/info/Makefile.in
*** octave-1.1.1-base/info/Makefile.in    Tue Nov 15 21:49:10 1994
--- octave-1.1.1/info/Makefile.in    Sun Mar  5 12:19:02 1995
***************
*** 23,29 ****

  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
! VPATH  = @srcdir@:@srcdir@/../src

  include $(TOPDIR)/Makeconf

--- 23,29 ----

  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
! VPATH  = @srcdir@;@srcdir@/../src

  include $(TOPDIR)/Makeconf

diff -rc --new-file octave-1.1.1-base/info/general.h octave-1.1.1/info/general.h
*** octave-1.1.1-base/info/general.h    Mon Feb  1 18:44:09 1993
--- octave-1.1.1/info/general.h    Sun Mar  5 09:57:24 1995
***************
*** 31,37 ****
  #endif /* HAVE_UNISTD_H */

  #if defined (HAVE_STRING_H)
! #  include <string.h>
  #else
  #  include <strings.h>
  #endif /* !HAVE_STRING_H */
--- 31,37 ----
  #endif /* HAVE_UNISTD_H */

  #if defined (HAVE_STRING_H)
! #  include </gnu/include/string.h>
  #else
  #  include <strings.h>
  #endif /* !HAVE_STRING_H */
diff -rc --new-file octave-1.1.1-base/info/termdep.h octave-1.1.1/info/termdep.h
*** octave-1.1.1-base/info/termdep.h    Wed Oct 20 21:55:53 1993
--- octave-1.1.1/info/termdep.h    Sun Mar  5 09:57:24 1995
***************
*** 30,36 ****
  #if defined (HAVE_TERMIOS_H)

  #include <termios.h>
! #include <string.h>
  #if defined (HAVE_SYS_PTEM_H)
  #if !defined (M_XENIX)
  #include <sys/stream.h>
--- 30,36 ----
  #if defined (HAVE_TERMIOS_H)

  #include <termios.h>
! #include </gnu/include/string.h>
  #if defined (HAVE_SYS_PTEM_H)
  #if !defined (M_XENIX)
  #include <sys/stream.h>
***************
*** 44,50 ****
  #elif defined (HAVE_TERMIO_H)

  #include <termio.h>
! #include <string.h>
  #if defined (HAVE_SYS_PTEM_H)
  #if !defined (M_XENIX)
  #include <sys/stream.h>
--- 44,50 ----
  #elif defined (HAVE_TERMIO_H)

  #include <termio.h>
! #include </gnu/include/string.h>
  #if defined (HAVE_SYS_PTEM_H)
  #if !defined (M_XENIX)
  #include <sys/stream.h>
diff -rc --new-file octave-1.1.1-base/kpathsea/Makefile octave-1.1.1/kpathsea/Makefile
*** octave-1.1.1-base/kpathsea/Makefile    Thu Feb 23 20:27:11 1995
--- octave-1.1.1/kpathsea/Makefile    Sun Mar  5 09:57:26 1995
***************
*** 120,126 ****
  RANLIB = ranlib

  # Installation.
! INSTALL = /usr/local/gnu/bin/install -c
  INSTALL_PROGRAM = ${INSTALL}
  INSTALL_DATA = ${INSTALL} -m 644

--- 120,126 ----
  RANLIB = ranlib

  # Installation.
! INSTALL = /bin/install -c
  INSTALL_PROGRAM = ${INSTALL}
  INSTALL_DATA = ${INSTALL} -m 644

diff -rc --new-file octave-1.1.1-base/kpathsea/c-auto.h octave-1.1.1/kpathsea/c-auto.h
*** octave-1.1.1-base/kpathsea/c-auto.h    Fri Jan 27 17:19:32 1995
--- octave-1.1.1/kpathsea/c-auto.h    Sun Mar  5 10:00:34 1995
***************
*** 183,189 ****
  #define HAVE_LGAMMA 1

  /* Define if you have the memmove function.  */
! /* #undef HAVE_MEMMOVE */

  /* Define if you have the on_exit function.  */
  #define HAVE_ON_EXIT 1
--- 183,189 ----
  #define HAVE_LGAMMA 1

  /* Define if you have the memmove function.  */
! #define HAVE_MEMMOVE 1

  /* Define if you have the on_exit function.  */
  #define HAVE_ON_EXIT 1
diff -rc --new-file octave-1.1.1-base/kpathsea/c-std.h octave-1.1.1/kpathsea/c-std.h
*** octave-1.1.1-base/kpathsea/c-std.h    Tue Feb  1 18:38:39 1994
--- octave-1.1.1/kpathsea/c-std.h    Thu Mar 23 20:01:10 1995
***************
*** 101,106 ****
  #endif

  /* hypot appears not to have made it into POSIX.2, even.  */
! extern double hypot ();

  #endif /* not KPATHSEA_C_STD_H */
--- 101,108 ----
  #endif

  /* hypot appears not to have made it into POSIX.2, even.  */
! #ifndef __amigados__
! extern const double hypot ();
! #endif

  #endif /* not KPATHSEA_C_STD_H */
diff -rc --new-file octave-1.1.1-base/readline/chardefs.h octave-1.1.1/readline/chardefs.h
*** octave-1.1.1-base/readline/chardefs.h    Wed Jan 26 20:17:39 1994
--- octave-1.1.1/readline/chardefs.h    Sun Mar  5 09:57:30 1995
***************
*** 5,11 ****
  #include <ctype.h>

  #if defined (HAVE_STRING_H)
! #  include <string.h>
  #else
  #  include <strings.h>
  #endif /* HAVE_STRING_H */
--- 5,11 ----
  #include <ctype.h>

  #if defined (HAVE_STRING_H)
! #  include </gnu/include/string.h>
  #else
  #  include <strings.h>
  #endif /* HAVE_STRING_H */
diff -rc --new-file octave-1.1.1-base/readline/complete.c octave-1.1.1/readline/complete.c
*** octave-1.1.1-base/readline/complete.c    Wed Jan 26 20:17:39 1994
--- octave-1.1.1/readline/complete.c    Sun Mar  5 15:39:56 1995
***************
*** 906,911 ****
--- 906,914 ----
       int state;
       char *text;
  {
+ #ifdef __amigados__
+   return ((char *) NULL);
+ #else
  #if defined (_GO32_)
    return (char *)NULL;
  #else /* !_GO32_ */
***************
*** 955,960 ****
--- 958,964 ----
        return (value);
      }
  #endif /* !_GO32_ */
+ #endif /* __amigados__ */
  }

  /* **************************************************************** */
diff -rc --new-file octave-1.1.1-base/readline/history.c octave-1.1.1/readline/history.c
*** octave-1.1.1-base/readline/history.c    Wed Jan 26 20:17:39 1994
--- octave-1.1.1/readline/history.c    Sun Mar  5 09:57:32 1995
***************
*** 44,50 ****
  #  include <unistd.h>
  #endif
  #if defined (HAVE_STRING_H)
! #  include <string.h>
  #else
  #  include <strings.h>
  #endif /* !HAVE_STRING_H */
--- 44,50 ----
  #  include <unistd.h>
  #endif
  #if defined (HAVE_STRING_H)
! #  include </gnu/include/string.h>
  #else
  #  include <strings.h>
  #endif /* !HAVE_STRING_H */
diff -rc --new-file octave-1.1.1-base/readline/rldefs.h octave-1.1.1/readline/rldefs.h
*** octave-1.1.1-base/readline/rldefs.h    Sun Jan 15 23:02:22 1995
--- octave-1.1.1/readline/rldefs.h    Sun Mar  5 09:57:32 1995
***************
*** 136,142 ****
     string functions to include and include it. */

  #if defined (STDC_HEADERS) || defined (HAVE_STRING_H)
! #  include <string.h>
  /* An ANSI string.h and pre-ANSI memory.h might conflict.  */
  #  if !defined (STDC_HEADERS) && defined (HAVE_MEMORY_H)
  #    include <memory.h>
--- 136,142 ----
     string functions to include and include it. */

  #if defined (STDC_HEADERS) || defined (HAVE_STRING_H)
! #  include </gnu/include/string.h>
  /* An ANSI string.h and pre-ANSI memory.h might conflict.  */
  #  if !defined (STDC_HEADERS) && defined (HAVE_MEMORY_H)
  #    include <memory.h>
diff -rc --new-file octave-1.1.1-base/readline/tilde.c octave-1.1.1/readline/tilde.c
*** octave-1.1.1-base/readline/tilde.c    Wed Apr 20 06:52:22 1994
--- octave-1.1.1/readline/tilde.c    Sun Mar  5 09:57:34 1995
***************
*** 33,39 ****
  #endif /* !__GNUC__ */

  #if defined (HAVE_STRING_H)
! #  include <string.h>
  #else /* !HAVE_STRING_H */
  #  include <strings.h>
  #endif /* !HAVE_STRING_H */
--- 33,39 ----
  #endif /* !__GNUC__ */

  #if defined (HAVE_STRING_H)
! #  include </gnu/include/string.h>
  #else /* !HAVE_STRING_H */
  #  include <strings.h>
  #endif /* !HAVE_STRING_H */
diff -rc --new-file octave-1.1.1-base/src/Makefile.in octave-1.1.1/src/Makefile.in
*** octave-1.1.1-base/src/Makefile.in    Wed Feb 22 20:47:47 1995
--- octave-1.1.1/src/Makefile.in    Fri Mar 24 10:21:14 1995
***************
*** 17,23 ****
  INSTALL = @INSTALL@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_DATA = @INSTALL_DATA@
!
  # Cancel default rule for .c from .y and make .cc from .y instead.

  %.c : %.y
--- 17,25 ----
  INSTALL = @INSTALL@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_DATA = @INSTALL_DATA@
! # Amiga hack - we have 'ln' and 'ln -s', but they seem to cause
! # more problems than they solve.
! LN = cp
  # Cancel default rule for .c from .y and make .cc from .y instead.

  %.c : %.y
***************
*** 153,161 ****
      $(top_srcdir)/mkinstalldirs $(bindir) $(libdir)
      rm -f $(bindir)/octave
      $(INSTALL) octave $(bindir)/octave-$(version)
!     ln $(bindir)/octave-$(version) $(bindir)/octave
      if $(OCTAVE_LITE) && $(WITH_DLD) ; then \
        $(INSTALL_DATA) liboctdld.a $(libdir)/liboctdld.a ; \
      fi
  .PHONY: install

--- 155,165 ----
      $(top_srcdir)/mkinstalldirs $(bindir) $(libdir)
      rm -f $(bindir)/octave
      $(INSTALL) octave $(bindir)/octave-$(version)
!     $(LN) $(bindir)/octave-$(version) $(bindir)/octave
      if $(OCTAVE_LITE) && $(WITH_DLD) ; then \
        $(INSTALL_DATA) liboctdld.a $(libdir)/liboctdld.a ; \
+     else \
+       true ; \
      fi
  .PHONY: install

***************
*** 187,199 ****
  .PHONY: realclean

  local-dist: parse.cc lex.cc
!     ln $(DISTFILES) ../`cat ../.fname`/src
      rm -f parse.cc lex.cc y.tab.h y.output yy.lex.c
      rm -f lex.cc parse.cc defaults.h *.d *.def
  .PHONY: local-dist

  dist: parse.cc lex.cc
!     ln $(DISTFILES) ../`cat ../.fname`/src
      rm -f parse.cc lex.cc y.tab.h y.output yy.lex.c
      rm -f lex.cc parse.cc defaults.h *.d *.def builtins.cc
  .PHONY: dist
--- 191,203 ----
  .PHONY: realclean

  local-dist: parse.cc lex.cc
!     $(LN) $(DISTFILES) ../`cat ../.fname`/src
      rm -f parse.cc lex.cc y.tab.h y.output yy.lex.c
      rm -f lex.cc parse.cc defaults.h *.d *.def
  .PHONY: local-dist

  dist: parse.cc lex.cc
!     $(LN) $(DISTFILES) ../`cat ../.fname`/src
      rm -f parse.cc lex.cc y.tab.h y.output yy.lex.c
      rm -f lex.cc parse.cc defaults.h *.d *.def builtins.cc
  .PHONY: dist
diff -rc --new-file octave-1.1.1-base/src/dirfns.cc octave-1.1.1/src/dirfns.cc
*** octave-1.1.1-base/src/dirfns.cc    Wed Feb 15 04:11:01 1995
--- octave-1.1.1/src/dirfns.cc    Sun Mar  5 09:57:36 1995
***************
*** 46,52 ****
  #include <stdio.h>
  #include <stddef.h>
  #include <stdlib.h>
! #include <string.h>
  #include <strstream.h>
  #include <sys/param.h>

--- 46,52 ----
  #include <stdio.h>
  #include <stddef.h>
  #include <stdlib.h>
! #include </gnu/include/string.h>
  #include <strstream.h>
  #include <sys/param.h>

diff -rc --new-file octave-1.1.1-base/src/file-io.cc octave-1.1.1/src/file-io.cc
*** octave-1.1.1-base/src/file-io.cc    Mon Jan 30 21:19:47 1995
--- octave-1.1.1/src/file-io.cc    Sun Mar  5 09:57:38 1995
***************
*** 29,35 ****

  #include <DLList.h>
  #include <unistd.h>
! #include <string.h>
  #include <stdio.h>
  #include <errno.h>
  #include <stdlib.h>
--- 29,35 ----

  #include <DLList.h>
  #include <unistd.h>
! #include </gnu/include/string.h>
  #include <stdio.h>
  #include <errno.h>
  #include <stdlib.h>
diff -rc --new-file octave-1.1.1-base/src/getopt.c octave-1.1.1/src/getopt.c
*** octave-1.1.1-base/src/getopt.c    Wed Sep 29 23:01:48 1993
--- octave-1.1.1/src/getopt.c    Sun Mar  5 09:57:40 1995
***************
*** 178,184 ****
     because there are many ways it can cause trouble.
     On some systems, it contains special magic macros that don't work
     in GCC.  */
! #include <string.h>
  #define    my_index    strchr
  #define    my_bcopy(src, dst, n)    memcpy ((dst), (src), (n))
  #else
--- 178,184 ----
     because there are many ways it can cause trouble.
     On some systems, it contains special magic macros that don't work
     in GCC.  */
! #include </gnu/include/string.h>
  #define    my_index    strchr
  #define    my_bcopy(src, dst, n)    memcpy ((dst), (src), (n))
  #else
diff -rc --new-file octave-1.1.1-base/src/input.cc octave-1.1.1/src/input.cc
*** octave-1.1.1-base/src/input.cc    Wed Feb 22 00:40:02 1995
--- octave-1.1.1/src/input.cc    Sun Mar  5 10:01:36 1995
***************
*** 46,52 ****
  #include <stdlib.h>
  #include <iostream.h>
  #include <strstream.h>
! #include <string.h>
  #include <assert.h>
  #include <signal.h>

--- 46,52 ----
  #include <stdlib.h>
  #include <iostream.h>
  #include <strstream.h>
! #include </gnu/include/string.h>
  #include <assert.h>
  #include <signal.h>

diff -rc --new-file octave-1.1.1-base/src/lex.cc octave-1.1.1/src/lex.cc
*** octave-1.1.1-base/src/lex.cc    Fri Feb 24 01:17:43 1995
--- octave-1.1.1/src/lex.cc    Sun Mar  5 10:02:44 1995
***************
*** 518,524 ****

  #include <strstream.h>
  #include <ctype.h>
! #include <string.h>

  #include "input.h"
  #include "token.h"
--- 518,524 ----

  #include <strstream.h>
  #include <ctype.h>
! #include </gnu/include/string.h>

  #include "input.h"
  #include "token.h"
diff -rc --new-file octave-1.1.1-base/src/lex.l octave-1.1.1/src/lex.l
*** octave-1.1.1-base/src/lex.l    Wed Feb  1 23:59:47 1995
--- octave-1.1.1/src/lex.l    Sun Mar  5 10:02:16 1995
***************
*** 33,39 ****

  #include <strstream.h>
  #include <ctype.h>
! #include <string.h>

  #include "input.h"
  #include "token.h"
--- 33,39 ----

  #include <strstream.h>
  #include <ctype.h>
! #include </gnu/include/string.h>

  #include "input.h"
  #include "token.h"
diff -rc --new-file octave-1.1.1-base/src/load-save.cc octave-1.1.1/src/load-save.cc
*** octave-1.1.1-base/src/load-save.cc    Mon Feb 13 03:22:26 1995
--- octave-1.1.1/src/load-save.cc    Sun Mar  5 09:57:52 1995
***************
*** 27,33 ****

  #include <float.h>
  #include <limits.h>
! #include <string.h>
  #include <iostream.h>
  #include <fstream.h>
  #include <strstream.h>
--- 27,33 ----

  #include <float.h>
  #include <limits.h>
! #include </gnu/include/string.h>
  #include <iostream.h>
  #include <fstream.h>
  #include <strstream.h>
diff -rc --new-file octave-1.1.1-base/src/missing-math.h octave-1.1.1/src/missing-math.h
*** octave-1.1.1-base/src/missing-math.h    Fri Jan 27 15:01:25 1995
--- octave-1.1.1/src/missing-math.h    Thu Mar 23 20:47:42 1995
***************
*** 32,38 ****
  {
  extern double acosh ();
  extern double asinh ();
! extern double atanh ();
  extern double erf ();
  extern double erfc ();
  extern double lgamma ();
--- 32,40 ----
  {
  extern double acosh ();
  extern double asinh ();
! #ifndef __amigados__    /* Conflicts with <math.h> */
! extern double const atanh ();
! #endif
  extern double erf ();
  extern double erfc ();
  extern double lgamma ();
diff -rc --new-file octave-1.1.1-base/src/octave-hist.cc octave-1.1.1/src/octave-hist.cc
*** octave-1.1.1-base/src/octave-hist.cc    Wed Jan  4 04:03:30 1995
--- octave-1.1.1/src/octave-hist.cc    Sun Mar  5 09:57:54 1995
***************
*** 38,44 ****
  #endif
  #include <fcntl.h>
  #include <stdlib.h>
! #include <string.h>
  #include <signal.h>
  #include <fstream.h>
  #include <strstream.h>
--- 38,44 ----
  #endif
  #include <fcntl.h>
  #include <stdlib.h>
! #include </gnu/include/string.h>
  #include <signal.h>
  #include <fstream.h>
  #include <strstream.h>
diff -rc --new-file octave-1.1.1-base/src/octave.cc octave-1.1.1/src/octave.cc
*** octave-1.1.1-base/src/octave.cc    Thu Feb 23 20:09:45 1995
--- octave-1.1.1/src/octave.cc    Thu Mar  9 07:46:48 1995
***************
*** 35,46 ****
  #include <time.h>
  #include <pwd.h>
  #include <stdlib.h>
! #include <string.h>
  #include <signal.h>
  #include <assert.h>
  #include <iostream.h>
  #include <strstream.h>
  #include <fstream.h>

  extern "C"
  {
--- 35,47 ----
  #include <time.h>
  #include <pwd.h>
  #include <stdlib.h>
! #include </gnu/include/string.h>
  #include <signal.h>
  #include <assert.h>
  #include <iostream.h>
  #include <strstream.h>
  #include <fstream.h>
+ #include <stdio.h>

  extern "C"
  {
***************
*** 457,462 ****
--- 458,464 ----
  // come before the options are processed because some command line
  // options override defaults.

+   printf ("Hi, I'm octave!\n"); fflush (stdout);
    init_user_prefs ();

    initialize_pager ();
***************
*** 973,975 ****
--- 975,978 ----
  ;;; page-delimiter: "^/\\*" ***
  ;;; End: ***
  */
+
diff -rc --new-file octave-1.1.1-base/src/octave.cc.new octave-1.1.1/src/octave.cc.new
*** octave-1.1.1-base/src/octave.cc.new    Thu Jan  1 00:00:00 1970
--- octave-1.1.1/src/octave.cc.new    Thu Mar  9 07:46:22 1995
***************
*** 0 ****
--- 1,978 ----
+ // octave.cc                                            -*- C++ -*-
+ /*
+
+ Copyright (C) 1992, 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.
+
+ */
+
+ // Born February 20, 1992.
+
+ #ifdef HAVE_CONFIG_H
+ #include "config.h"
+ #endif
+
+ #include <sys/types.h>
+ #ifdef HAVE_UNISTD_H
+ #include <unistd.h>
+ #endif
+ #include <sys/stat.h>
+ #include <time.h>
+ #include <pwd.h>
+ #include <stdlib.h>
+ #include </gnu/include/string.h>
+ #include <signal.h>
+ #include <assert.h>
+ #include <iostream.h>
+ #include <strstream.h>
+ #include <fstream.h>
+ #include <stdio.h>
+
+ extern "C"
+ {
+ #include <setjmp.h>
+ }
+
+ #include "getopt.h"
+
+ #include "lo-error.h"
+
+ #include "sighandlers.h"
+ #include "variables.h"
+ #include "error.h"
+ #include "dynamic-ld.h"
+ #include "tree-misc.h"
+ #include "tree-const.h"
+ #include "tree-plot.h"
+ #include "utils.h"
+ #include "input.h"
+ #include "pager.h"
+ #include "lex.h"
+ #include "help.h"
+ #include "octave.h"
+ #include "parse.h"
+ #include "defaults.h"
+ #include "user-prefs.h"
+ #include "procstream.h"
+ #include "unwind-prot.h"
+ #include "octave-hist.h"
+ #include "builtins.h"
+ #include "version.h"
+ #include "file-io.h"
+ #include "sysdep.h"
+ #include "defun.h"
+
+ #if !defined (HAVE_ATEXIT) && defined (HAVE_ON_EXIT)
+ extern "C" { int on_exit (); }
+ #define atexit on_exit
+ #endif
+
+ // argv[0] for this program.
+ char *raw_prog_name = 0;
+
+ // Cleaned-up name of this program, not including path information.
+ char *prog_name = 0;
+
+ // Login name for user running this program.
+ char *user_name = 0;
+
+ // Name of the host we are running on.
+ char *host_name = 0;
+
+ // User's home directory.
+ char *home_directory = 0;
+
+ // Guess what?
+ char *the_current_working_directory = 0;
+
+ // Load path specified on command line.  (--path path; -p path)
+ char *load_path = 0;
+
+ // Name of the info file specified on command line.
+ // (--info-file file; -i file)
+ char *info_file = 0;
+
+ // Name of the editor to be invoked by the edit_history command.
+ char *editor = 0;
+
+ // If nonzero, don't do fancy line editing.
+ int no_line_editing = 0;
+
+ // If nonzero, print verbose info in some cases.
+ // (--verbose; -V)
+ int verbose_flag = 0;
+
+ // Command number, counting from the beginning of this session.
+ int current_command_number = 1;
+
+ // Nonzero means we are exiting via the builtin exit or quit functions.
+ int quitting_gracefully = 0;
+
+ // Current command to execute.
+ tree_statement_list *global_command = 0;
+
+ // Pointer to function that is currently being evaluated.
+ tree_function *curr_function = 0;
+
+ // Nonzero means input is coming from startup file.
+ int input_from_startup_file = 0;
+
+ // Top level context (?)
+ jmp_buf toplevel;
+
+ // This is not really the right place to do this...
+ typedef void (*one_arg_error_handler_t) (const char*);
+ extern one_arg_error_handler_t set_Complex_error_handler
+   (one_arg_error_handler_t f);
+
+ // This is from readline's paren.c:
+ extern int rl_blink_matching_paren;
+
+ static void
+ octave_Complex_error_handler (const char* msg)
+ {
+   warning (msg);
+ }
+
+ // Nonzero means we read ~/.octaverc and ./.octaverc.
+ // (--norc; --ignore-init-file; -f)
+ static int read_init_files = 1;
+
+ // Nonzero means we printed messages about reading startup files.
+ static int reading_startup_message_printed = 0;
+
+ // Nonzero means we don\'t print the usual startup message.
+ // (--quiet; --silent; -q)
+ static int inhibit_startup_message = 0;
+
+ // Usage message
+ static const char *usage_string =
+   "octave [-?Vdfhiqvx] [-p path] [--debug] [--help] [--ignore-init-file]\n\
+        [--info-file file] [--interactive] [--path path] [--silent]\n\
+        [--verbose] [--version] [--echo-commands] [file]";
+
+ // This is here so that it\'s more likely that the usage message and
+ // the real set of options will agree.
+ static const char *short_opts = "?Vdfhip:qvx";
+
+ // Long options.  See the comments in getopt.h for the meanings of the
+ // fields in this structure.
+ #define INFO_FILE_OPTION 1
+ static struct option long_opts[] =
+   {
+     { "debug",            no_argument,       0, 'd' },
+     { "help",             no_argument,       0, 'h' },
+     { "interactive",      no_argument,       0, 'i' },
+     { "info-file",        required_argument, 0, INFO_FILE_OPTION },
+     { "norc",             no_argument,       0, 'f' },
+     { "ignore-init-file", no_argument,       0, 'f' },
+     { "path",             required_argument, 0, 'p' },
+     { "quiet",            no_argument,       0, 'q' },
+     { "silent",           no_argument,       0, 'q' },
+     { "verbose",          no_argument,       0, 'V' },
+     { "version",          no_argument,       0, 'v' },
+     { "echo-commands",    no_argument,       0, 'x' },
+     { 0,                  0,                 0, 0 }
+   };
+
+ // Initialize some global variables for later use.
+
+ static void
+ initialize_globals (char *name)
+ {
+   struct passwd *entry = getpwuid (getuid ());
+   if (entry)
+     user_name = strsave (entry->pw_name);
+   else
+     user_name = strsave ("I have no name!");
+   endpwent ();
+
+   char hostname[256];
+   if (gethostname (hostname, 255) < 0)
+     host_name = strsave ("I have no host!");
+   else
+     host_name = strsave (hostname);
+
+   char *hd = getenv ("HOME");
+   if (hd)
+     home_directory = strsave (hd);
+   else
+     home_directory = strsave ("I have no home!");
+
+   char *shell_path = getenv ("PATH");
+   char *arch_dir = octave_arch_lib_dir ();
+   char *bin_dir = octave_bin_dir ();
+
+   int len = strlen (arch_dir) + strlen (bin_dir) + 7;
+
+   char *putenv_cmd = 0;
+
+   if (shell_path)
+     {
+       len += strlen (shell_path) + 1;
+       putenv_cmd = new char [len];
+       sprintf (putenv_cmd,
+            "PATH=%s" SEPCHAR_STR "%s" SEPCHAR_STR "%s",
+            shell_path, arch_dir, bin_dir);
+     }
+   else
+     {
+       putenv_cmd = new char [len];
+       sprintf (putenv_cmd, "PATH=%s" SEPCHAR_STR "%s", arch_dir, bin_dir);
+     }
+
+   putenv (putenv_cmd);
+
+   raw_prog_name = strsave (name);
+   prog_name = strsave ("octave");
+
+   load_path = default_path ();
+
+   info_file = default_info_file ();
+
+   editor = default_editor ();
+ }
+
+ void
+ parse_and_execute (FILE *f, int print)
+ {
+   begin_unwind_frame ("parse_and_execute");
+
+   YY_BUFFER_STATE old_buf = current_buffer ();
+   YY_BUFFER_STATE new_buf = create_buffer (f);
+
+   add_unwind_protect (restore_input_buffer, (void *) old_buf);
+   add_unwind_protect (delete_input_buffer, (void *) new_buf);
+
+   switch_to_buffer (new_buf);
+
+   unwind_protect_int (echo_input);
+   unwind_protect_int (using_readline);
+   unwind_protect_int (saving_history);
+
+   echo_input = 0;
+   using_readline = 0;
+   saving_history = 0;
+
+   unwind_protect_ptr (curr_sym_tab);
+
+   int retval;
+   do
+     {
+       reset_parser ();
+
+       retval = yyparse ();
+
+       if (retval == 0 && global_command)
+     {
+       global_command->eval (print);
+       delete global_command;
+     }
+     }
+   while (retval == 0);
+
+   run_unwind_frame ("parse_and_execute");
+ }
+
+ void
+ parse_and_execute (char *s, int print, int verbose)
+ {
+   begin_unwind_frame ("parse_and_execute_2");
+
+   unwind_protect_int (reading_script_file);
+
+   reading_script_file = 1;
+
+   FILE *f = get_input_from_file (s, 0);
+   if (f)
+     {
+       unwind_protect_int (input_line_number);
+       unwind_protect_int (current_input_column);
+       unwind_protect_int (echo_input);
+
+       input_line_number = 0;
+       current_input_column = 1;
+       echo_input = 0;
+
+       if (verbose)
+     {
+       cout << "reading commands from " << s << " ... ";
+       reading_startup_message_printed = 1;
+       cout.flush ();
+     }
+
+       parse_and_execute (f, print);
+
+       fclose (f);
+
+       if (verbose)
+     cout << "done." << endl;
+     }
+
+   run_unwind_frame ("parse_and_execute_2");
+ }
+
+ // Initialize by reading startup files.
+
+ static void
+ execute_startup_files (void)
+ {
+   begin_unwind_frame ("execute_startup_files");
+
+   unwind_protect_int (input_from_startup_file);
+   input_from_startup_file = 1;
+
+   int verbose = (verbose_flag && ! inhibit_startup_message);
+
+ // Execute commands from the site-wide configuration file.
+
+   char *sd = get_site_defaults ();
+
+   parse_and_execute (sd, 0, verbose);
+
+ // Try to execute commands from $HOME/.octaverc and ./.octaverc.
+
+   char *home_rc = 0;
+   if (home_directory)
+     {
+       home_rc = strconcat (home_directory, "/.octaverc");
+       parse_and_execute (home_rc, 0, verbose);
+     }
+
+ // Names alone are not enough.
+
+   struct stat home_rc_statbuf;
+   stat (home_rc, &home_rc_statbuf);
+   delete [] home_rc;
+
+   struct stat dot_rc_statbuf;
+   stat ("./.octaverc", &dot_rc_statbuf);
+
+   if (home_rc_statbuf.st_ino != dot_rc_statbuf.st_ino)
+     parse_and_execute ("./.octaverc", 0, verbose);
+
+   run_unwind_frame ("execute_startup_files");
+ }
+
+ // Usage message with extra help.
+
+ static void
+ verbose_usage (void)
+ {
+   cout << "\n" OCTAVE_NAME_VERSION_AND_COPYRIGHT "\n\n\
+ Usage: " << usage_string << "\n\
+ \n\
+   -d, --debug             enter parser debugging mode\n\
+   -f, --ignore-init-file  don't read any initialization files\n\
+   -h, -?, --help          print short help message and exit\n\
+   -i, --interactive       force interactive behavior\n\
+   --info-file FILE        use top-level info file FILE\n\
+   -p PATH, --path PATH    set initial LOADPATH to PATH\n\
+   -q, --silent            don't print message at startup\n\
+   -V, --verbose           enable verbose output in some cases\n\
+   -v, --version           print version number and exit\n\
+   -x, --echo-commands     echo commands as they are executed\n\
+ \n\
+   FILE                    execute commands from FILE\n\
+ \n";
+
+   exit (0);
+ }
+
+ // Terse usage messsage.
+
+ static void
+ usage (void)
+ {
+   cerr << "usage: " << usage_string << "\n";
+   exit (1);
+ }
+
+ // Fix up things before exiting.
+
+ void
+ clean_up_and_exit (int retval)
+ {
+   raw_mode (0);
+
+   clean_up_history ();
+
+   close_plot_stream ();
+
+   close_diary_file ();
+
+   close_files ();
+
+   cleanup_tmp_files ();
+
+   if (!quitting_gracefully && (interactive || forced_interactive))
+     cout << "\n";
+
+   if (retval == EOF)
+     retval = 0;
+
+   exit (retval);
+
+ // This is bogus but should prevent g++ from giving a warning saying
+ // that this volatile function does return.
+
+   panic_impossible ();
+ }
+
+ static void
+ print_version_and_exit (void)
+ {
+   cout << OCTAVE_NAME_AND_VERSION << "\n";
+   exit (0);
+ }
+
+ static void
+ initialize_error_handlers ()
+ {
+   set_Complex_error_handler (octave_Complex_error_handler);
+
+   set_liboctave_error_handler (error);
+ }
+
+ // You guessed it.
+
+ int
+ main (int argc, char **argv)
+ {
+ // The order of these calls is important, and initialize globals must
+ // come before the options are processed because some command line
+ // options override defaults.
+
+   printf ("Hi, I'm octave!\n"); fflush (stdout);
+   init_user_prefs ();
+
+   initialize_pager ();
+
+   sysdep_init ();
+
+   initialize_error_handlers ();
+
+   initialize_globals (argv[0]);
+
+   int optc;
+   while ((optc = getopt_long (argc, argv, short_opts, long_opts, 0)) != EOF)
+     {
+       switch (optc)
+     {
+     case 'V':
+       verbose_flag++;
+       break;
+
+     case 'd':
+       yydebug++;
+       break;
+
+     case 'f':
+       read_init_files = 0;
+       break;
+
+     case 'h':
+     case '?':
+       verbose_usage ();
+       break;
+
+     case 'i':
+       forced_interactive = 1;
+       break;
+
+     case 'p':
+       if (optarg)
+         load_path = strsave (optarg);
+       break;
+
+     case 'q':
+       inhibit_startup_message = 1;
+       break;
+
+     case 'x':
+       echo_input = 1;
+       break;
+
+     case 'v':
+       print_version_and_exit ();
+       break;
+
+     case INFO_FILE_OPTION:
+       if (optarg)
+         info_file = strsave (optarg);
+       break;
+
+     default:
+       usage ();
+       break;
+     }
+     }
+
+ #if defined (HAVE_ATEXIT) || (HAVE_ON_EXIT)
+ // Make sure we clean up when we exit.  If we don't have atexit or
+ // on_exit, we're going to leave some junk files around if we exit
+ // abnormally.
+   atexit (cleanup_tmp_files);
+ #endif
+
+ // These can come after command line args since none of them set any
+ // defaults that might be changed by command line options.
+
+   install_signal_handlers ();
+
+   initialize_history ();
+
+   initialize_file_io ();
+
+   initialize_symbol_tables ();
+
+   install_builtins ();
+
+   initialize_readline ();
+
+   init_dynamic_linker ();
+
+   if (! inhibit_startup_message)
+     cout << OCTAVE_STARTUP_MESSAGE "\n" << endl;
+
+   if (read_init_files)
+     {
+       saving_history = 0;
+       execute_startup_files ();
+       saving_history = 1;
+     }
+
+   if (! inhibit_startup_message && reading_startup_message_printed)
+     cout << endl;
+
+ // Avoid counting commands executed from startup files.
+   current_command_number = 1;
+
+ // If there is an extra argument, see if it names a file to read.
+
+   int remaining_args = argc - optind;
+   if (remaining_args > 1)
+     {
+       usage ();
+     }
+   else if (remaining_args == 1)
+     {
+       reading_script_file = 1;
+       curr_fcn_file_name = argv[optind];
+       FILE *infile = get_input_from_file (curr_fcn_file_name);
+       if (infile)
+     {
+       rl_blink_matching_paren = 0;
+       switch_to_buffer (create_buffer (infile));
+     }
+       else
+     clean_up_and_exit (1);
+     }
+   else
+     {
+       switch_to_buffer (create_buffer (get_input_from_stdin ()));
+
+ // Is input coming from a terminal?  If so, we are probably
+ // interactive.
+
+       interactive = (isatty (fileno (stdin)) && isatty (fileno (stdout)));
+     }
+
+ // Force input to be echoed if not really interactive, but the user
+ // has forced interactive behavior.
+
+   if (!interactive && forced_interactive)
+     {
+       rl_blink_matching_paren = 0;
+       echo_input = 1;
+     }
+
+   if (! (interactive || forced_interactive))
+     using_readline = 0;
+
+ // Allow the user to interrupt us without exiting.
+
+   volatile sig_handler *saved_sigint_handler = signal (SIGINT, SIG_IGN);
+
+   if (setjmp (toplevel) != 0)
+     {
+       raw_mode (0);
+
+       cout << "\n";
+     }
+
+   can_interrupt = 1;
+
+   signal (SIGINT, saved_sigint_handler);
+
+ // The big loop.
+
+   int retval;
+   do
+     {
+       curr_sym_tab = top_level_sym_tab;
+
+       reset_parser ();
+
+       retval = yyparse ();
+
+       if (retval == 0 && global_command)
+     {
+       global_command->eval (1);
+       delete global_command;
+       current_command_number++;
+     }
+     }
+   while (retval == 0);
+
+   if (retval == 1 && ! error_state)
+     retval = 0;
+
+   clean_up_and_exit (retval);
+ }
+
+ DEFUN_TEXT ("casesen", Fcasesen, Scasesen, 2, 1,
+   "casesen [on|off]")
+ {
+   Octave_object retval;
+
+   DEFINE_ARGV("casesen");
+
+   if (argc == 1 || (argc > 1 && strcmp (argv[1], "off") == 0))
+     warning ("casesen: sorry, Octave is always case sensitive");
+   else if (argc > 1 && strcmp (argv[1], "on") == 0)
+     ; // ok.
+   else
+     print_usage ("casesen");
+
+   DELETE_ARGV;
+
+   return retval;
+ }
+
+ DEFUN ("computer", Fcomputer, Scomputer, 1, 0,
+   "computer ():\n\
+ \n\
+ Have Octave ask the system, \"What kind of computer are you?\"")
+ {
+   Octave_object retval;
+
+   int nargin = args.length ();
+
+   if (nargin != 0)
+     warning ("computer: ignoring extra arguments");
+
+   ostrstream output_buf;
+
+   if (strcmp (TARGET_HOST_TYPE, "unknown") == 0)
+     output_buf << "Hi Dave, I'm a HAL-9000";
+   else
+     output_buf << TARGET_HOST_TYPE;
+
+   if (nargout == 0)
+     {
+       output_buf << "\n" << ends;
+       maybe_page_output (output_buf);
+     }
+   else
+     {
+       output_buf << ends;
+       char *msg = output_buf.str ();
+       retval = msg;
+       delete [] msg;
+     }
+
+   return retval;
+ }
+
+ DEFUN ("flops", Fflops, Sflops, 0, 1,
+   "flops (): count floating point operations")
+ {
+   int nargin = args.length ();
+
+   if (nargin > 0)
+     print_usage ("flops");
+
+   warning ("flops is a flop, always returning zero");
+
+   return 0.0;
+ }
+
+ DEFUN ("quit", Fquit, Squit, 0, 0,
+   "quit (): exit Octave gracefully")
+ {
+   Octave_object retval;
+   quitting_gracefully = 1;
+   clean_up_and_exit (0);
+   return retval;
+ }
+
+ DEFALIAS (exit, quit);
+
+ DEFUN ("warranty", Fwarranty, Swarranty, 0, 0,
+   "warranty (): describe copying conditions")
+ {
+   Octave_object retval;
+
+   ostrstream output_buf;
+   output_buf << "\n" OCTAVE_NAME_VERSION_AND_COPYRIGHT "\n\n\
+ This program is free software; you can redistribute it and/or modify\n\
+ it under the terms of the GNU General Public License as published by\n\
+ the Free Software Foundation; either version 2 of the License, or\n\
+ (at your option) any later version.\n\
+ \n\
+ This program is distributed in the hope that it will be useful,\n\
+ but WITHOUT ANY WARRANTY; without even the implied warranty of\n\
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n\
+ GNU General Public License for more details.\n\
+ \n\
+ You should have received a copy of the GNU General Public License\n\
+ along with this program. If not, write to the Free Software\n\
+ Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.\n\
+ \n";
+
+   output_buf << ends;
+   maybe_page_output (output_buf);
+
+   return retval;
+ }
+
+ // XXX FIXME XXX -- this may not be the best place for these...
+
+ Octave_object
+ feval (const Octave_object& args, int nargout)
+ {
+   Octave_object retval;
+
+   tree_fvc *fcn = is_valid_function (args(0), "feval", 1);
+   if (fcn)
+     {
+       int tmp_nargin = args.length () - 1;
+       Octave_object tmp_args;
+       tmp_args.resize (tmp_nargin);
+       for (int i = 0; i < tmp_nargin; i++)
+     tmp_args(i) = args(i+1);
+       retval = fcn->eval (0, nargout, tmp_args);
+     }
+
+   return retval;
+ }
+
+ DEFUN ("feval", Ffeval, Sfeval, -1, 1,
+   "feval (NAME, ARGS, ...)\n\
+ \n\
+ evaluate NAME as a function, passing ARGS as its arguments")
+ {
+   Octave_object retval;
+
+   int nargin = args.length ();
+
+   if (nargin > 0)
+     retval = feval (args, nargout);
+   else
+     print_usage ("feval");
+
+   return retval;
+ }
+
+ static Octave_object
+ eval_string (const char *string, int print, int ans_assign,
+          int& parse_status, int nargout)
+ {
+   begin_unwind_frame ("eval_string");
+
+   unwind_protect_int (get_input_from_eval_string);
+   unwind_protect_ptr (global_command);
+   unwind_protect_ptr (current_eval_string);
+
+   get_input_from_eval_string = 1;
+   current_eval_string = string;
+
+   YY_BUFFER_STATE old_buf = current_buffer ();
+   YY_BUFFER_STATE new_buf = create_buffer (0);
+
+   add_unwind_protect (restore_input_buffer, (void *) old_buf);
+   add_unwind_protect (delete_input_buffer, (void *) new_buf);
+
+   switch_to_buffer (new_buf);
+
+   unwind_protect_ptr (curr_sym_tab);
+
+   reset_parser ();
+
+   parse_status = yyparse ();
+
+ // Important to reset the idea of where input is coming from before
+ // trying to eval the command we just parsed -- it might contain the
+ // name of an function file that still needs to be parsed!
+
+   tree_statement_list *command = global_command;
+
+   run_unwind_frame ("eval_string");
+
+   Octave_object retval;
+
+   if (parse_status == 0 && command)
+     {
+       retval = command->eval (print, nargout);
+       delete command;
+     }
+
+   return retval;
+ }
+
+ tree_constant
+ eval_string (const char *string, int print, int ans_assign,
+          int& parse_status)
+ {
+   tree_constant retval;
+
+   Octave_object tmp = eval_string (string, print, ans_assign,
+                    parse_status, 1);
+
+   retval = tmp(0);
+
+   return retval;
+ }
+
+ static Octave_object
+ eval_string (const tree_constant& arg, int& parse_status, int nargout)
+ {
+   char *string = arg.string_value ();
+
+   if (error_state)
+     {
+       error ("eval: expecting string argument");
+       return -1.0;
+     }
+
+ // Yes Virginia, we always print here...
+
+   return eval_string (string, 1, 1, parse_status, nargout);
+ }
+
+ DEFUN ("eval", Feval, Seval, 2, 1,
+   "eval (TRY, CATCH)\n\
+ \n\
+ Evaluate the string TRY as octave code.  If that fails, evaluate the\n\
+ string CATCH.")
+ {
+   Octave_object retval;
+
+   int nargin = args.length ();
+
+   if (nargin > 0)
+     {
+       begin_unwind_frame ("Feval");
+
+       if (nargin > 1)
+     {
+       unwind_protect_int (suppress_octave_error_messages);
+       suppress_octave_error_messages = 1;
+     }
+
+       int parse_status = 0;
+
+       retval = eval_string (args(0), parse_status, nargout);
+
+       if (nargin > 1 && (parse_status != 0 || error_state))
+     {
+       error_state = 0;
+       eval_string (args(1), parse_status, nargout);
+       retval = Octave_object ();
+     }
+
+       run_unwind_frame ("Feval");
+     }
+   else
+     print_usage ("eval");
+
+   return retval;
+ }
+
+ // Execute a shell command.
+
+ DEFUN ("system", Fsystem, Ssystem, 2, 1,
+   "system (string [, return_output]): execute shell commands")
+ {
+   Octave_object retval;
+
+   int nargin = args.length ();
+
+   if (nargin < 1 || nargin > 2)
+     {
+       print_usage ("system");
+       return retval;
+     }
+
+   tree_constant tc_command = args(0);
+
+   char *tmp_str = tc_command.string_value ();
+
+   if (error_state)
+     {
+       error ("system: expecting string as first argument");
+     }
+   else
+     {
+       iprocstream cmd (tmp_str);
+
+       ostrstream output_buf;
+
+       char ch;
+       while (cmd.get (ch))
+     output_buf.put (ch);
+
+       output_buf << ends;
+
+       int status = cmd.close ();
+
+ // The value in 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 ((status & 0xff) == 0)
+     status = (status & 0xff00) >> 8;
+       else
+     status = 127;
+
+       if (nargout > 0 || nargin > 1)
+     {
+       char *msg = output_buf.str ();
+
+       retval(1) = (double) status;
+       retval(0) = msg;
+
+       delete [] msg;
+     }
+       else
+     maybe_page_output (output_buf);
+     }
+
+   return retval;
+ }
+
+ DEFALIAS (shell_cmd, system);
+
+ /*
+ ;;; Local Variables: ***
+ ;;; mode: C++ ***
+ ;;; page-delimiter: "^/\\*" ***
+ ;;; End: ***
+ */
+
diff -rc --new-file octave-1.1.1-base/src/octave.cc.old octave-1.1.1/src/octave.cc.old
*** octave-1.1.1-base/src/octave.cc.old    Thu Jan  1 00:00:00 1970
--- octave-1.1.1/src/octave.cc.old    Sun Mar  5 09:57:56 1995
***************
*** 0 ****
--- 1,975 ----
+ // octave.cc                                            -*- C++ -*-
+ /*
+
+ Copyright (C) 1992, 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.
+
+ */
+
+ // Born February 20, 1992.
+
+ #ifdef HAVE_CONFIG_H
+ #include "config.h"
+ #endif
+
+ #include <sys/types.h>
+ #ifdef HAVE_UNISTD_H
+ #include <unistd.h>
+ #endif
+ #include <sys/stat.h>
+ #include <time.h>
+ #include <pwd.h>
+ #include <stdlib.h>
+ #include </gnu/include/string.h>
+ #include <signal.h>
+ #include <assert.h>
+ #include <iostream.h>
+ #include <strstream.h>
+ #include <fstream.h>
+
+ extern "C"
+ {
+ #include <setjmp.h>
+ }
+
+ #include "getopt.h"
+
+ #include "lo-error.h"
+
+ #include "sighandlers.h"
+ #include "variables.h"
+ #include "error.h"
+ #include "dynamic-ld.h"
+ #include "tree-misc.h"
+ #include "tree-const.h"
+ #include "tree-plot.h"
+ #include "utils.h"
+ #include "input.h"
+ #include "pager.h"
+ #include "lex.h"
+ #include "help.h"
+ #include "octave.h"
+ #include "parse.h"
+ #include "defaults.h"
+ #include "user-prefs.h"
+ #include "procstream.h"
+ #include "unwind-prot.h"
+ #include "octave-hist.h"
+ #include "builtins.h"
+ #include "version.h"
+ #include "file-io.h"
+ #include "sysdep.h"
+ #include "defun.h"
+
+ #if !defined (HAVE_ATEXIT) && defined (HAVE_ON_EXIT)
+ extern "C" { int on_exit (); }
+ #define atexit on_exit
+ #endif
+
+ // argv[0] for this program.
+ char *raw_prog_name = 0;
+
+ // Cleaned-up name of this program, not including path information.
+ char *prog_name = 0;
+
+ // Login name for user running this program.
+ char *user_name = 0;
+
+ // Name of the host we are running on.
+ char *host_name = 0;
+
+ // User's home directory.
+ char *home_directory = 0;
+
+ // Guess what?
+ char *the_current_working_directory = 0;
+
+ // Load path specified on command line.  (--path path; -p path)
+ char *load_path = 0;
+
+ // Name of the info file specified on command line.
+ // (--info-file file; -i file)
+ char *info_file = 0;
+
+ // Name of the editor to be invoked by the edit_history command.
+ char *editor = 0;
+
+ // If nonzero, don't do fancy line editing.
+ int no_line_editing = 0;
+
+ // If nonzero, print verbose info in some cases.
+ // (--verbose; -V)
+ int verbose_flag = 0;
+
+ // Command number, counting from the beginning of this session.
+ int current_command_number = 1;
+
+ // Nonzero means we are exiting via the builtin exit or quit functions.
+ int quitting_gracefully = 0;
+
+ // Current command to execute.
+ tree_statement_list *global_command = 0;
+
+ // Pointer to function that is currently being evaluated.
+ tree_function *curr_function = 0;
+
+ // Nonzero means input is coming from startup file.
+ int input_from_startup_file = 0;
+
+ // Top level context (?)
+ jmp_buf toplevel;
+
+ // This is not really the right place to do this...
+ typedef void (*one_arg_error_handler_t) (const char*);
+ extern one_arg_error_handler_t set_Complex_error_handler
+   (one_arg_error_handler_t f);
+
+ // This is from readline's paren.c:
+ extern int rl_blink_matching_paren;
+
+ static void
+ octave_Complex_error_handler (const char* msg)
+ {
+   warning (msg);
+ }
+
+ // Nonzero means we read ~/.octaverc and ./.octaverc.
+ // (--norc; --ignore-init-file; -f)
+ static int read_init_files = 1;
+
+ // Nonzero means we printed messages about reading startup files.
+ static int reading_startup_message_printed = 0;
+
+ // Nonzero means we don\'t print the usual startup message.
+ // (--quiet; --silent; -q)
+ static int inhibit_startup_message = 0;
+
+ // Usage message
+ static const char *usage_string =
+   "octave [-?Vdfhiqvx] [-p path] [--debug] [--help] [--ignore-init-file]\n\
+        [--info-file file] [--interactive] [--path path] [--silent]\n\
+        [--verbose] [--version] [--echo-commands] [file]";
+
+ // This is here so that it\'s more likely that the usage message and
+ // the real set of options will agree.
+ static const char *short_opts = "?Vdfhip:qvx";
+
+ // Long options.  See the comments in getopt.h for the meanings of the
+ // fields in this structure.
+ #define INFO_FILE_OPTION 1
+ static struct option long_opts[] =
+   {
+     { "debug",            no_argument,       0, 'd' },
+     { "help",             no_argument,       0, 'h' },
+     { "interactive",      no_argument,       0, 'i' },
+     { "info-file",        required_argument, 0, INFO_FILE_OPTION },
+     { "norc",             no_argument,       0, 'f' },
+     { "ignore-init-file", no_argument,       0, 'f' },
+     { "path",             required_argument, 0, 'p' },
+     { "quiet",            no_argument,       0, 'q' },
+     { "silent",           no_argument,       0, 'q' },
+     { "verbose",          no_argument,       0, 'V' },
+     { "version",          no_argument,       0, 'v' },
+     { "echo-commands",    no_argument,       0, 'x' },
+     { 0,                  0,                 0, 0 }
+   };
+
+ // Initialize some global variables for later use.
+
+ static void
+ initialize_globals (char *name)
+ {
+   struct passwd *entry = getpwuid (getuid ());
+   if (entry)
+     user_name = strsave (entry->pw_name);
+   else
+     user_name = strsave ("I have no name!");
+   endpwent ();
+
+   char hostname[256];
+   if (gethostname (hostname, 255) < 0)
+     host_name = strsave ("I have no host!");
+   else
+     host_name = strsave (hostname);
+
+   char *hd = getenv ("HOME");
+   if (hd)
+     home_directory = strsave (hd);
+   else
+     home_directory = strsave ("I have no home!");
+
+   char *shell_path = getenv ("PATH");
+   char *arch_dir = octave_arch_lib_dir ();
+   char *bin_dir = octave_bin_dir ();
+
+   int len = strlen (arch_dir) + strlen (bin_dir) + 7;
+
+   char *putenv_cmd = 0;
+
+   if (shell_path)
+     {
+       len += strlen (shell_path) + 1;
+       putenv_cmd = new char [len];
+       sprintf (putenv_cmd,
+            "PATH=%s" SEPCHAR_STR "%s" SEPCHAR_STR "%s",
+            shell_path, arch_dir, bin_dir);
+     }
+   else
+     {
+       putenv_cmd = new char [len];
+       sprintf (putenv_cmd, "PATH=%s" SEPCHAR_STR "%s", arch_dir, bin_dir);
+     }
+
+   putenv (putenv_cmd);
+
+   raw_prog_name = strsave (name);
+   prog_name = strsave ("octave");
+
+   load_path = default_path ();
+
+   info_file = default_info_file ();
+
+   editor = default_editor ();
+ }
+
+ void
+ parse_and_execute (FILE *f, int print)
+ {
+   begin_unwind_frame ("parse_and_execute");
+
+   YY_BUFFER_STATE old_buf = current_buffer ();
+   YY_BUFFER_STATE new_buf = create_buffer (f);
+
+   add_unwind_protect (restore_input_buffer, (void *) old_buf);
+   add_unwind_protect (delete_input_buffer, (void *) new_buf);
+
+   switch_to_buffer (new_buf);
+
+   unwind_protect_int (echo_input);
+   unwind_protect_int (using_readline);
+   unwind_protect_int (saving_history);
+
+   echo_input = 0;
+   using_readline = 0;
+   saving_history = 0;
+
+   unwind_protect_ptr (curr_sym_tab);
+
+   int retval;
+   do
+     {
+       reset_parser ();
+
+       retval = yyparse ();
+
+       if (retval == 0 && global_command)
+     {
+       global_command->eval (print);
+       delete global_command;
+     }
+     }
+   while (retval == 0);
+
+   run_unwind_frame ("parse_and_execute");
+ }
+
+ void
+ parse_and_execute (char *s, int print, int verbose)
+ {
+   begin_unwind_frame ("parse_and_execute_2");
+
+   unwind_protect_int (reading_script_file);
+
+   reading_script_file = 1;
+
+   FILE *f = get_input_from_file (s, 0);
+   if (f)
+     {
+       unwind_protect_int (input_line_number);
+       unwind_protect_int (current_input_column);
+       unwind_protect_int (echo_input);
+
+       input_line_number = 0;
+       current_input_column = 1;
+       echo_input = 0;
+
+       if (verbose)
+     {
+       cout << "reading commands from " << s << " ... ";
+       reading_startup_message_printed = 1;
+       cout.flush ();
+     }
+
+       parse_and_execute (f, print);
+
+       fclose (f);
+
+       if (verbose)
+     cout << "done." << endl;
+     }
+
+   run_unwind_frame ("parse_and_execute_2");
+ }
+
+ // Initialize by reading startup files.
+
+ static void
+ execute_startup_files (void)
+ {
+   begin_unwind_frame ("execute_startup_files");
+
+   unwind_protect_int (input_from_startup_file);
+   input_from_startup_file = 1;
+
+   int verbose = (verbose_flag && ! inhibit_startup_message);
+
+ // Execute commands from the site-wide configuration file.
+
+   char *sd = get_site_defaults ();
+
+   parse_and_execute (sd, 0, verbose);
+
+ // Try to execute commands from $HOME/.octaverc and ./.octaverc.
+
+   char *home_rc = 0;
+   if (home_directory)
+     {
+       home_rc = strconcat (home_directory, "/.octaverc");
+       parse_and_execute (home_rc, 0, verbose);
+     }
+
+ // Names alone are not enough.
+
+   struct stat home_rc_statbuf;
+   stat (home_rc, &home_rc_statbuf);
+   delete [] home_rc;
+
+   struct stat dot_rc_statbuf;
+   stat ("./.octaverc", &dot_rc_statbuf);
+
+   if (home_rc_statbuf.st_ino != dot_rc_statbuf.st_ino)
+     parse_and_execute ("./.octaverc", 0, verbose);
+
+   run_unwind_frame ("execute_startup_files");
+ }
+
+ // Usage message with extra help.
+
+ static void
+ verbose_usage (void)
+ {
+   cout << "\n" OCTAVE_NAME_VERSION_AND_COPYRIGHT "\n\n\
+ Usage: " << usage_string << "\n\
+ \n\
+   -d, --debug             enter parser debugging mode\n\
+   -f, --ignore-init-file  don't read any initialization files\n\
+   -h, -?, --help          print short help message and exit\n\
+   -i, --interactive       force interactive behavior\n\
+   --info-file FILE        use top-level info file FILE\n\
+   -p PATH, --path PATH    set initial LOADPATH to PATH\n\
+   -q, --silent            don't print message at startup\n\
+   -V, --verbose           enable verbose output in some cases\n\
+   -v, --version           print version number and exit\n\
+   -x, --echo-commands     echo commands as they are executed\n\
+ \n\
+   FILE                    execute commands from FILE\n\
+ \n";
+
+   exit (0);
+ }
+
+ // Terse usage messsage.
+
+ static void
+ usage (void)
+ {
+   cerr << "usage: " << usage_string << "\n";
+   exit (1);
+ }
+
+ // Fix up things before exiting.
+
+ void
+ clean_up_and_exit (int retval)
+ {
+   raw_mode (0);
+
+   clean_up_history ();
+
+   close_plot_stream ();
+
+   close_diary_file ();
+
+   close_files ();
+
+   cleanup_tmp_files ();
+
+   if (!quitting_gracefully && (interactive || forced_interactive))
+     cout << "\n";
+
+   if (retval == EOF)
+     retval = 0;
+
+   exit (retval);
+
+ // This is bogus but should prevent g++ from giving a warning saying
+ // that this volatile function does return.
+
+   panic_impossible ();
+ }
+
+ static void
+ print_version_and_exit (void)
+ {
+   cout << OCTAVE_NAME_AND_VERSION << "\n";
+   exit (0);
+ }
+
+ static void
+ initialize_error_handlers ()
+ {
+   set_Complex_error_handler (octave_Complex_error_handler);
+
+   set_liboctave_error_handler (error);
+ }
+
+ // You guessed it.
+
+ int
+ main (int argc, char **argv)
+ {
+ // The order of these calls is important, and initialize globals must
+ // come before the options are processed because some command line
+ // options override defaults.
+
+   init_user_prefs ();
+
+   initialize_pager ();
+
+   sysdep_init ();
+
+   initialize_error_handlers ();
+
+   initialize_globals (argv[0]);
+
+   int optc;
+   while ((optc = getopt_long (argc, argv, short_opts, long_opts, 0)) != EOF)
+     {
+       switch (optc)
+     {
+     case 'V':
+       verbose_flag++;
+       break;
+
+     case 'd':
+       yydebug++;
+       break;
+
+     case 'f':
+       read_init_files = 0;
+       break;
+
+     case 'h':
+     case '?':
+       verbose_usage ();
+       break;
+
+     case 'i':
+       forced_interactive = 1;
+       break;
+
+     case 'p':
+       if (optarg)
+         load_path = strsave (optarg);
+       break;
+
+     case 'q':
+       inhibit_startup_message = 1;
+       break;
+
+     case 'x':
+       echo_input = 1;
+       break;
+
+     case 'v':
+       print_version_and_exit ();
+       break;
+
+     case INFO_FILE_OPTION:
+       if (optarg)
+         info_file = strsave (optarg);
+       break;
+
+     default:
+       usage ();
+       break;
+     }
+     }
+
+ #if defined (HAVE_ATEXIT) || (HAVE_ON_EXIT)
+ // Make sure we clean up when we exit.  If we don't have atexit or
+ // on_exit, we're going to leave some junk files around if we exit
+ // abnormally.
+   atexit (cleanup_tmp_files);
+ #endif
+
+ // These can come after command line args since none of them set any
+ // defaults that might be changed by command line options.
+
+   install_signal_handlers ();
+
+   initialize_history ();
+
+   initialize_file_io ();
+
+   initialize_symbol_tables ();
+
+   install_builtins ();
+
+   initialize_readline ();
+
+   init_dynamic_linker ();
+
+   if (! inhibit_startup_message)
+     cout << OCTAVE_STARTUP_MESSAGE "\n" << endl;
+
+   if (read_init_files)
+     {
+       saving_history = 0;
+       execute_startup_files ();
+       saving_history = 1;
+     }
+
+   if (! inhibit_startup_message && reading_startup_message_printed)
+     cout << endl;
+
+ // Avoid counting commands executed from startup files.
+   current_command_number = 1;
+
+ // If there is an extra argument, see if it names a file to read.
+
+   int remaining_args = argc - optind;
+   if (remaining_args > 1)
+     {
+       usage ();
+     }
+   else if (remaining_args == 1)
+     {
+       reading_script_file = 1;
+       curr_fcn_file_name = argv[optind];
+       FILE *infile = get_input_from_file (curr_fcn_file_name);
+       if (infile)
+     {
+       rl_blink_matching_paren = 0;
+       switch_to_buffer (create_buffer (infile));
+     }
+       else
+     clean_up_and_exit (1);
+     }
+   else
+     {
+       switch_to_buffer (create_buffer (get_input_from_stdin ()));
+
+ // Is input coming from a terminal?  If so, we are probably
+ // interactive.
+
+       interactive = (isatty (fileno (stdin)) && isatty (fileno (stdout)));
+     }
+
+ // Force input to be echoed if not really interactive, but the user
+ // has forced interactive behavior.
+
+   if (!interactive && forced_interactive)
+     {
+       rl_blink_matching_paren = 0;
+       echo_input = 1;
+     }
+
+   if (! (interactive || forced_interactive))
+     using_readline = 0;
+
+ // Allow the user to interrupt us without exiting.
+
+   volatile sig_handler *saved_sigint_handler = signal (SIGINT, SIG_IGN);
+
+   if (setjmp (toplevel) != 0)
+     {
+       raw_mode (0);
+
+       cout << "\n";
+     }
+
+   can_interrupt = 1;
+
+   signal (SIGINT, saved_sigint_handler);
+
+ // The big loop.
+
+   int retval;
+   do
+     {
+       curr_sym_tab = top_level_sym_tab;
+
+       reset_parser ();
+
+       retval = yyparse ();
+
+       if (retval == 0 && global_command)
+     {
+       global_command->eval (1);
+       delete global_command;
+       current_command_number++;
+     }
+     }
+   while (retval == 0);
+
+   if (retval == 1 && ! error_state)
+     retval = 0;
+
+   clean_up_and_exit (retval);
+ }
+
+ DEFUN_TEXT ("casesen", Fcasesen, Scasesen, 2, 1,
+   "casesen [on|off]")
+ {
+   Octave_object retval;
+
+   DEFINE_ARGV("casesen");
+
+   if (argc == 1 || (argc > 1 && strcmp (argv[1], "off") == 0))
+     warning ("casesen: sorry, Octave is always case sensitive");
+   else if (argc > 1 && strcmp (argv[1], "on") == 0)
+     ; // ok.
+   else
+     print_usage ("casesen");
+
+   DELETE_ARGV;
+
+   return retval;
+ }
+
+ DEFUN ("computer", Fcomputer, Scomputer, 1, 0,
+   "computer ():\n\
+ \n\
+ Have Octave ask the system, \"What kind of computer are you?\"")
+ {
+   Octave_object retval;
+
+   int nargin = args.length ();
+
+   if (nargin != 0)
+     warning ("computer: ignoring extra arguments");
+
+   ostrstream output_buf;
+
+   if (strcmp (TARGET_HOST_TYPE, "unknown") == 0)
+     output_buf << "Hi Dave, I'm a HAL-9000";
+   else
+     output_buf << TARGET_HOST_TYPE;
+
+   if (nargout == 0)
+     {
+       output_buf << "\n" << ends;
+       maybe_page_output (output_buf);
+     }
+   else
+     {
+       output_buf << ends;
+       char *msg = output_buf.str ();
+       retval = msg;
+       delete [] msg;
+     }
+
+   return retval;
+ }
+
+ DEFUN ("flops", Fflops, Sflops, 0, 1,
+   "flops (): count floating point operations")
+ {
+   int nargin = args.length ();
+
+   if (nargin > 0)
+     print_usage ("flops");
+
+   warning ("flops is a flop, always returning zero");
+
+   return 0.0;
+ }
+
+ DEFUN ("quit", Fquit, Squit, 0, 0,
+   "quit (): exit Octave gracefully")
+ {
+   Octave_object retval;
+   quitting_gracefully = 1;
+   clean_up_and_exit (0);
+   return retval;
+ }
+
+ DEFALIAS (exit, quit);
+
+ DEFUN ("warranty", Fwarranty, Swarranty, 0, 0,
+   "warranty (): describe copying conditions")
+ {
+   Octave_object retval;
+
+   ostrstream output_buf;
+   output_buf << "\n" OCTAVE_NAME_VERSION_AND_COPYRIGHT "\n\n\
+ This program is free software; you can redistribute it and/or modify\n\
+ it under the terms of the GNU General Public License as published by\n\
+ the Free Software Foundation; either version 2 of the License, or\n\
+ (at your option) any later version.\n\
+ \n\
+ This program is distributed in the hope that it will be useful,\n\
+ but WITHOUT ANY WARRANTY; without even the implied warranty of\n\
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n\
+ GNU General Public License for more details.\n\
+ \n\
+ You should have received a copy of the GNU General Public License\n\
+ along with this program. If not, write to the Free Software\n\
+ Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.\n\
+ \n";
+
+   output_buf << ends;
+   maybe_page_output (output_buf);
+
+   return retval;
+ }
+
+ // XXX FIXME XXX -- this may not be the best place for these...
+
+ Octave_object
+ feval (const Octave_object& args, int nargout)
+ {
+   Octave_object retval;
+
+   tree_fvc *fcn = is_valid_function (args(0), "feval", 1);
+   if (fcn)
+     {
+       int tmp_nargin = args.length () - 1;
+       Octave_object tmp_args;
+       tmp_args.resize (tmp_nargin);
+       for (int i = 0; i < tmp_nargin; i++)
+     tmp_args(i) = args(i+1);
+       retval = fcn->eval (0, nargout, tmp_args);
+     }
+
+   return retval;
+ }
+
+ DEFUN ("feval", Ffeval, Sfeval, -1, 1,
+   "feval (NAME, ARGS, ...)\n\
+ \n\
+ evaluate NAME as a function, passing ARGS as its arguments")
+ {
+   Octave_object retval;
+
+   int nargin = args.length ();
+
+   if (nargin > 0)
+     retval = feval (args, nargout);
+   else
+     print_usage ("feval");
+
+   return retval;
+ }
+
+ static Octave_object
+ eval_string (const char *string, int print, int ans_assign,
+          int& parse_status, int nargout)
+ {
+   begin_unwind_frame ("eval_string");
+
+   unwind_protect_int (get_input_from_eval_string);
+   unwind_protect_ptr (global_command);
+   unwind_protect_ptr (current_eval_string);
+
+   get_input_from_eval_string = 1;
+   current_eval_string = string;
+
+   YY_BUFFER_STATE old_buf = current_buffer ();
+   YY_BUFFER_STATE new_buf = create_buffer (0);
+
+   add_unwind_protect (restore_input_buffer, (void *) old_buf);
+   add_unwind_protect (delete_input_buffer, (void *) new_buf);
+
+   switch_to_buffer (new_buf);
+
+   unwind_protect_ptr (curr_sym_tab);
+
+   reset_parser ();
+
+   parse_status = yyparse ();
+
+ // Important to reset the idea of where input is coming from before
+ // trying to eval the command we just parsed -- it might contain the
+ // name of an function file that still needs to be parsed!
+
+   tree_statement_list *command = global_command;
+
+   run_unwind_frame ("eval_string");
+
+   Octave_object retval;
+
+   if (parse_status == 0 && command)
+     {
+       retval = command->eval (print, nargout);
+       delete command;
+     }
+
+   return retval;
+ }
+
+ tree_constant
+ eval_string (const char *string, int print, int ans_assign,
+          int& parse_status)
+ {
+   tree_constant retval;
+
+   Octave_object tmp = eval_string (string, print, ans_assign,
+                    parse_status, 1);
+
+   retval = tmp(0);
+
+   return retval;
+ }
+
+ static Octave_object
+ eval_string (const tree_constant& arg, int& parse_status, int nargout)
+ {
+   char *string = arg.string_value ();
+
+   if (error_state)
+     {
+       error ("eval: expecting string argument");
+       return -1.0;
+     }
+
+ // Yes Virginia, we always print here...
+
+   return eval_string (string, 1, 1, parse_status, nargout);
+ }
+
+ DEFUN ("eval", Feval, Seval, 2, 1,
+   "eval (TRY, CATCH)\n\
+ \n\
+ Evaluate the string TRY as octave code.  If that fails, evaluate the\n\
+ string CATCH.")
+ {
+   Octave_object retval;
+
+   int nargin = args.length ();
+
+   if (nargin > 0)
+     {
+       begin_unwind_frame ("Feval");
+
+       if (nargin > 1)
+     {
+       unwind_protect_int (suppress_octave_error_messages);
+       suppress_octave_error_messages = 1;
+     }
+
+       int parse_status = 0;
+
+       retval = eval_string (args(0), parse_status, nargout);
+
+       if (nargin > 1 && (parse_status != 0 || error_state))
+     {
+       error_state = 0;
+       eval_string (args(1), parse_status, nargout);
+       retval = Octave_object ();
+     }
+
+       run_unwind_frame ("Feval");
+     }
+   else
+     print_usage ("eval");
+
+   return retval;
+ }
+
+ // Execute a shell command.
+
+ DEFUN ("system", Fsystem, Ssystem, 2, 1,
+   "system (string [, return_output]): execute shell commands")
+ {
+   Octave_object retval;
+
+   int nargin = args.length ();
+
+   if (nargin < 1 || nargin > 2)
+     {
+       print_usage ("system");
+       return retval;
+     }
+
+   tree_constant tc_command = args(0);
+
+   char *tmp_str = tc_command.string_value ();
+
+   if (error_state)
+     {
+       error ("system: expecting string as first argument");
+     }
+   else
+     {
+       iprocstream cmd (tmp_str);
+
+       ostrstream output_buf;
+
+       char ch;
+       while (cmd.get (ch))
+     output_buf.put (ch);
+
+       output_buf << ends;
+
+       int status = cmd.close ();
+
+ // The value in 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 ((status & 0xff) == 0)
+     status = (status & 0xff00) >> 8;
+       else
+     status = 127;
+
+       if (nargout > 0 || nargin > 1)
+     {
+       char *msg = output_buf.str ();
+
+       retval(1) = (double) status;
+       retval(0) = msg;
+
+       delete [] msg;
+     }
+       else
+     maybe_page_output (output_buf);
+     }
+
+   return retval;
+ }
+
+ DEFALIAS (shell_cmd, system);
+
+ /*
+ ;;; Local Variables: ***
+ ;;; mode: C++ ***
+ ;;; page-delimiter: "^/\\*" ***
+ ;;; End: ***
+ */
diff -rc --new-file octave-1.1.1-base/src/pr-output.cc octave-1.1.1/src/pr-output.cc
*** octave-1.1.1-base/src/pr-output.cc    Mon Jan 30 20:19:10 1995
--- octave-1.1.1/src/pr-output.cc    Sun Mar  5 09:57:58 1995
***************
*** 27,33 ****

  #include <iostream.h>
  #include <strstream.h>
! #include <string.h>
  #include <math.h>
  #include <float.h>
  #include <Complex.h>
--- 27,33 ----

  #include <iostream.h>
  #include <strstream.h>
! #include </gnu/include/string.h>
  #include <math.h>
  #include <float.h>
  #include <Complex.h>
diff -rc --new-file octave-1.1.1-base/src/strcasecmp.c octave-1.1.1/src/strcasecmp.c
*** octave-1.1.1-base/src/strcasecmp.c    Mon Oct 17 03:40:14 1994
--- octave-1.1.1/src/strcasecmp.c    Sun Mar  5 09:58:00 1995
***************
*** 22,28 ****

  #ifndef HAVE_STRCASECMP

! #include <string.h>
  #include <ctype.h>

  /* Compare S1 and S2, ignoring case, returning less than, equal to or
--- 22,28 ----

  #ifndef HAVE_STRCASECMP

! #include </gnu/include/string.h>
  #include <ctype.h>

  /* Compare S1 and S2, ignoring case, returning less than, equal to or
diff -rc --new-file octave-1.1.1-base/src/strfns.cc octave-1.1.1/src/strfns.cc
*** octave-1.1.1-base/src/strfns.cc    Wed Jan  4 04:03:24 1995
--- octave-1.1.1/src/strfns.cc    Sun Mar  5 09:58:02 1995
***************
*** 26,32 ****
  #endif

  #include <ctype.h>
! #include <string.h>

  #include "dMatrix.h"

--- 26,32 ----
  #endif

  #include <ctype.h>
! #include </gnu/include/string.h>

  #include "dMatrix.h"

diff -rc --new-file octave-1.1.1-base/src/strncase.c octave-1.1.1/src/strncase.c
*** octave-1.1.1-base/src/strncase.c    Mon Oct 17 03:39:39 1994
--- octave-1.1.1/src/strncase.c    Sun Mar  5 09:58:04 1995
***************
*** 22,28 ****

  #ifndef HAVE_STRNCASECMP

! #include <string.h>
  #include <ctype.h>

  /* Compare no more than N characters of S1 and S2,
--- 22,28 ----

  #ifndef HAVE_STRNCASECMP

! #include </gnu/include/string.h>
  #include <ctype.h>

  /* Compare no more than N characters of S1 and S2,
diff -rc --new-file octave-1.1.1-base/src/tc-rep-ass.cc octave-1.1.1/src/tc-rep-ass.cc
*** octave-1.1.1-base/src/tc-rep-ass.cc    Mon Jan 30 20:20:53 1995
--- octave-1.1.1/src/tc-rep-ass.cc    Sun Mar  5 09:58:08 1995
***************
*** 26,32 ****
  #endif

  #include <ctype.h>
! #include <string.h>
  #include <fstream.h>
  #include <iostream.h>
  #include <strstream.h>
--- 26,32 ----
  #endif

  #include <ctype.h>
! #include </gnu/include/string.h>
  #include <fstream.h>
  #include <iostream.h>
  #include <strstream.h>
diff -rc --new-file octave-1.1.1-base/src/tc-rep-idx.cc octave-1.1.1/src/tc-rep-idx.cc
*** octave-1.1.1-base/src/tc-rep-idx.cc    Wed Feb 22 13:39:21 1995
--- octave-1.1.1/src/tc-rep-idx.cc    Sun Mar  5 09:58:10 1995
***************
*** 26,32 ****
  #endif

  #include <ctype.h>
! #include <string.h>
  #include <fstream.h>
  #include <iostream.h>
  #include <strstream.h>
--- 26,32 ----
  #endif

  #include <ctype.h>
! #include </gnu/include/string.h>
  #include <fstream.h>
  #include <iostream.h>
  #include <strstream.h>
diff -rc --new-file octave-1.1.1-base/src/tc-rep.cc octave-1.1.1/src/tc-rep.cc
*** octave-1.1.1-base/src/tc-rep.cc    Mon Jan 30 20:39:16 1995
--- octave-1.1.1/src/tc-rep.cc    Sun Mar  5 09:58:12 1995
***************
*** 26,32 ****
  #endif

  #include <ctype.h>
! #include <string.h>
  #include <fstream.h>
  #include <iostream.h>
  #include <strstream.h>
--- 26,32 ----
  #endif

  #include <ctype.h>
! #include </gnu/include/string.h>
  #include <fstream.h>
  #include <iostream.h>
  #include <strstream.h>
diff -rc --new-file octave-1.1.1-base/src/tempname.c octave-1.1.1/src/tempname.c
*** octave-1.1.1-base/src/tempname.c    Fri Jan 20 19:13:38 1995
--- octave-1.1.1/src/tempname.c    Sun Mar  5 10:03:30 1995
***************
*** 29,35 ****
  #include <stddef.h>
  #include <stdio.h>
  #include <stdlib.h>
! #include <string.h>
  #include <fcntl.h>

  #include "statdefs.h"
--- 29,35 ----
  #include <stddef.h>
  #include <stdio.h>
  #include <stdlib.h>
! #include </gnu/include/string.h>
  #include <fcntl.h>

  #include "statdefs.h"
diff -rc --new-file octave-1.1.1-base/src/tree-expr.cc octave-1.1.1/src/tree-expr.cc
*** octave-1.1.1-base/src/tree-expr.cc    Wed Feb 22 01:18:55 1995
--- octave-1.1.1/src/tree-expr.cc    Sun Mar  5 09:58:36 1995
***************
*** 32,38 ****

  #include <iostream.h>
  #include <strstream.h>
! #include <string.h>
  #include <limits.h>
  #include <ctype.h>
  #include <stdio.h>
--- 32,38 ----

  #include <iostream.h>
  #include <strstream.h>
! #include </gnu/include/string.h>
  #include <limits.h>
  #include <ctype.h>
  #include <stdio.h>
diff -rc --new-file octave-1.1.1-base/src/tree-plot.cc octave-1.1.1/src/tree-plot.cc
*** octave-1.1.1-base/src/tree-plot.cc    Mon Jan 30 20:07:57 1995
--- octave-1.1.1/src/tree-plot.cc    Sun Mar  5 09:58:38 1995
***************
*** 29,35 ****
  #ifdef HAVE_UNISTD_H
  #include <unistd.h>
  #endif
! #include <string.h>
  #include <iostream.h>
  #include <strstream.h>
  #include <fstream.h>
--- 29,35 ----
  #ifdef HAVE_UNISTD_H
  #include <unistd.h>
  #endif
! #include </gnu/include/string.h>
  #include <iostream.h>
  #include <strstream.h>
  #include <fstream.h>
diff -rc --new-file octave-1.1.1-base/src/user-prefs.cc octave-1.1.1/src/user-prefs.cc
*** octave-1.1.1-base/src/user-prefs.cc    Fri Feb 17 14:47:38 1995
--- octave-1.1.1/src/user-prefs.cc    Sun Mar  5 09:58:40 1995
***************
*** 25,31 ****
  #include "config.h"
  #endif

! #include <string.h>

  #include "user-prefs.h"
  #include "mappers.h"
--- 25,31 ----
  #include "config.h"
  #endif

! #include </gnu/include/string.h>

  #include "user-prefs.h"
  #include "mappers.h"
diff -rc --new-file octave-1.1.1-base/src/utils.cc octave-1.1.1/src/utils.cc
*** octave-1.1.1-base/src/utils.cc    Tue Feb 14 22:15:52 1995
--- octave-1.1.1/src/utils.cc    Sun Mar  5 09:58:42 1995
***************
*** 30,36 ****
  #include <unistd.h>
  #endif
  #include <sys/param.h>
! #include <string.h>
  #include <limits.h>
  #include <iostream.h>
  #include <strstream.h>
--- 30,36 ----
  #include <unistd.h>
  #endif
  #include <sys/param.h>
! #include </gnu/include/string.h>
  #include <limits.h>
  #include <iostream.h>
  #include <strstream.h>
diff -rc --new-file octave-1.1.1-base/src/variables.cc octave-1.1.1/src/variables.cc
*** octave-1.1.1-base/src/variables.cc    Fri Feb 17 15:31:07 1995
--- octave-1.1.1/src/variables.cc    Sun Mar  5 09:58:46 1995
***************
*** 37,43 ****
  #include <unistd.h>
  #endif
  #include <float.h>
! #include <string.h>
  #include <strstream.h>

  #include "defaults.h"
--- 37,43 ----
  #include <unistd.h>
  #endif
  #include <float.h>
! #include </gnu/include/string.h>
  #include <strstream.h>

  #include "defaults.h"