Fresh Fish 9/FreshFishVol9-CD2.bin/bbs/gnu/unixtex-6.1b-diffs.lha/GNU/diffs/unixtex-6.1b.diffs

Text File | 1995-04-14 | 351.6 KB | 11,680 lines

diff -rc --new-file unixtex-6.1b-base/Makefile.in unixtex-6.1b/Makefile.in
*** unixtex-6.1b-base/Makefile.in    Sun Jan  8 17:20:14 1995
--- unixtex-6.1b/Makefile.in    Tue Apr  4 08:48:00 1995
***************
*** 1,7 ****
  # Top-level Makefile for kpathsea-using programs.

  # Package subdirectories, the library, and all subdirectories.
! programs = dviljk dvipsk gsftopkk web2c xdvik
  kpathsea_dir = kpathsea
  all_dirs = $(programs) $(kpathsea_dir)

--- 1,7 ----
  # Top-level Makefile for kpathsea-using programs.

  # Package subdirectories, the library, and all subdirectories.
! programs = dviljk dvipsk gsftopkk web2c #xdvik
  kpathsea_dir = kpathsea
  all_dirs = $(programs) $(kpathsea_dir)

***************
*** 29,37 ****
--- 29,47 ----
      for d in $(programs); do if test -d $$d; then \
        (cd $$d; $(MAKE) $(makeargs) $@); else true; fi; done

+ # After doing an install, update the texmf directory with the
+ # latest distribution files, then create the ls-R database.  Note
+ # that on the Amiga we have to create a temporary file first, in
+ # a location other than where we are doing the ls -R, otherwise
+ # the ls-R file will contain an error message that ls cannot
+ # open it.
  install install-data install-exec:
      for d in kpathsea $(programs); do if test -d $$d; then \
        (cd $$d; $(MAKE) $(installargs) $@); else true; fi; done
+     cp -r $(srcdir)/texmf $(datadir)
+     ls -R $(datadir)/texmf >/tmp/ls-R
+     cp /tmp/ls-R $(datadir)/texmf/ls-R
+     rm -f /tmp/ls-R

  # Other standard targets for everything.
  uninstall uninstall-exec uninstall-data \
diff -rc --new-file unixtex-6.1b-base/configure unixtex-6.1b/configure
*** unixtex-6.1b-base/configure    Fri Jan  6 14:41:38 1995
--- unixtex-6.1b/configure    Sun Apr  2 23:09:02 1995
***************
*** 9,15 ****

  # Defaults:
  ac_help=
! ac_default_prefix=/usr/local
  # Any additions from configure.in:

  # Initialize some variables set by options.
--- 9,15 ----

  # Defaults:
  ac_help=
! ac_default_prefix=/gnu
  # Any additions from configure.in:

  # Initialize some variables set by options.
***************
*** 49,55 ****
    fi

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

--- 49,55 ----
    fi

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

***************
*** 70,90 ****
      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 ;;
--- 70,90 ----
      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
!       { /bin/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
!       { /bin/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 ;;
***************
*** 216,231 ****
      verbose=yes ;;

    -version | --version | --versio | --versi | --vers)
!     echo "configure generated by autoconf version 2.1"
      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 ;;
--- 216,231 ----
      verbose=yes ;;

    -version | --version | --versio | --versi | --vers)
!     /bin/echo "configure generated by autoconf version 2.1"
      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
!       { /bin/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 ;;
***************
*** 233,244 ****
      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)
--- 233,244 ----
      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
!       { /bin/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)
***************
*** 259,273 ****
    | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
      x_libraries="$ac_optarg" ;;

!   -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; }
      ;;

    *)
!     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
!       { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
      fi
      nonopt="$ac_option"
      ;;
--- 259,273 ----
    | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
      x_libraries="$ac_optarg" ;;

!   -*) { /bin/echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; }
      ;;

    *)
!     if test -n "`/bin/echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
!       /bin/echo "configure: warning: $ac_option: invalid host type" 1>&2
      fi
      if test "x$nonopt" != xNONE; then
!       { /bin/echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
      fi
      nonopt="$ac_option"
      ;;
***************
*** 276,282 ****
  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
--- 276,282 ----
  done

  if test -n "$ac_prev"; then
!   { /bin/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
***************
*** 295,301 ****
  fi
  exec 5>./config.log

! echo "\
  This file contains any messages produced by compilers while
  running configure, to aid debugging if configure makes a mistake.
  " 1>&5
--- 295,301 ----
  fi
  exec 5>./config.log

! /bin/echo "\
  This file contains any messages produced by compilers while
  running configure, to aid debugging if configure makes a mistake.
  " 1>&5
***************
*** 326,332 ****
  # 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.
--- 326,332 ----
  # 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.
***************
*** 337,343 ****
    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
--- 337,343 ----
    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
***************
*** 348,359 ****
  fi
  if test ! -r $srcdir/$ac_unique_file; then
    if test "$ac_srcdir_defaulted" = yes; then
!     { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; }
    else
!     { 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
--- 348,359 ----
  fi
  if test ! -r $srcdir/$ac_unique_file; then
    if test "$ac_srcdir_defaulted" = yes; then
!     { /bin/echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; }
    else
!     { /bin/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
***************
*** 365,380 ****
  fi
  for ac_site_file in $CONFIG_SITE; do
    if test -r "$ac_site_file"; then
!     echo "loading site script $ac_site_file"
      . "$ac_site_file"
    fi
  done

  if test -r "$cache_file"; then
!   echo "loading cache $cache_file"
    . $cache_file
  else
!   echo "creating cache $cache_file"
    > $cache_file
  fi

--- 365,380 ----
  fi
  for ac_site_file in $CONFIG_SITE; do
    if test -r "$ac_site_file"; then
!     /bin/echo "loading site script $ac_site_file"
      . "$ac_site_file"
    fi
  done

  if test -r "$cache_file"; then
!   /bin/echo "loading cache $cache_file"
    . $cache_file
  else
!   /bin/echo "creating cache $cache_file"
    > $cache_file
  fi

***************
*** 384,392 ****
  ac_compile='${CC-cc} $CFLAGS $CPPFLAGS conftest.$ac_ext -c 1>&5 2>&5'
  ac_link='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext -o conftest $LIBS 1>&5 2>&5'

! if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
    # Stardent Vistra SVR4 grep lacks -e, says [e-mail].
!   if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
      ac_n= ac_c='
  ' ac_t='    '
    else
--- 384,392 ----
  ac_compile='${CC-cc} $CFLAGS $CPPFLAGS conftest.$ac_ext -c 1>&5 2>&5'
  ac_link='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext -o conftest $LIBS 1>&5 2>&5'

! if (/bin/echo "testing\c"; /bin/echo 1,2,3) | grep c >/dev/null; then
    # Stardent Vistra SVR4 grep lacks -e, says [e-mail].
!   if (/bin/echo -n testing; /bin/echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
      ac_n= ac_c='
  ' ac_t='    '
    else
***************
*** 398,411 ****



! echo $ac_n "checking whether ${MAKE-make} sets \$MAKE""... $ac_c" 1>&4
  set dummy ${MAKE-make}; ac_make=$2
! if eval "test \"`echo '${'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
!   echo $ac_n "(cached) $ac_c" 1>&4
  else
    cat > conftestmake <<\EOF
  all:
!     @echo 'ac_maketemp="${MAKE}"'
  EOF
  # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
  eval `${MAKE-make} -f conftestmake 2>/dev/null | grep temp=`
--- 398,411 ----



! /bin/echo $ac_n "checking whether ${MAKE-make} sets \$MAKE""... $ac_c" 1>&4
  set dummy ${MAKE-make}; ac_make=$2
! if eval "test \"`/bin/echo '${'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
!   /bin/echo $ac_n "(cached) $ac_c" 1>&4
  else
    cat > conftestmake <<\EOF
  all:
!     @/bin/echo 'ac_maketemp="${MAKE}"'
  EOF
  # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
  eval `${MAKE-make} -f conftestmake 2>/dev/null | grep temp=`
***************
*** 416,435 ****
  fi
  rm -f conftestmake
  fi
! if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
!   echo "$ac_t""yes" 1>&4
    SET_MAKE=
  else
!   echo "$ac_t""no" 1>&4
    SET_MAKE="MAKE=${MAKE-make}"
  fi


  # 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.
--- 416,435 ----
  fi
  rm -f conftestmake
  fi
! if eval "test \"`/bin/echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
!   /bin/echo "$ac_t""yes" 1>&4
    SET_MAKE=
  else
!   /bin/echo "$ac_t""no" 1>&4
    SET_MAKE="MAKE=${MAKE-make}"
  fi


  # 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 \"`/bin/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.
***************
*** 448,462 ****
  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__
--- 448,462 ----
  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 \"`/bin/echo '${'ac_cv_prog_gcc'+set}'`\" = set"; then
!   /bin/echo $ac_n "(cached) $ac_c" 1>&4
  else
    cat > conftest.c <<EOF
  #ifdef __GNUC__
***************
*** 469,492 ****
    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
!   ac_cv_prog_gcc_g=yes
  else
    ac_cv_prog_gcc_g=no
  fi
  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
--- 469,494 ----
    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 \"`/bin/echo '${'ac_cv_prog_gcc_g'+set}'`\" = set"; then
!   /bin/echo $ac_n "(cached) $ac_c" 1>&4
  else
!   /bin/echo 'void f(){}' > conftest.c
  if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
! #  override this for now
! #  ac_cv_prog_gcc_g=yes
!   ac_cv_prog_gcc_g=no
  else
    ac_cv_prog_gcc_g=no
  fi
  rm -f conftest*

  fi
!     /bin/echo "$ac_t""$ac_cv_prog_gcc_g" 1>&4
      if test $ac_cv_prog_gcc_g = yes; then
        CFLAGS="-g -O"
      else
***************
*** 502,510 ****
  if test "x$prefix" = xNONE; then
  # Extract the first word of "tex", so it can be a program name with args.
  set dummy tex; ac_word=$2
! echo $ac_n "checking for $ac_word""... $ac_c" 1>&4
! if eval "test \"`echo '${'ac_cv_path_TEX'+set}'`\" = set"; then
!   echo $ac_n "(cached) $ac_c" 1>&4
  else
    case "$TEX" in
    /*)
--- 504,512 ----
  if test "x$prefix" = xNONE; then
  # Extract the first word of "tex", so it can be a program name with args.
  set dummy tex; ac_word=$2
! /bin/echo $ac_n "checking for $ac_word""... $ac_c" 1>&4
! if eval "test \"`/bin/echo '${'ac_cv_path_TEX'+set}'`\" = set"; then
!   /bin/echo $ac_n "(cached) $ac_c" 1>&4
  else
    case "$TEX" in
    /*)
***************
*** 525,537 ****
  fi
  TEX="$ac_cv_path_TEX"
  if test -n "$TEX"; then
!   echo "$ac_t""$TEX" 1>&4
  else
!   echo "$ac_t""no" 1>&4
  fi

    if test -n "$ac_cv_path_TEX"; then
!     prefix=`echo $ac_cv_path_TEX|sed 's%/[^/][^/]*/[^/][^/]*$%%'`
    fi
  fi

--- 527,539 ----
  fi
  TEX="$ac_cv_path_TEX"
  if test -n "$TEX"; then
!   /bin/echo "$ac_t""$TEX" 1>&4
  else
!   /bin/echo "$ac_t""no" 1>&4
  fi

    if test -n "$ac_cv_path_TEX"; then
!     prefix=`/bin/echo $ac_cv_path_TEX|sed 's%/[^/][^/]*/[^/][^/]*$%%'`
    fi
  fi

***************
*** 549,555 ****
    fi
  done
  if test -z "$ac_aux_dir"; then
!   { echo "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; }
  fi
  ac_config_guess=$ac_aux_dir/config.guess
  ac_config_sub=$ac_aux_dir/config.sub
--- 551,557 ----
    fi
  done
  if test -z "$ac_aux_dir"; then
!   { /bin/echo "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; }
  fi
  ac_config_guess=$ac_aux_dir/config.guess
  ac_config_sub=$ac_aux_dir/config.sub
***************
*** 565,579 ****
  # 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
--- 567,582 ----
  # 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
! INSTALL="/bin/install -c"
  if test -z "$INSTALL"; then
! if eval "test \"`/bin/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
!     ''|.|/bin) ;;
      *)
        # OSF1 and SCO ODT 3.0 have their own names for install.
        for ac_prog in ginstall installbsd scoinst install; do
***************
*** 598,604 ****
  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.
--- 601,607 ----
  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.
***************
*** 612,618 ****

  trap '' 1 2 15
  if test -w $cache_file; then
! echo "updating cache $cache_file"
  cat > $cache_file <<\EOF
  # This file is a shell script that caches the results of configure
  # tests run on this system so they can be shared between configure
--- 615,621 ----

  trap '' 1 2 15
  if test -w $cache_file; then
! /bin/echo "updating cache $cache_file"
  cat > $cache_file <<\EOF
  # This file is a shell script that caches the results of configure
  # tests run on this system so they can be shared between configure
***************
*** 630,640 ****
  #
  EOF
  # Ultrix sh set writes to stderr and can't be redirected directly.
  (set) 2>&1 |
!   sed -n "s/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/: \${\1='\2'}/p" \
!   >> $cache_file
  else
! echo "not updating unwritable cache $cache_file"
  fi

  trap 'rm -fr conftest* confdefs* core $ac_clean_files; exit 1' 1 2 15
--- 633,646 ----
  #
  EOF
  # Ultrix sh set writes to stderr and can't be redirected directly.
+ # On AmigaDOS, the {} chars get eaten, so add them back with separate
+ # sed commands.
  (set) 2>&1 |
!   sed -n "s/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/: \${\1='\2'}/p" |
!   sed "s@\\\$@\${@" |
!   sed "s@\$@}@" >> $cache_file
  else
! /bin/echo "not updating unwritable cache $cache_file"
  fi

  trap 'rm -fr conftest* confdefs* core $ac_clean_files; exit 1' 1 2 15
***************
*** 669,675 ****
  # Without the "./", some shells look in PATH for config.status.
  : ${CONFIG_STATUS=./config.status}

! echo creating $CONFIG_STATUS
  rm -f $CONFIG_STATUS
  cat > $CONFIG_STATUS <<EOF
  #!/bin/sh
--- 675,681 ----
  # Without the "./", some shells look in PATH for config.status.
  : ${CONFIG_STATUS=./config.status}

! /bin/echo creating $CONFIG_STATUS
  rm -f $CONFIG_STATUS
  cat > $CONFIG_STATUS <<EOF
  #!/bin/sh
***************
*** 688,701 ****
  do
    case "\$ac_option" in
    -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
!     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 ;;
!   *) echo "\$ac_cs_usage"; exit 1 ;;
    esac
  done

--- 694,707 ----
  do
    case "\$ac_option" in
    -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
!     /bin/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)
!     /bin/echo "\$ac_cs_usage"; exit 0 ;;
!   *) /bin/echo "\$ac_cs_usage"; exit 1 ;;
    esac
  done

***************
*** 735,755 ****
  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
--- 741,761 ----
  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
***************
*** 757,763 ****
    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"
--- 763,769 ----
    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"
***************
*** 768,776 ****
    [/$]*) INSTALL="$ac_given_INSTALL" ;;
    *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
    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" ;;
--- 774,782 ----
    [/$]*) INSTALL="$ac_given_INSTALL" ;;
    *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
    esac
!   /bin/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" ;;
***************
*** 783,796 ****
    # getline or system. (Anyway, configure scripts aren't supposed to use awk.)
    # Use \@...@<cmd> form of sed address because the filename may contain /.
    # Can't use only one -e and commands {dr foo} because foo has to be last.
!   # Use @e initially instead of -e because GNU echo has a -e option.
    # USe `X' to mean a bunch of backslashes; this is for FreeBSD.
    file_substs=`sed -n \
  "/^ac_include/s%ac_include[     ]*\(.*\)%@e 'X@^&@r \1' -e 'X@^&@d'%p" \
                 $ac_given_srcdir/${ac_file}.in`
    if test -n "$file_substs"; then
      # Change @e back to -e and X@^ to \@^.
!     file_subst_cmd="sed `echo $file_substs \
                           | sed -e 's/@e/-e/g' -e 's/X@^/\\\\\@^/g'`"
    else
      # If no substitutions and hence no sed commands, don't choke.
--- 789,802 ----
    # getline or system. (Anyway, configure scripts aren't supposed to use awk.)
    # Use \@...@<cmd> form of sed address because the filename may contain /.
    # Can't use only one -e and commands {dr foo} because foo has to be last.
!   # Use @e initially instead of -e because GNU /bin/echo has a -e option.
    # USe `X' to mean a bunch of backslashes; this is for FreeBSD.
    file_substs=`sed -n \
  "/^ac_include/s%ac_include[     ]*\(.*\)%@e 'X@^&@r \1' -e 'X@^&@d'%p" \
                 $ac_given_srcdir/${ac_file}.in`
    if test -n "$file_substs"; then
      # Change @e back to -e and X@^ to \@^.
!     file_subst_cmd="sed `/bin/echo $file_substs \
                           | sed -e 's/@e/-e/g' -e 's/X@^/\\\\\@^/g'`"
    else
      # If no substitutions and hence no sed commands, don't choke.
***************
*** 851,864 ****
        continue
      fi

!     echo configuring in $ac_config_dir

      case "$srcdir" in
      .) ;;
      *)
        if test -d ./$ac_config_dir || mkdir ./$ac_config_dir; then :;
        else
!         { echo "configure: error: can not create `pwd`/$ac_config_dir" 1>&2; exit 1; }
        fi
        ;;
      esac
--- 857,870 ----
        continue
      fi

!     /bin/echo configuring in $ac_config_dir

      case "$srcdir" in
      .) ;;
      *)
        if test -d ./$ac_config_dir || mkdir ./$ac_config_dir; then :;
        else
!         { /bin/echo "configure: error: can not create `pwd`/$ac_config_dir" 1>&2; exit 1; }
        fi
        ;;
      esac
***************
*** 881,887 ****
      elif test -f $ac_sub_srcdir/configure.in; then
        ac_sub_configure=$ac_configure
      else
!       echo "configure: warning: no configuration information is in $ac_config_dir" 1>&2
        ac_sub_configure=
      fi

--- 887,893 ----
      elif test -f $ac_sub_srcdir/configure.in; then
        ac_sub_configure=$ac_configure
      else
!       /bin/echo "configure: warning: no configuration information is in $ac_config_dir" 1>&2
        ac_sub_configure=
      fi

***************
*** 890,896 ****

        # Make the cache file name correct relative to the subdirectory.
        # A "../" for each directory in /$ac_config_dir.
!       ac_dots=`echo /$ac_config_dir|sed 's%/[^/]*%../%g'`
        case "$cache_file" in
        /*) ac_sub_cache_file=$cache_file ;;
        *) # Relative path.
--- 896,902 ----

        # Make the cache file name correct relative to the subdirectory.
        # A "../" for each directory in /$ac_config_dir.
!       ac_dots=`/bin/echo /$ac_config_dir|sed 's%/[^/]*%../%g'`
        case "$cache_file" in
        /*) ac_sub_cache_file=$cache_file ;;
        *) # Relative path.
***************
*** 902,913 ****
          *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
          esac

!       echo "running ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir"
        # The eval makes quoting arguments work.
        if eval ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir
        then :
        else
!         { echo "configure: error: $ac_sub_configure failed for $ac_config_dir" 1>&2; exit 1; }
        fi
      fi

--- 908,919 ----
          *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
          esac

!       /bin/echo "running ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir"
        # The eval makes quoting arguments work.
        if eval ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir
        then :
        else
!         { /bin/echo "configure: error: $ac_sub_configure failed for $ac_config_dir" 1>&2; exit 1; }
        fi
      fi

diff -rc --new-file unixtex-6.1b-base/dviljk/Makefile.in unixtex-6.1b/dviljk/Makefile.in
*** unixtex-6.1b-base/dviljk/Makefile.in    Sun Jan  8 17:21:58 1995
--- unixtex-6.1b/dviljk/Makefile.in    Sun Apr  2 21:14:26 1995
***************
*** 38,56 ****
      $(CC) $(LDFLAGS) -o $@ $(objects4l) $(LOADLIBES)

  dvilj.o:
!     $(CC) $(CPPFLAGS) $(CFLAGS) -DLJ -c dvi2xx.c
      mv dvi2xx.o $@

  dvilj2p.o:
!     $(CC) $(CPPFLAGS) $(CFLAGS) -DLJ2P -c dvi2xx.c
      mv dvi2xx.o $@

  dvilj4.o:
!     $(CC) $(CPPFLAGS) $(CFLAGS) -DLJ4 -c dvi2xx.c
      mv dvi2xx.o $@

  dvilj4l.o:
!     $(CC) $(CPPFLAGS) $(CFLAGS) -DLJ4 -DLJ4L -c dvi2xx.c
      mv dvi2xx.o $@

  ac_include ../make/tkpathsea.make
--- 38,56 ----
      $(CC) $(LDFLAGS) -o $@ $(objects4l) $(LOADLIBES)

  dvilj.o:
!     $(CC) $(CPPFLAGS) $(CFLAGS) -DLJ -c $(srcdir)/dvi2xx.c
      mv dvi2xx.o $@

  dvilj2p.o:
!     $(CC) $(CPPFLAGS) $(CFLAGS) -DLJ2P -c $(srcdir)/dvi2xx.c
      mv dvi2xx.o $@

  dvilj4.o:
!     $(CC) $(CPPFLAGS) $(CFLAGS) -DLJ4 -c $(srcdir)/dvi2xx.c
      mv dvi2xx.o $@

  dvilj4l.o:
!     $(CC) $(CPPFLAGS) $(CFLAGS) -DLJ4 -DLJ4L -c $(srcdir)/dvi2xx.c
      mv dvi2xx.o $@

  ac_include ../make/tkpathsea.make
***************
*** 74,81 ****
  install-data:
      $(SHELL) $(top_srcdir)/../mkdirchain $(mandir) $(texinputdir) $(fontdir)
      $(INSTALL_DATA) $(srcdir)/dvilj.man $(mandir)/dvilj.$(manext)
!     ($(install_macros) && (cd tex; $(CP_R) . $(texinputdir))) || true
!     ($(install_fonts) && (cd fonts; $(CP_R) . $(fontdir))) || true

  uninstall-data:
      rm -f $(mandir)/dvilj.$(manext)
--- 74,81 ----
  install-data:
      $(SHELL) $(top_srcdir)/../mkdirchain $(mandir) $(texinputdir) $(fontdir)
      $(INSTALL_DATA) $(srcdir)/dvilj.man $(mandir)/dvilj.$(manext)
!     ($(install_macros) && (cd $(srcdir)/tex; $(CP_R) . $(texinputdir))) || true
!     ($(install_fonts) && (cd $(srcdir)/fonts; $(CP_R) . $(fontdir))) || true

  uninstall-data:
      rm -f $(mandir)/dvilj.$(manext)
***************
*** 87,93 ****

  pre-dist-$(distname):
  post-dist-$(distname):
!     cd $(distdir); ln -s $(lj)/fonts $(lj)/tex $(lj)/contrib .

  ac_include ../make/dist.make
  ac_include ../make/config.make
--- 87,93 ----

  pre-dist-$(distname):
  post-dist-$(distname):
!     cd $(distdir); $(LN_S) $(lj)/fonts $(lj)/tex $(lj)/contrib .

  ac_include ../make/dist.make
  ac_include ../make/config.make
diff -rc --new-file unixtex-6.1b-base/dviljk/config.h unixtex-6.1b/dviljk/config.h
*** unixtex-6.1b-base/dviljk/config.h    Wed Jan  4 17:44:24 1995
--- unixtex-6.1b/dviljk/config.h    Mon Apr  3 22:56:50 1995
***************
*** 71,77 ****
  #endif
  #endif

! #ifdef _AMIGA
  #ifndef MAKETEXPK
  /* name of the program which is called to generate missing pk files
   */
--- 71,77 ----
  #endif
  #endif

! #if defined(_AMIGA) || defined (__amigados__)
  #ifndef MAKETEXPK
  /* name of the program which is called to generate missing pk files
   */
***************
*** 236,242 ****
  #define labs(x) abs(x)
  #endif

! #ifdef _AMIGA
  #define OS "Amiga"
  #define READ_BINARY     "r"
  #define WRITE_BINARY    "w"
--- 236,242 ----
  #define labs(x) abs(x)
  #endif

! #if defined (_AMIGA) || defined (__amigados__)
  #define OS "Amiga"
  #define READ_BINARY     "r"
  #define WRITE_BINARY    "w"
diff -rc --new-file unixtex-6.1b-base/dviljk/configure unixtex-6.1b/dviljk/configure
*** unixtex-6.1b-base/dviljk/configure    Fri Jan  6 14:40:44 1995
--- unixtex-6.1b/dviljk/configure    Sun Apr  2 23:10:48 1995
***************
*** 9,15 ****

  # Defaults:
  ac_help=
! ac_default_prefix=/usr/local
  # Any additions from configure.in:

  # Initialize some variables set by options.
--- 9,15 ----

  # Defaults:
  ac_help=
! ac_default_prefix=/gnu
  # Any additions from configure.in:

  # Initialize some variables set by options.
***************
*** 49,55 ****
    fi

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

--- 49,55 ----
    fi

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

***************
*** 70,90 ****
      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 ;;
--- 70,90 ----
      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
!       { /bin/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
!       { /bin/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 ;;
***************
*** 216,231 ****
      verbose=yes ;;

    -version | --version | --versio | --versi | --vers)
!     echo "configure generated by autoconf version 2.1"
      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 ;;
--- 216,231 ----
      verbose=yes ;;

    -version | --version | --versio | --versi | --vers)
!     /bin/echo "configure generated by autoconf version 2.1"
      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
!       { /bin/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 ;;
***************
*** 233,244 ****
      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)
--- 233,244 ----
      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
!       { /bin/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)
***************
*** 259,273 ****
    | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
      x_libraries="$ac_optarg" ;;

!   -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; }
      ;;

    *)
!     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
!       { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
      fi
      nonopt="$ac_option"
      ;;
--- 259,273 ----
    | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
      x_libraries="$ac_optarg" ;;

!   -*) { /bin/echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; }
      ;;

    *)
!     if test -n "`/bin/echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
!       /bin/echo "configure: warning: $ac_option: invalid host type" 1>&2
      fi
      if test "x$nonopt" != xNONE; then
!       { /bin/echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
      fi
      nonopt="$ac_option"
      ;;
***************
*** 276,282 ****
  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
--- 276,282 ----
  done

  if test -n "$ac_prev"; then
!   { /bin/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
***************
*** 295,301 ****
  fi
  exec 5>./config.log

! echo "\
  This file contains any messages produced by compilers while
  running configure, to aid debugging if configure makes a mistake.
  " 1>&5
--- 295,301 ----
  fi
  exec 5>./config.log

! /bin/echo "\
  This file contains any messages produced by compilers while
  running configure, to aid debugging if configure makes a mistake.
  " 1>&5
***************
*** 326,332 ****
  # 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.
--- 326,332 ----
  # 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.
***************
*** 337,343 ****
    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
--- 337,343 ----
    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
***************
*** 348,359 ****
  fi
  if test ! -r $srcdir/$ac_unique_file; then
    if test "$ac_srcdir_defaulted" = yes; then
!     { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; }
    else
!     { 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
--- 348,359 ----
  fi
  if test ! -r $srcdir/$ac_unique_file; then
    if test "$ac_srcdir_defaulted" = yes; then
!     { /bin/echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; }
    else
!     { /bin/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
***************
*** 365,380 ****
  fi
  for ac_site_file in $CONFIG_SITE; do
    if test -r "$ac_site_file"; then
!     echo "loading site script $ac_site_file"
      . "$ac_site_file"
    fi
  done

  if test -r "$cache_file"; then
!   echo "loading cache $cache_file"
    . $cache_file
  else
!   echo "creating cache $cache_file"
    > $cache_file
  fi

--- 365,380 ----
  fi
  for ac_site_file in $CONFIG_SITE; do
    if test -r "$ac_site_file"; then
!     /bin/echo "loading site script $ac_site_file"
      . "$ac_site_file"
    fi
  done

  if test -r "$cache_file"; then
!   /bin/echo "loading cache $cache_file"
    . $cache_file
  else
!   /bin/echo "creating cache $cache_file"
    > $cache_file
  fi

***************
*** 384,392 ****
  ac_compile='${CC-cc} $CFLAGS $CPPFLAGS conftest.$ac_ext -c 1>&5 2>&5'
  ac_link='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext -o conftest $LIBS 1>&5 2>&5'

! if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
    # Stardent Vistra SVR4 grep lacks -e, says [e-mail].
!   if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
      ac_n= ac_c='
  ' ac_t='    '
    else
--- 384,392 ----
  ac_compile='${CC-cc} $CFLAGS $CPPFLAGS conftest.$ac_ext -c 1>&5 2>&5'
  ac_link='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext -o conftest $LIBS 1>&5 2>&5'

! if (/bin/echo "testing\c"; /bin/echo 1,2,3) | grep c >/dev/null; then
    # Stardent Vistra SVR4 grep lacks -e, says [e-mail].
!   if (/bin/echo -n testing; /bin/echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
      ac_n= ac_c='
  ' ac_t='    '
    else
***************
*** 401,414 ****



! echo $ac_n "checking whether ${MAKE-make} sets \$MAKE""... $ac_c" 1>&4
  set dummy ${MAKE-make}; ac_make=$2
! if eval "test \"`echo '${'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
!   echo $ac_n "(cached) $ac_c" 1>&4
  else
    cat > conftestmake <<\EOF
  all:
!     @echo 'ac_maketemp="${MAKE}"'
  EOF
  # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
  eval `${MAKE-make} -f conftestmake 2>/dev/null | grep temp=`
--- 401,414 ----



! /bin/echo $ac_n "checking whether ${MAKE-make} sets \$MAKE""... $ac_c" 1>&4
  set dummy ${MAKE-make}; ac_make=$2
! if eval "test \"`/bin/echo '${'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
!   /bin/echo $ac_n "(cached) $ac_c" 1>&4
  else
    cat > conftestmake <<\EOF
  all:
!     @/bin/echo 'ac_maketemp="${MAKE}"'
  EOF
  # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
  eval `${MAKE-make} -f conftestmake 2>/dev/null | grep temp=`
***************
*** 419,438 ****
  fi
  rm -f conftestmake
  fi
! if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
!   echo "$ac_t""yes" 1>&4
    SET_MAKE=
  else
!   echo "$ac_t""no" 1>&4
    SET_MAKE="MAKE=${MAKE-make}"
  fi


  # 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.
--- 419,438 ----
  fi
  rm -f conftestmake
  fi
! if eval "test \"`/bin/echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
!   /bin/echo "$ac_t""yes" 1>&4
    SET_MAKE=
  else
!   /bin/echo "$ac_t""no" 1>&4
    SET_MAKE="MAKE=${MAKE-make}"
  fi


  # 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 \"`/bin/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.
***************
*** 451,465 ****
  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__
--- 451,465 ----
  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 \"`/bin/echo '${'ac_cv_prog_gcc'+set}'`\" = set"; then
!   /bin/echo $ac_n "(cached) $ac_c" 1>&4
  else
    cat > conftest.c <<EOF
  #ifdef __GNUC__
***************
*** 472,486 ****
    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
    ac_cv_prog_gcc_g=yes
  else
--- 472,486 ----
    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 \"`/bin/echo '${'ac_cv_prog_gcc_g'+set}'`\" = set"; then
!   /bin/echo $ac_n "(cached) $ac_c" 1>&4
  else
!   /bin/echo 'void f(){}' > conftest.c
  if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
    ac_cv_prog_gcc_g=yes
  else
***************
*** 489,495 ****
  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
--- 489,495 ----
  rm -f conftest*

  fi
!     /bin/echo "$ac_t""$ac_cv_prog_gcc_g" 1>&4
      if test $ac_cv_prog_gcc_g = yes; then
        CFLAGS="-g -O"
      else
***************
*** 514,520 ****
    fi
  done
  if test -z "$ac_aux_dir"; then
!   { echo "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; }
  fi
  ac_config_guess=$ac_aux_dir/config.guess
  ac_config_sub=$ac_aux_dir/config.sub
--- 514,520 ----
    fi
  done
  if test -z "$ac_aux_dir"; then
!   { /bin/echo "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; }
  fi
  ac_config_guess=$ac_aux_dir/config.guess
  ac_config_sub=$ac_aux_dir/config.sub
***************
*** 530,544 ****
  # 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
--- 530,545 ----
  # 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
! INSTALL="/bin/install -c"
  if test -z "$INSTALL"; then
! if eval "test \"`/bin/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
!     ''|.|/bin) ;;
      *)
        # OSF1 and SCO ODT 3.0 have their own names for install.
        for ac_prog in ginstall installbsd scoinst install; do
***************
*** 563,569 ****
  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.
--- 564,570 ----
  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.
***************
*** 573,581 ****

  # 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.
--- 574,582 ----

  # 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 \"`/bin/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.
***************
*** 594,610 ****
  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


! 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
--- 595,611 ----
  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


! /bin/echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&4
  if test -d /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
***************
*** 616,622 ****
      CC="$CC -Xp"
    fi
  else
!   echo "$ac_t""no" 1>&4
    ISC=
  fi

--- 617,623 ----
      CC="$CC -Xp"
    fi
  else
!   /bin/echo "$ac_t""no" 1>&4
    ISC=
  fi

***************
*** 624,633 ****
  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 634 "configure"
--- 625,634 ----
  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 \"`/bin/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 634 "configure"
***************
*** 649,670 ****
  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 "
--- 650,671 ----
  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 \"`/bin/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 "
***************
*** 688,704 ****
  LIBS="$ac_save_LIBS"

  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 "
--- 689,705 ----
  LIBS="$ac_save_LIBS"

  fi
! if eval "test \"`/bin/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 \"`/bin/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 "
***************
*** 722,744 ****
  LIBS="$ac_save_LIBS"

  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 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.
--- 723,745 ----
  LIBS="$ac_save_LIBS"

  fi
! if eval "test \"`/bin/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 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 \"`/bin/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.
***************
*** 756,762 ****
  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
--- 757,763 ----
  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
***************
*** 770,776 ****
  if test -z "$ac_err"; then
    :
  else
!   echo "$ac_err" >&5
    rm -rf conftest*
    CPP=/lib/cpp
  fi
--- 771,777 ----
  if test -z "$ac_err"; then
    :
  else
!   /bin/echo "$ac_err" >&5
    rm -rf conftest*
    CPP=/lib/cpp
  fi
***************
*** 781,792 ****
  fi
  fi
  CPP="$ac_cv_prog_CPP"
! echo "$ac_t""$CPP" 1>&4

  # 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
--- 782,793 ----
  fi
  fi
  CPP="$ac_cv_prog_CPP"
! /bin/echo "$ac_t""$CPP" 1>&4

  # 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 \"`/bin/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
***************
*** 806,816 ****
  rm -fr conftest*
  fi
  cross_compiling=$ac_cv_c_cross
! echo "$ac_t""$ac_cv_c_cross" 1>&4

! 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 817 "configure"
--- 807,817 ----
  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 for ANSI C header files""... $ac_c" 1>&4
! if eval "test \"`/bin/echo '${'ac_cv_header_stdc'+set}'`\" = set"; then
!   /bin/echo $ac_n "(cached) $ac_c" 1>&4
  else
    cat > conftest.$ac_ext <<EOF
  #line 817 "configure"
***************
*** 826,832 ****
    rm -rf conftest*
    ac_cv_header_stdc=yes
  else
!   echo "$ac_err" >&5
    rm -rf conftest*
    ac_cv_header_stdc=no
  fi
--- 827,833 ----
    rm -rf conftest*
    ac_cv_header_stdc=yes
  else
!   /bin/echo "$ac_err" >&5
    rm -rf conftest*
    ac_cv_header_stdc=no
  fi
***************
*** 895,901 ****
  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
--- 896,902 ----
  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
***************
*** 903,914 ****

  fi

! echo $ac_n "checking whether closedir returns void""... $ac_c" 1>&4
! if eval "test \"`echo '${'ac_cv_func_closedir_void'+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 915 "configure"
--- 904,915 ----

  fi

! /bin/echo $ac_n "checking whether closedir returns void""... $ac_c" 1>&4
! if eval "test \"`/bin/echo '${'ac_cv_func_closedir_void'+set}'`\" = set"; then
!   /bin/echo $ac_n "(cached) $ac_c" 1>&4
  else
    if test "$cross_compiling" = yes; then
!     { /bin/echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
  else
  cat > conftest.$ac_ext <<EOF
  #line 915 "configure"
***************
*** 926,932 ****
  fi
  rm -fr conftest*
  fi
! echo "$ac_t""$ac_cv_func_closedir_void" 1>&4
  if test $ac_cv_func_closedir_void = yes; then
    cat >> confdefs.h <<\EOF
  #define CLOSEDIR_VOID 1
--- 927,933 ----
  fi
  rm -fr conftest*
  fi
! /bin/echo "$ac_t""$ac_cv_func_closedir_void" 1>&4
  if test $ac_cv_func_closedir_void = yes; then
    cat >> confdefs.h <<\EOF
  #define CLOSEDIR_VOID 1
***************
*** 937,946 ****
  for ac_hdr in assert.h float.h limits.h memory.h pwd.h stdlib.h \
                   string.h unistd.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 947 "configure"
--- 938,947 ----
  for ac_hdr in assert.h float.h limits.h memory.h pwd.h stdlib.h \
                   string.h unistd.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 \"`/bin/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 947 "configure"
***************
*** 953,982 ****
    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_func in basename bcopy memmove putenv
  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 983 "configure"
--- 954,983 ----
    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 \"`/bin/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_func in basename bcopy memmove putenv
  do
! /bin/echo $ac_n "checking for $ac_func""... $ac_c" 1>&4
! if eval "test \"`/bin/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 983 "configure"
***************
*** 1009,1030 ****
  rm -f conftest*

  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 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 1031 "configure"
--- 1010,1031 ----
  rm -f conftest*

  fi
! if eval "test \"`/bin/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 working const""... $ac_c" 1>&4
! if eval "test \"`/bin/echo '${'ac_cv_c_const'+set}'`\" = set"; then
!   /bin/echo $ac_n "(cached) $ac_c" 1>&4
  else
    cat > conftest.$ac_ext <<EOF
  #line 1031 "configure"
***************
*** 1087,1093 ****
  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
--- 1088,1094 ----
  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
***************
*** 1098,1106 ****


  # This is a GNU libc invention.
! echo $ac_n "checking whether program_invocation_name is predefined""... $ac_c" 1>&4
! if eval "test \"`echo '${'kb_cv_var_program_inv_name'+set}'`\" = set"; then
!   echo $ac_n "(cached) $ac_c" 1>&4
  else
    cat > conftest.$ac_ext <<EOF
  #line 1107 "configure"
--- 1099,1107 ----


  # This is a GNU libc invention.
! /bin/echo $ac_n "checking whether program_invocation_name is predefined""... $ac_c" 1>&4
! if eval "test \"`/bin/echo '${'kb_cv_var_program_inv_name'+set}'`\" = set"; then
!   /bin/echo $ac_n "(cached) $ac_c" 1>&4
  else
    cat > conftest.$ac_ext <<EOF
  #line 1107 "configure"
***************
*** 1121,1127 ****
  rm -f conftest*

  fi
! echo "$ac_t""$kb_cv_var_program_inv_name" 1>&4
  if test $kb_cv_var_program_inv_name = yes; then
    cat >> confdefs.h <<\EOF
  #define HAVE_PROGRAM_INVOCATION_NAME 1
--- 1122,1128 ----
  rm -f conftest*

  fi
! /bin/echo "$ac_t""$kb_cv_var_program_inv_name" 1>&4
  if test $kb_cv_var_program_inv_name = yes; then
    cat >> confdefs.h <<\EOF
  #define HAVE_PROGRAM_INVOCATION_NAME 1
***************
*** 1134,1142 ****
  # This test program is due to Mike Hibler <[e-mail]>.
  # We don't actually need to run this if we don't have putenv, but it
  # doesn't hurt.
! echo $ac_n "checking whether putenv uses malloc""... $ac_c" 1>&4
! if eval "test \"`echo '${'kb_cv_func_putenv_malloc'+set}'`\" = set"; then
!   echo $ac_n "(cached) $ac_c" 1>&4
  else
    if test "$cross_compiling" = yes; then
    kb_cv_func_putenv_malloc=no
--- 1135,1143 ----
  # This test program is due to Mike Hibler <[e-mail]>.
  # We don't actually need to run this if we don't have putenv, but it
  # doesn't hurt.
! /bin/echo $ac_n "checking whether putenv uses malloc""... $ac_c" 1>&4
! if eval "test \"`/bin/echo '${'kb_cv_func_putenv_malloc'+set}'`\" = set"; then
!   /bin/echo $ac_n "(cached) $ac_c" 1>&4
  else
    if test "$cross_compiling" = yes; then
    kb_cv_func_putenv_malloc=no
***************
*** 1204,1210 ****
  fi
  rm -fr conftest*
  fi
! echo "$ac_t""$kb_cv_func_putenv_malloc" 1>&4
  if test $kb_cv_func_putenv_malloc = yes; then
    cat >> confdefs.h <<\EOF
  #define SMART_PUTENV 1
--- 1205,1211 ----
  fi
  rm -fr conftest*
  fi
! /bin/echo "$ac_t""$kb_cv_func_putenv_malloc" 1>&4
  if test $kb_cv_func_putenv_malloc = yes; then
    cat >> confdefs.h <<\EOF
  #define SMART_PUTENV 1
***************
*** 1213,1221 ****
  fi


! echo $ac_n "checking whether char is unsigned""... $ac_c" 1>&4
! if eval "test \"`echo '${'ac_cv_c_char_unsigned'+set}'`\" = set"; then
!   echo $ac_n "(cached) $ac_c" 1>&4
  else
    if test "$GCC" = yes; then
    # GCC predefines this symbol on systems where it applies.
--- 1214,1222 ----
  fi


! /bin/echo $ac_n "checking whether char is unsigned""... $ac_c" 1>&4
! if eval "test \"`/bin/echo '${'ac_cv_c_char_unsigned'+set}'`\" = set"; then
!   /bin/echo $ac_n "(cached) $ac_c" 1>&4
  else
    if test "$GCC" = yes; then
    # GCC predefines this symbol on systems where it applies.
***************
*** 1239,1245 ****

  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 1246 "configure"
--- 1240,1246 ----

  else
  if test "$cross_compiling" = yes; then
!     { /bin/echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
  else
  cat > conftest.$ac_ext <<EOF
  #line 1246 "configure"
***************
*** 1262,1268 ****
  rm -fr conftest*
  fi
  fi
! echo "$ac_t""$ac_cv_c_char_unsigned" 1>&4
  if test $ac_cv_c_char_unsigned = yes && test "$GCC" != yes; then
    cat >> confdefs.h <<\EOF
  #define __CHAR_UNSIGNED__ 1
--- 1263,1269 ----
  rm -fr conftest*
  fi
  fi
! /bin/echo "$ac_t""$ac_cv_c_char_unsigned" 1>&4
  if test $ac_cv_c_char_unsigned = yes && test "$GCC" != yes; then
    cat >> confdefs.h <<\EOF
  #define __CHAR_UNSIGNED__ 1
***************
*** 1270,1281 ****

  fi

! 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 1282 "configure"
--- 1271,1282 ----

  fi

! /bin/echo $ac_n "checking size of long""... $ac_c" 1>&4
! if eval "test \"`/bin/echo '${'ac_cv_sizeof_long'+set}'`\" = set"; then
!   /bin/echo $ac_n "(cached) $ac_c" 1>&4
  else
    if test "$cross_compiling" = yes; then
!     { /bin/echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
  else
  cat > conftest.$ac_ext <<EOF
  #line 1282 "configure"
***************
*** 1296,1302 ****
  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
--- 1297,1303 ----
  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
***************
*** 1305,1311 ****

  trap '' 1 2 15
  if test -w $cache_file; then
! echo "updating cache $cache_file"
  cat > $cache_file <<\EOF
  # This file is a shell script that caches the results of configure
  # tests run on this system so they can be shared between configure
--- 1306,1312 ----

  trap '' 1 2 15
  if test -w $cache_file; then
! /bin/echo "updating cache $cache_file"
  cat > $cache_file <<\EOF
  # This file is a shell script that caches the results of configure
  # tests run on this system so they can be shared between configure
***************
*** 1323,1333 ****
  #
  EOF
  # Ultrix sh set writes to stderr and can't be redirected directly.
  (set) 2>&1 |
!   sed -n "s/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/: \${\1='\2'}/p" \
!   >> $cache_file
  else
! echo "not updating unwritable cache $cache_file"
  fi

  trap 'rm -fr conftest* confdefs* core $ac_clean_files; exit 1' 1 2 15
--- 1324,1337 ----
  #
  EOF
  # Ultrix sh set writes to stderr and can't be redirected directly.
+ # On AmigaDOS, the {} chars get eaten, so add them back with separate
+ # sed commands.
  (set) 2>&1 |
!   sed -n "s/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/: \${\1='\2'}/p" |
!   sed "s@\\\$@\${@" |
!   sed "s@\$@}@" >> $cache_file
  else
! /bin/echo "not updating unwritable cache $cache_file"
  fi

  trap 'rm -fr conftest* confdefs* core $ac_clean_files; exit 1' 1 2 15
***************
*** 1350,1356 ****
  # Without the "./", some shells look in PATH for config.status.
  : ${CONFIG_STATUS=./config.status}

! echo creating $CONFIG_STATUS
  rm -f $CONFIG_STATUS
  cat > $CONFIG_STATUS <<EOF
  #!/bin/sh
--- 1354,1360 ----
  # Without the "./", some shells look in PATH for config.status.
  : ${CONFIG_STATUS=./config.status}

! /bin/echo creating $CONFIG_STATUS
  rm -f $CONFIG_STATUS
  cat > $CONFIG_STATUS <<EOF
  #!/bin/sh
***************
*** 1369,1382 ****
  do
    case "\$ac_option" in
    -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
!     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 ;;
!   *) echo "\$ac_cs_usage"; exit 1 ;;
    esac
  done

--- 1373,1386 ----
  do
    case "\$ac_option" in
    -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
!     /bin/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)
!     /bin/echo "\$ac_cs_usage"; exit 0 ;;
!   *) /bin/echo "\$ac_cs_usage"; exit 1 ;;
    esac
  done

***************
*** 1416,1436 ****
  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
--- 1420,1440 ----
  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
***************
*** 1438,1444 ****
    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"
--- 1442,1448 ----
    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"
***************
*** 1449,1457 ****
    [/$]*) INSTALL="$ac_given_INSTALL" ;;
    *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
    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" ;;
--- 1453,1461 ----
    [/$]*) INSTALL="$ac_given_INSTALL" ;;
    *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
    esac
!   /bin/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" ;;
***************
*** 1464,1477 ****
    # getline or system. (Anyway, configure scripts aren't supposed to use awk.)
    # Use \@...@<cmd> form of sed address because the filename may contain /.
    # Can't use only one -e and commands {dr foo} because foo has to be last.
!   # Use @e initially instead of -e because GNU echo has a -e option.
    # USe `X' to mean a bunch of backslashes; this is for FreeBSD.
    file_substs=`sed -n \
  "/^ac_include/s%ac_include[     ]*\(.*\)%@e 'X@^&@r \1' -e 'X@^&@d'%p" \
                 $ac_given_srcdir/${ac_file}.in`
    if test -n "$file_substs"; then
      # Change @e back to -e and X@^ to \@^.
!     file_subst_cmd="sed `echo $file_substs \
                           | sed -e 's/@e/-e/g' -e 's/X@^/\\\\\@^/g'`"
    else
      # If no substitutions and hence no sed commands, don't choke.
--- 1468,1481 ----
    # getline or system. (Anyway, configure scripts aren't supposed to use awk.)
    # Use \@...@<cmd> form of sed address because the filename may contain /.
    # Can't use only one -e and commands {dr foo} because foo has to be last.
!   # Use @e initially instead of -e because GNU /bin/echo has a -e option.
    # USe `X' to mean a bunch of backslashes; this is for FreeBSD.
    file_substs=`sed -n \
  "/^ac_include/s%ac_include[     ]*\(.*\)%@e 'X@^&@r \1' -e 'X@^&@d'%p" \
                 $ac_given_srcdir/${ac_file}.in`
    if test -n "$file_substs"; then
      # Change @e back to -e and X@^ to \@^.
!     file_subst_cmd="sed `/bin/echo $file_substs \
                           | sed -e 's/@e/-e/g' -e 's/X@^/\\\\\@^/g'`"
    else
      # If no substitutions and hence no sed commands, don't choke.
***************
*** 1514,1525 ****
  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

!   echo creating $ac_file

    rm -f conftest.frag conftest.in conftest.out
    cp $ac_given_srcdir/$ac_file_in conftest.in
--- 1518,1529 ----
  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

!   /bin/echo creating $ac_file

    rm -f conftest.frag conftest.in conftest.out
    cp $ac_given_srcdir/$ac_file_in conftest.in
***************
*** 1560,1568 ****
    # grep -c gives empty output for an empty file on some AIX systems.
    if test -z "$ac_lines" || test "$ac_lines" -eq 0; then break; fi
    # Write a limited-size here document to conftest.frag.
!   echo '  cat > conftest.frag <<CEOF' >> $CONFIG_STATUS
    sed ${ac_max_here_lines}q conftest.vals >> $CONFIG_STATUS
!   echo 'CEOF
    sed -f conftest.frag conftest.in > conftest.out
    rm -f conftest.in
    mv conftest.out conftest.in
--- 1564,1572 ----
    # grep -c gives empty output for an empty file on some AIX systems.
    if test -z "$ac_lines" || test "$ac_lines" -eq 0; then break; fi
    # Write a limited-size here document to conftest.frag.
!   /bin/echo '  cat > conftest.frag <<CEOF' >> $CONFIG_STATUS
    sed ${ac_max_here_lines}q conftest.vals >> $CONFIG_STATUS
!   /bin/echo 'CEOF
    sed -f conftest.frag conftest.in > conftest.out
    rm -f conftest.in
    mv conftest.out conftest.in
***************
*** 1575,1585 ****

  cat >> $CONFIG_STATUS <<\EOF
    rm -f conftest.frag conftest.h
!   echo "/* $ac_file.  Generated automatically by configure.  */" > conftest.h
    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
--- 1579,1589 ----

  cat >> $CONFIG_STATUS <<\EOF
    rm -f conftest.frag conftest.h
!   /bin/echo "/* $ac_file.  Generated automatically by configure.  */" > conftest.h
    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 unixtex-6.1b-base/dviljk/dvi2xx.c unixtex-6.1b/dviljk/dvi2xx.c
*** unixtex-6.1b-base/dviljk/dvi2xx.c    Sun Jan  8 17:22:12 1995
--- unixtex-6.1b/dviljk/dvi2xx.c    Tue Apr  4 08:05:50 1995
***************
*** 304,310 ****
--- 304,312 ----

  #ifndef _AMIGA
  #ifndef unix
+ #if !defined (__amiga__) && !defined (__gnuc__)
  long    access();
+ #endif
  FILE   *BOPENCMD();
  void    exit();
  int     fclose();
***************
*** 609,615 ****
  /**********************************************************************/
  /*******************************  main  *******************************/
  /**********************************************************************/
! void
  main(argc, argv)
  int     argc;
  char    *argv[];
--- 611,617 ----
  /**********************************************************************/
  /*******************************  main  *******************************/
  /**********************************************************************/
! int
  main(argc, argv)
  int     argc;
  char    *argv[];
diff -rc --new-file unixtex-6.1b-base/dvipsk/Makefile.in unixtex-6.1b/dvipsk/Makefile.in
*** unixtex-6.1b-base/dvipsk/Makefile.in    Sun Jan  8 17:20:14 1995
--- unixtex-6.1b/dvipsk/Makefile.in    Sun Apr  2 21:14:26 1995
***************
*** 53,59 ****
  $(prologues): squeeze

  texc.lpro: texc.script tex.lpro
!     $(SHELL) $(srcdir)/texc.script tex.lpro $@

  ac_include ../make/tkpathsea.make

--- 53,59 ----
  $(prologues): squeeze

  texc.lpro: texc.script tex.lpro
!     $(SHELL) $(srcdir)/texc.script $(srcdir)/tex.lpro $@

  ac_include ../make/tkpathsea.make

***************
*** 100,107 ****
      $(INSTALL_DATA) $(srcdir)/dvips.1 $(mandir)/dvips.$(manext)
      $(INSTALL_DATA) $(srcdir)/afm2tfm.1 $(mandir)/afm2tfm.$(manext)
  # TeX macros and fonts.
!     ($(install_macros) && (cd tex; $(CP_R) . $(texinputdir))) || true
!     ($(install_fonts) && (cd fonts; $(CP_R) . $(fontdir))) || true

  uninstall-data:
      rm -f $(infodir)/dvips.info*
--- 100,107 ----
      $(INSTALL_DATA) $(srcdir)/dvips.1 $(mandir)/dvips.$(manext)
      $(INSTALL_DATA) $(srcdir)/afm2tfm.1 $(mandir)/afm2tfm.$(manext)
  # TeX macros and fonts.
!     ($(install_macros) && (cd $(srcdir)/tex; $(CP_R) . $(texinputdir))) || true
!     ($(install_fonts) && (cd $(srcdir)/fonts; $(CP_R) . $(fontdir))) || true

  uninstall-data:
      rm -f $(infodir)/dvips.info*
***************
*** 121,128 ****

  pre-dist-$(distname): INSTALL $(program).info $(program).dvi
  post-dist-$(distname):
!     cd $(distdir); ln -s $(ps)/fonts $(ps)/tex $(ps)/contrib .
!     cd $(distdir); ln -s $(fontname)/dvips reencode
      ln $(program).aux $(program).cps $(distdir)
      rm -f $(distdir)/texc.lpro
      cp -p $(fontname)/doc/fontname/adobe.txt $(distdir)/adobe
--- 121,128 ----

  pre-dist-$(distname): INSTALL $(program).info $(program).dvi
  post-dist-$(distname):
!     cd $(distdir); $(LN_S) $(ps)/fonts $(ps)/tex $(ps)/contrib .
!     cd $(distdir); $(LN_S) $(fontname)/dvips reencode
      ln $(program).aux $(program).cps $(distdir)
      rm -f $(distdir)/texc.lpro
      cp -p $(fontname)/doc/fontname/adobe.txt $(distdir)/adobe
diff -rc --new-file unixtex-6.1b-base/dvipsk/configure unixtex-6.1b/dvipsk/configure
*** unixtex-6.1b-base/dvipsk/configure    Fri Jan  6 14:44:44 1995
--- unixtex-6.1b/dvipsk/configure    Sun Apr  2 23:10:28 1995
***************
*** 9,15 ****

  # Defaults:
  ac_help=
! ac_default_prefix=/usr/local
  # Any additions from configure.in:

  # Initialize some variables set by options.
--- 9,15 ----

  # Defaults:
  ac_help=
! ac_default_prefix=/gnu
  # Any additions from configure.in:

  # Initialize some variables set by options.
***************
*** 49,55 ****
    fi

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

--- 49,55 ----
    fi

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

***************
*** 70,90 ****
      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 ;;
--- 70,90 ----
      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
!       { /bin/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
!       { /bin/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 ;;
***************
*** 216,231 ****
      verbose=yes ;;

    -version | --version | --versio | --versi | --vers)
!     echo "configure generated by autoconf version 2.1"
      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 ;;
--- 216,231 ----
      verbose=yes ;;

    -version | --version | --versio | --versi | --vers)
!     /bin/echo "configure generated by autoconf version 2.1"
      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
!       { /bin/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 ;;
***************
*** 233,244 ****
      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)
--- 233,244 ----
      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
!       { /bin/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)
***************
*** 259,273 ****
    | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
      x_libraries="$ac_optarg" ;;

!   -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; }
      ;;

    *)
!     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
!       { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
      fi
      nonopt="$ac_option"
      ;;
--- 259,273 ----
    | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
      x_libraries="$ac_optarg" ;;

!   -*) { /bin/echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; }
      ;;

    *)
!     if test -n "`/bin/echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
!       /bin/echo "configure: warning: $ac_option: invalid host type" 1>&2
      fi
      if test "x$nonopt" != xNONE; then
!       { /bin/echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
      fi
      nonopt="$ac_option"
      ;;
***************
*** 276,282 ****
  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
--- 276,282 ----
  done

  if test -n "$ac_prev"; then
!   { /bin/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
***************
*** 295,301 ****
  fi
  exec 5>./config.log

! echo "\
  This file contains any messages produced by compilers while
  running configure, to aid debugging if configure makes a mistake.
  " 1>&5
--- 295,301 ----
  fi
  exec 5>./config.log

! /bin/echo "\
  This file contains any messages produced by compilers while
  running configure, to aid debugging if configure makes a mistake.
  " 1>&5
***************
*** 326,332 ****
  # 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.
--- 326,332 ----
  # 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.
***************
*** 337,343 ****
    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
--- 337,343 ----
    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
***************
*** 348,359 ****
  fi
  if test ! -r $srcdir/$ac_unique_file; then
    if test "$ac_srcdir_defaulted" = yes; then
!     { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; }
    else
!     { 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
--- 348,359 ----
  fi
  if test ! -r $srcdir/$ac_unique_file; then
    if test "$ac_srcdir_defaulted" = yes; then
!     { /bin/echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; }
    else
!     { /bin/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
***************
*** 365,380 ****
  fi
  for ac_site_file in $CONFIG_SITE; do
    if test -r "$ac_site_file"; then
!     echo "loading site script $ac_site_file"
      . "$ac_site_file"
    fi
  done

  if test -r "$cache_file"; then
!   echo "loading cache $cache_file"
    . $cache_file
  else
!   echo "creating cache $cache_file"
    > $cache_file
  fi

--- 365,380 ----
  fi
  for ac_site_file in $CONFIG_SITE; do
    if test -r "$ac_site_file"; then
!     /bin/echo "loading site script $ac_site_file"
      . "$ac_site_file"
    fi
  done

  if test -r "$cache_file"; then
!   /bin/echo "loading cache $cache_file"
    . $cache_file
  else
!   /bin/echo "creating cache $cache_file"
    > $cache_file
  fi

***************
*** 384,392 ****
  ac_compile='${CC-cc} $CFLAGS $CPPFLAGS conftest.$ac_ext -c 1>&5 2>&5'
  ac_link='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext -o conftest $LIBS 1>&5 2>&5'

! if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
    # Stardent Vistra SVR4 grep lacks -e, says [e-mail].
!   if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
      ac_n= ac_c='
  ' ac_t='    '
    else
--- 384,392 ----
  ac_compile='${CC-cc} $CFLAGS $CPPFLAGS conftest.$ac_ext -c 1>&5 2>&5'
  ac_link='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext -o conftest $LIBS 1>&5 2>&5'

! if (/bin/echo "testing\c"; /bin/echo 1,2,3) | grep c >/dev/null; then
    # Stardent Vistra SVR4 grep lacks -e, says [e-mail].
!   if (/bin/echo -n testing; /bin/echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
      ac_n= ac_c='
  ' ac_t='    '
    else
***************
*** 401,414 ****



! echo $ac_n "checking whether ${MAKE-make} sets \$MAKE""... $ac_c" 1>&4
  set dummy ${MAKE-make}; ac_make=$2
! if eval "test \"`echo '${'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
!   echo $ac_n "(cached) $ac_c" 1>&4
  else
    cat > conftestmake <<\EOF
  all:
!     @echo 'ac_maketemp="${MAKE}"'
  EOF
  # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
  eval `${MAKE-make} -f conftestmake 2>/dev/null | grep temp=`
--- 401,414 ----



! /bin/echo $ac_n "checking whether ${MAKE-make} sets \$MAKE""... $ac_c" 1>&4
  set dummy ${MAKE-make}; ac_make=$2
! if eval "test \"`/bin/echo '${'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
!   /bin/echo $ac_n "(cached) $ac_c" 1>&4
  else
    cat > conftestmake <<\EOF
  all:
!     @/bin/echo 'ac_maketemp="${MAKE}"'
  EOF
  # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
  eval `${MAKE-make} -f conftestmake 2>/dev/null | grep temp=`
***************
*** 419,438 ****
  fi
  rm -f conftestmake
  fi
! if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
!   echo "$ac_t""yes" 1>&4
    SET_MAKE=
  else
!   echo "$ac_t""no" 1>&4
    SET_MAKE="MAKE=${MAKE-make}"
  fi


  # 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.
--- 419,438 ----
  fi
  rm -f conftestmake
  fi
! if eval "test \"`/bin/echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
!   /bin/echo "$ac_t""yes" 1>&4
    SET_MAKE=
  else
!   /bin/echo "$ac_t""no" 1>&4
    SET_MAKE="MAKE=${MAKE-make}"
  fi


  # 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 \"`/bin/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.
***************
*** 451,465 ****
  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__
--- 451,465 ----
  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 \"`/bin/echo '${'ac_cv_prog_gcc'+set}'`\" = set"; then
!   /bin/echo $ac_n "(cached) $ac_c" 1>&4
  else
    cat > conftest.c <<EOF
  #ifdef __GNUC__
***************
*** 472,486 ****
    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
    ac_cv_prog_gcc_g=yes
  else
--- 472,486 ----
    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 \"`/bin/echo '${'ac_cv_prog_gcc_g'+set}'`\" = set"; then
!   /bin/echo $ac_n "(cached) $ac_c" 1>&4
  else
!   /bin/echo 'void f(){}' > conftest.c
  if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
    ac_cv_prog_gcc_g=yes
  else
***************
*** 489,495 ****
  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
--- 489,495 ----
  rm -f conftest*

  fi
!     /bin/echo "$ac_t""$ac_cv_prog_gcc_g" 1>&4
      if test $ac_cv_prog_gcc_g = yes; then
        CFLAGS="-g -O"
      else
***************
*** 514,520 ****
    fi
  done
  if test -z "$ac_aux_dir"; then
!   { echo "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; }
  fi
  ac_config_guess=$ac_aux_dir/config.guess
  ac_config_sub=$ac_aux_dir/config.sub
--- 514,520 ----
    fi
  done
  if test -z "$ac_aux_dir"; then
!   { /bin/echo "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; }
  fi
  ac_config_guess=$ac_aux_dir/config.guess
  ac_config_sub=$ac_aux_dir/config.sub
***************
*** 530,544 ****
  # 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
--- 530,545 ----
  # 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
! INSTALL="/bin/install -c"
  if test -z "$INSTALL"; then
! if eval "test \"`/bin/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
!     ''|.|/bin) ;;
      *)
        # OSF1 and SCO ODT 3.0 have their own names for install.
        for ac_prog in ginstall installbsd scoinst install; do
***************
*** 563,569 ****
  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.
--- 564,570 ----
  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.
***************
*** 573,581 ****

  # 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.
--- 574,582 ----

  # 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 \"`/bin/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.
***************
*** 594,610 ****
  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


! 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
--- 595,611 ----
  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


! /bin/echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&4
  if test -d /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
***************
*** 616,622 ****
      CC="$CC -Xp"
    fi
  else
!   echo "$ac_t""no" 1>&4
    ISC=
  fi

--- 617,623 ----
      CC="$CC -Xp"
    fi
  else
!   /bin/echo "$ac_t""no" 1>&4
    ISC=
  fi

***************
*** 624,633 ****
  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 634 "configure"
--- 625,634 ----
  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 \"`/bin/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 634 "configure"
***************
*** 649,670 ****
  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 "
--- 650,671 ----
  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 \"`/bin/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 "
***************
*** 688,704 ****
  LIBS="$ac_save_LIBS"

  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 "
--- 689,705 ----
  LIBS="$ac_save_LIBS"

  fi
! if eval "test \"`/bin/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 \"`/bin/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 "
***************
*** 722,744 ****
  LIBS="$ac_save_LIBS"

  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 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.
--- 723,745 ----
  LIBS="$ac_save_LIBS"

  fi
! if eval "test \"`/bin/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 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 \"`/bin/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.
***************
*** 756,762 ****
  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
--- 757,763 ----
  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
***************
*** 770,776 ****
  if test -z "$ac_err"; then
    :
  else
!   echo "$ac_err" >&5
    rm -rf conftest*
    CPP=/lib/cpp
  fi
--- 771,777 ----
  if test -z "$ac_err"; then
    :
  else
!   /bin/echo "$ac_err" >&5
    rm -rf conftest*
    CPP=/lib/cpp
  fi
***************
*** 781,792 ****
  fi
  fi
  CPP="$ac_cv_prog_CPP"
! echo "$ac_t""$CPP" 1>&4

  # 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
--- 782,793 ----
  fi
  fi
  CPP="$ac_cv_prog_CPP"
! /bin/echo "$ac_t""$CPP" 1>&4

  # 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 \"`/bin/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
***************
*** 806,816 ****
  rm -fr conftest*
  fi
  cross_compiling=$ac_cv_c_cross
! echo "$ac_t""$ac_cv_c_cross" 1>&4

! 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 817 "configure"
--- 807,817 ----
  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 for ANSI C header files""... $ac_c" 1>&4
! if eval "test \"`/bin/echo '${'ac_cv_header_stdc'+set}'`\" = set"; then
!   /bin/echo $ac_n "(cached) $ac_c" 1>&4
  else
    cat > conftest.$ac_ext <<EOF
  #line 817 "configure"
***************
*** 826,832 ****
    rm -rf conftest*
    ac_cv_header_stdc=yes
  else
!   echo "$ac_err" >&5
    rm -rf conftest*
    ac_cv_header_stdc=no
  fi
--- 827,833 ----
    rm -rf conftest*
    ac_cv_header_stdc=yes
  else
!   /bin/echo "$ac_err" >&5
    rm -rf conftest*
    ac_cv_header_stdc=no
  fi
***************
*** 895,901 ****
  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
--- 896,902 ----
  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
***************
*** 903,914 ****

  fi

! echo $ac_n "checking whether closedir returns void""... $ac_c" 1>&4
! if eval "test \"`echo '${'ac_cv_func_closedir_void'+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 915 "configure"
--- 904,915 ----

  fi

! /bin/echo $ac_n "checking whether closedir returns void""... $ac_c" 1>&4
! if eval "test \"`/bin/echo '${'ac_cv_func_closedir_void'+set}'`\" = set"; then
!   /bin/echo $ac_n "(cached) $ac_c" 1>&4
  else
    if test "$cross_compiling" = yes; then
!     { /bin/echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
  else
  cat > conftest.$ac_ext <<EOF
  #line 915 "configure"
***************
*** 926,932 ****
  fi
  rm -fr conftest*
  fi
! echo "$ac_t""$ac_cv_func_closedir_void" 1>&4
  if test $ac_cv_func_closedir_void = yes; then
    cat >> confdefs.h <<\EOF
  #define CLOSEDIR_VOID 1
--- 927,933 ----
  fi
  rm -fr conftest*
  fi
! /bin/echo "$ac_t""$ac_cv_func_closedir_void" 1>&4
  if test $ac_cv_func_closedir_void = yes; then
    cat >> confdefs.h <<\EOF
  #define CLOSEDIR_VOID 1
***************
*** 937,946 ****
  for ac_hdr in assert.h float.h limits.h memory.h pwd.h stdlib.h \
                   string.h unistd.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 947 "configure"
--- 938,947 ----
  for ac_hdr in assert.h float.h limits.h memory.h pwd.h stdlib.h \
                   string.h unistd.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 \"`/bin/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 947 "configure"
***************
*** 953,982 ****
    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_func in basename bcopy memmove putenv
  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 983 "configure"
--- 954,983 ----
    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 \"`/bin/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_func in basename bcopy memmove putenv
  do
! /bin/echo $ac_n "checking for $ac_func""... $ac_c" 1>&4
! if eval "test \"`/bin/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 983 "configure"
***************
*** 1009,1030 ****
  rm -f conftest*

  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 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 1031 "configure"
--- 1010,1031 ----
  rm -f conftest*

  fi
! if eval "test \"`/bin/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 working const""... $ac_c" 1>&4
! if eval "test \"`/bin/echo '${'ac_cv_c_const'+set}'`\" = set"; then
!   /bin/echo $ac_n "(cached) $ac_c" 1>&4
  else
    cat > conftest.$ac_ext <<EOF
  #line 1031 "configure"
***************
*** 1087,1093 ****
  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
--- 1088,1094 ----
  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
***************
*** 1098,1106 ****


  # This is a GNU libc invention.
! echo $ac_n "checking whether program_invocation_name is predefined""... $ac_c" 1>&4
! if eval "test \"`echo '${'kb_cv_var_program_inv_name'+set}'`\" = set"; then
!   echo $ac_n "(cached) $ac_c" 1>&4
  else
    cat > conftest.$ac_ext <<EOF
  #line 1107 "configure"
--- 1099,1107 ----


  # This is a GNU libc invention.
! /bin/echo $ac_n "checking whether program_invocation_name is predefined""... $ac_c" 1>&4
! if eval "test \"`/bin/echo '${'kb_cv_var_program_inv_name'+set}'`\" = set"; then
!   /bin/echo $ac_n "(cached) $ac_c" 1>&4
  else
    cat > conftest.$ac_ext <<EOF
  #line 1107 "configure"
***************
*** 1121,1127 ****
  rm -f conftest*

  fi
! echo "$ac_t""$kb_cv_var_program_inv_name" 1>&4
  if test $kb_cv_var_program_inv_name = yes; then
    cat >> confdefs.h <<\EOF
  #define HAVE_PROGRAM_INVOCATION_NAME 1
--- 1122,1128 ----
  rm -f conftest*

  fi
! /bin/echo "$ac_t""$kb_cv_var_program_inv_name" 1>&4
  if test $kb_cv_var_program_inv_name = yes; then
    cat >> confdefs.h <<\EOF
  #define HAVE_PROGRAM_INVOCATION_NAME 1
***************
*** 1134,1142 ****
  # This test program is due to Mike Hibler <[e-mail]>.
  # We don't actually need to run this if we don't have putenv, but it
  # doesn't hurt.
! echo $ac_n "checking whether putenv uses malloc""... $ac_c" 1>&4
! if eval "test \"`echo '${'kb_cv_func_putenv_malloc'+set}'`\" = set"; then
!   echo $ac_n "(cached) $ac_c" 1>&4
  else
    if test "$cross_compiling" = yes; then
    kb_cv_func_putenv_malloc=no
--- 1135,1143 ----
  # This test program is due to Mike Hibler <[e-mail]>.
  # We don't actually need to run this if we don't have putenv, but it
  # doesn't hurt.
! /bin/echo $ac_n "checking whether putenv uses malloc""... $ac_c" 1>&4
! if eval "test \"`/bin/echo '${'kb_cv_func_putenv_malloc'+set}'`\" = set"; then
!   /bin/echo $ac_n "(cached) $ac_c" 1>&4
  else
    if test "$cross_compiling" = yes; then
    kb_cv_func_putenv_malloc=no
***************
*** 1204,1210 ****
  fi
  rm -fr conftest*
  fi
! echo "$ac_t""$kb_cv_func_putenv_malloc" 1>&4
  if test $kb_cv_func_putenv_malloc = yes; then
    cat >> confdefs.h <<\EOF
  #define SMART_PUTENV 1
--- 1205,1211 ----
  fi
  rm -fr conftest*
  fi
! /bin/echo "$ac_t""$kb_cv_func_putenv_malloc" 1>&4
  if test $kb_cv_func_putenv_malloc = yes; then
    cat >> confdefs.h <<\EOF
  #define SMART_PUTENV 1
***************
*** 1213,1224 ****
  fi


! 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 1225 "configure"
--- 1214,1225 ----
  fi


! /bin/echo $ac_n "checking size of int""... $ac_c" 1>&4
! if eval "test \"`/bin/echo '${'ac_cv_sizeof_int'+set}'`\" = set"; then
!   /bin/echo $ac_n "(cached) $ac_c" 1>&4
  else
    if test "$cross_compiling" = yes; then
!     { /bin/echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
  else
  cat > conftest.$ac_ext <<EOF
  #line 1225 "configure"
***************
*** 1239,1245 ****
  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
--- 1240,1246 ----
  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
***************
*** 1248,1254 ****

  trap '' 1 2 15
  if test -w $cache_file; then
! echo "updating cache $cache_file"
  cat > $cache_file <<\EOF
  # This file is a shell script that caches the results of configure
  # tests run on this system so they can be shared between configure
--- 1249,1255 ----

  trap '' 1 2 15
  if test -w $cache_file; then
! /bin/echo "updating cache $cache_file"
  cat > $cache_file <<\EOF
  # This file is a shell script that caches the results of configure
  # tests run on this system so they can be shared between configure
***************
*** 1266,1276 ****
  #
  EOF
  # Ultrix sh set writes to stderr and can't be redirected directly.
  (set) 2>&1 |
!   sed -n "s/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/: \${\1='\2'}/p" \
!   >> $cache_file
  else
! echo "not updating unwritable cache $cache_file"
  fi

  trap 'rm -fr conftest* confdefs* core $ac_clean_files; exit 1' 1 2 15
--- 1267,1280 ----
  #
  EOF
  # Ultrix sh set writes to stderr and can't be redirected directly.
+ # On AmigaDOS, the {} chars get eaten, so add them back with separate
+ # sed commands.
  (set) 2>&1 |
!   sed -n "s/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/: \${\1='\2'}/p" |
!   sed "s@\\\$@\${@" |
!   sed "s@\$@}@" >> $cache_file
  else
! /bin/echo "not updating unwritable cache $cache_file"
  fi

  trap 'rm -fr conftest* confdefs* core $ac_clean_files; exit 1' 1 2 15
***************
*** 1293,1299 ****
  # Without the "./", some shells look in PATH for config.status.
  : ${CONFIG_STATUS=./config.status}

! echo creating $CONFIG_STATUS
  rm -f $CONFIG_STATUS
  cat > $CONFIG_STATUS <<EOF
  #!/bin/sh
--- 1297,1303 ----
  # Without the "./", some shells look in PATH for config.status.
  : ${CONFIG_STATUS=./config.status}

! /bin/echo creating $CONFIG_STATUS
  rm -f $CONFIG_STATUS
  cat > $CONFIG_STATUS <<EOF
  #!/bin/sh
***************
*** 1312,1325 ****
  do
    case "\$ac_option" in
    -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
!     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 ;;
!   *) echo "\$ac_cs_usage"; exit 1 ;;
    esac
  done

--- 1316,1329 ----
  do
    case "\$ac_option" in
    -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
!     /bin/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)
!     /bin/echo "\$ac_cs_usage"; exit 0 ;;
!   *) /bin/echo "\$ac_cs_usage"; exit 1 ;;
    esac
  done

***************
*** 1359,1379 ****
  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
--- 1363,1383 ----
  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
***************
*** 1381,1387 ****
    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"
--- 1385,1391 ----
    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"
***************
*** 1392,1400 ****
    [/$]*) INSTALL="$ac_given_INSTALL" ;;
    *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
    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" ;;
--- 1396,1404 ----
    [/$]*) INSTALL="$ac_given_INSTALL" ;;
    *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
    esac
!   /bin/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" ;;
***************
*** 1407,1420 ****
    # getline or system. (Anyway, configure scripts aren't supposed to use awk.)
    # Use \@...@<cmd> form of sed address because the filename may contain /.
    # Can't use only one -e and commands {dr foo} because foo has to be last.
!   # Use @e initially instead of -e because GNU echo has a -e option.
    # USe `X' to mean a bunch of backslashes; this is for FreeBSD.
    file_substs=`sed -n \
  "/^ac_include/s%ac_include[     ]*\(.*\)%@e 'X@^&@r \1' -e 'X@^&@d'%p" \
                 $ac_given_srcdir/${ac_file}.in`
    if test -n "$file_substs"; then
      # Change @e back to -e and X@^ to \@^.
!     file_subst_cmd="sed `echo $file_substs \
                           | sed -e 's/@e/-e/g' -e 's/X@^/\\\\\@^/g'`"
    else
      # If no substitutions and hence no sed commands, don't choke.
--- 1411,1424 ----
    # getline or system. (Anyway, configure scripts aren't supposed to use awk.)
    # Use \@...@<cmd> form of sed address because the filename may contain /.
    # Can't use only one -e and commands {dr foo} because foo has to be last.
!   # Use @e initially instead of -e because GNU /bin/echo has a -e option.
    # USe `X' to mean a bunch of backslashes; this is for FreeBSD.
    file_substs=`sed -n \
  "/^ac_include/s%ac_include[     ]*\(.*\)%@e 'X@^&@r \1' -e 'X@^&@d'%p" \
                 $ac_given_srcdir/${ac_file}.in`
    if test -n "$file_substs"; then
      # Change @e back to -e and X@^ to \@^.
!     file_subst_cmd="sed `/bin/echo $file_substs \
                           | sed -e 's/@e/-e/g' -e 's/X@^/\\\\\@^/g'`"
    else
      # If no substitutions and hence no sed commands, don't choke.
***************
*** 1457,1468 ****
  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

!   echo creating $ac_file

    rm -f conftest.frag conftest.in conftest.out
    cp $ac_given_srcdir/$ac_file_in conftest.in
--- 1461,1472 ----
  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

!   /bin/echo creating $ac_file

    rm -f conftest.frag conftest.in conftest.out
    cp $ac_given_srcdir/$ac_file_in conftest.in
***************
*** 1503,1511 ****
    # grep -c gives empty output for an empty file on some AIX systems.
    if test -z "$ac_lines" || test "$ac_lines" -eq 0; then break; fi
    # Write a limited-size here document to conftest.frag.
!   echo '  cat > conftest.frag <<CEOF' >> $CONFIG_STATUS
    sed ${ac_max_here_lines}q conftest.vals >> $CONFIG_STATUS
!   echo 'CEOF
    sed -f conftest.frag conftest.in > conftest.out
    rm -f conftest.in
    mv conftest.out conftest.in
--- 1507,1515 ----
    # grep -c gives empty output for an empty file on some AIX systems.
    if test -z "$ac_lines" || test "$ac_lines" -eq 0; then break; fi
    # Write a limited-size here document to conftest.frag.
!   /bin/echo '  cat > conftest.frag <<CEOF' >> $CONFIG_STATUS
    sed ${ac_max_here_lines}q conftest.vals >> $CONFIG_STATUS
!   /bin/echo 'CEOF
    sed -f conftest.frag conftest.in > conftest.out
    rm -f conftest.in
    mv conftest.out conftest.in
***************
*** 1518,1528 ****

  cat >> $CONFIG_STATUS <<\EOF
    rm -f conftest.frag conftest.h
!   echo "/* $ac_file.  Generated automatically by configure.  */" > conftest.h
    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
--- 1522,1532 ----

  cat >> $CONFIG_STATUS <<\EOF
    rm -f conftest.frag conftest.h
!   /bin/echo "/* $ac_file.  Generated automatically by configure.  */" > conftest.h
    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 unixtex-6.1b-base/kpathsea/MakeTeXPK.in unixtex-6.1b/kpathsea/MakeTeXPK.in
*** unixtex-6.1b-base/kpathsea/MakeTeXPK.in    Sun Jan  1 19:18:32 1995
--- unixtex-6.1b/kpathsea/MakeTeXPK.in    Mon Apr  3 19:00:42 1995
***************
*** 124,130 ****
  PKNAME=$NAME.$DPI'pk'

  # Clean up on normal or abnormal exit. DESTDIR changes, hence the eval.
! trap "cd /; eval rm -rf $TEMPDIR \$DESTDIR/pktmp.$$" 0 1 2 15

  # Allow fonts to be read and written (especially in case we make
  # directories) by everyone.
--- 124,133 ----
  PKNAME=$NAME.$DPI'pk'

  # Clean up on normal or abnormal exit. DESTDIR changes, hence the eval.
! # AmigaDOS hack:  Add a sleep to work around a race condition that allows
! # for a dying process to hold a lock on TEMPDIR long enough to prevent
! # it from being immediately deleted.
! trap "cd /; sleep 5; eval rm -rf $TEMPDIR \$DESTDIR/pktmp.$$" 0 1 2 15

  # Allow fonts to be read and written (especially in case we make
  # directories) by everyone.
***************
*** 265,272 ****
    || { echo "$0: Could not mkdir $DESTDIR." >&2; exit 1; }

  # Install the PK file carefully, since others may be working simultaneously.
! mv $PKNAME $DESTDIR/pktmp.$$ \
!   || { echo "$0: Could not mv $PKNAME $DESTDIR/pktmp.$$." >&2; exit 1; }

  cd $DESTDIR || exit 1
  mv pktmp.$$ $PKNAME
--- 268,278 ----
    || { echo "$0: Could not mkdir $DESTDIR." >&2; exit 1; }

  # Install the PK file carefully, since others may be working simultaneously.
! # Note that we use cp+rm rather than mv since mv may not work across filesystems.
! cp $PKNAME $DESTDIR/pktmp.$$ \
!   || { echo "$0: Could not cp $PKNAME $DESTDIR/pktmp.$$." >&2; exit 1; }
! rm $PKNAME \
!   || { echo "$0: Could not rm $PKNAKE." >&2; exit 1; }

  cd $DESTDIR || exit 1
  mv pktmp.$$ $PKNAME
diff -rc --new-file unixtex-6.1b-base/kpathsea/Makefile.in unixtex-6.1b/kpathsea/Makefile.in
*** unixtex-6.1b-base/kpathsea/Makefile.in    Sun Jan  8 17:20:14 1995
--- unixtex-6.1b/kpathsea/Makefile.in    Sun Apr  2 21:00:48 1995
***************
*** 153,163 ****
  distdir: INSTALL TAGS $(library).info $(library).dvi
      rm -rf $(distdir)
      mkdir -p $(distdir)
!     ln $(ln_files) $(distdir)
      cp -p $(HOME)/gnu/gnuorg/*.texi $(distdir)
      touch *.info*
!     ln *.info* *.texi $(library).aux $(library).cps $(distdir)
!     ln CONFIGURE HIER common.ac $(distdir)
      cd $(distdir); rm -f paths.h
      cd $(distdir); add-version $(version) version.c

--- 153,163 ----
  distdir: INSTALL TAGS $(library).info $(library).dvi
      rm -rf $(distdir)
      mkdir -p $(distdir)
!     $(LN) $(ln_files) $(distdir)
      cp -p $(HOME)/gnu/gnuorg/*.texi $(distdir)
      touch *.info*
!     $(LN) *.info* *.texi $(library).aux $(library).cps $(distdir)
!     $(LN) CONFIGURE HIER common.ac $(distdir)
      cd $(distdir); rm -f paths.h
      cd $(distdir); add-version $(version) version.c

***************
*** 407,413 ****
    $(kpathsea_srcdir)/c-proto.h \
    $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/debug.h \
    $(kpathsea_srcdir)/progname.h
! putenv.o: putenv.c $(kpathsea_srcdir)/c-auto.h
  readable.o: readable.c $(kpathsea_srcdir)/config.h ./c-auto.h $(kpathsea_srcdir)/c-std.h \
    $(kpathsea_srcdir)/c-unistd.h $(kpathsea_srcdir)/systypes.h \
    $(kpathsea_srcdir)/c-memstr.h \
--- 407,413 ----
    $(kpathsea_srcdir)/c-proto.h \
    $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/debug.h \
    $(kpathsea_srcdir)/progname.h
! putenv.o: putenv.c ./c-auto.h
  readable.o: readable.c $(kpathsea_srcdir)/config.h ./c-auto.h $(kpathsea_srcdir)/c-std.h \
    $(kpathsea_srcdir)/c-unistd.h $(kpathsea_srcdir)/systypes.h \
    $(kpathsea_srcdir)/c-memstr.h \
diff -rc --new-file unixtex-6.1b-base/kpathsea/config.h unixtex-6.1b/kpathsea/config.h
*** unixtex-6.1b-base/kpathsea/config.h    Sat Dec 18 20:05:16 1993
--- unixtex-6.1b/kpathsea/config.h    Sun Apr  2 21:14:26 1995
***************
*** 43,49 ****
  /* If you want to find subdirectories in a directory with non-Unix
     semantics (specifically, if a directory with no subdirectories does
     not have exactly two links), define this.  */
! #if !defined (DOS) && !defined (VMS) && !defined (VMCMS)
  #define UNIX_ST_NLINK
  #endif /* not DOS and not VMS and not VMCMS */

--- 43,49 ----
  /* If you want to find subdirectories in a directory with non-Unix
     semantics (specifically, if a directory with no subdirectories does
     not have exactly two links), define this.  */
! #if !defined (DOS) && !defined (VMS) && !defined (VMCMS) && !defined (__amigados__)
  #define UNIX_ST_NLINK
  #endif /* not DOS and not VMS and not VMCMS */

diff -rc --new-file unixtex-6.1b-base/kpathsea/configure unixtex-6.1b/kpathsea/configure
*** unixtex-6.1b-base/kpathsea/configure    Sun Apr  2 19:49:12 1995
--- unixtex-6.1b/kpathsea/configure    Sun Apr  2 23:11:02 1995
***************
*** 9,15 ****

  # Defaults:
  ac_help=
! ac_default_prefix=/usr/local
  # Any additions from configure.in:

  # Initialize some variables set by options.
--- 9,15 ----

  # Defaults:
  ac_help=
! ac_default_prefix=/gnu
  # Any additions from configure.in:

  # Initialize some variables set by options.
***************
*** 49,55 ****
    fi

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

--- 49,55 ----
    fi

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

***************
*** 70,90 ****
      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 ;;
--- 70,90 ----
      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
!       { /bin/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
!       { /bin/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 ;;
***************
*** 216,231 ****
      verbose=yes ;;

    -version | --version | --versio | --versi | --vers)
!     echo "configure generated by autoconf version 2.1"
      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 ;;
--- 216,231 ----
      verbose=yes ;;

    -version | --version | --versio | --versi | --vers)
!     /bin/echo "configure generated by autoconf version 2.1"
      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
!       { /bin/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 ;;
***************
*** 233,244 ****
      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)
--- 233,244 ----
      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
!       { /bin/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)
***************
*** 259,273 ****
    | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
      x_libraries="$ac_optarg" ;;

!   -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; }
      ;;

    *)
!     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
!       { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
      fi
      nonopt="$ac_option"
      ;;
--- 259,273 ----
    | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
      x_libraries="$ac_optarg" ;;

!   -*) { /bin/echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; }
      ;;

    *)
!     if test -n "`/bin/echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
!       /bin/echo "configure: warning: $ac_option: invalid host type" 1>&2
      fi
      if test "x$nonopt" != xNONE; then
!       { /bin/echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
      fi
      nonopt="$ac_option"
      ;;
***************
*** 276,282 ****
  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
--- 276,282 ----
  done

  if test -n "$ac_prev"; then
!   { /bin/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
***************
*** 295,301 ****
  fi
  exec 5>./config.log

! echo "\
  This file contains any messages produced by compilers while
  running configure, to aid debugging if configure makes a mistake.
  " 1>&5
--- 295,301 ----
  fi
  exec 5>./config.log

! /bin/echo "\
  This file contains any messages produced by compilers while
  running configure, to aid debugging if configure makes a mistake.
  " 1>&5
***************
*** 326,332 ****
  # 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.
--- 326,332 ----
  # 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.
***************
*** 337,343 ****
    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
--- 337,343 ----
    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
***************
*** 348,359 ****
  fi
  if test ! -r $srcdir/$ac_unique_file; then
    if test "$ac_srcdir_defaulted" = yes; then
!     { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; }
    else
!     { 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
--- 348,359 ----
  fi
  if test ! -r $srcdir/$ac_unique_file; then
    if test "$ac_srcdir_defaulted" = yes; then
!     { /bin/echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; }
    else
!     { /bin/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
***************
*** 365,380 ****
  fi
  for ac_site_file in $CONFIG_SITE; do
    if test -r "$ac_site_file"; then
!     echo "loading site script $ac_site_file"
      . "$ac_site_file"
    fi
  done

  if test -r "$cache_file"; then
!   echo "loading cache $cache_file"
    . $cache_file
  else
!   echo "creating cache $cache_file"
    > $cache_file
  fi

--- 365,380 ----
  fi
  for ac_site_file in $CONFIG_SITE; do
    if test -r "$ac_site_file"; then
!     /bin/echo "loading site script $ac_site_file"
      . "$ac_site_file"
    fi
  done

  if test -r "$cache_file"; then
!   /bin/echo "loading cache $cache_file"
    . $cache_file
  else
!   /bin/echo "creating cache $cache_file"
    > $cache_file
  fi

***************
*** 384,392 ****
  ac_compile='${CC-cc} $CFLAGS $CPPFLAGS conftest.$ac_ext -c 1>&5 2>&5'
  ac_link='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext -o conftest $LIBS 1>&5 2>&5'

! if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
    # Stardent Vistra SVR4 grep lacks -e, says [e-mail].
!   if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
      ac_n= ac_c='
  ' ac_t='    '
    else
--- 384,392 ----
  ac_compile='${CC-cc} $CFLAGS $CPPFLAGS conftest.$ac_ext -c 1>&5 2>&5'
  ac_link='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext -o conftest $LIBS 1>&5 2>&5'

! if (/bin/echo "testing\c"; /bin/echo 1,2,3) | grep c >/dev/null; then
    # Stardent Vistra SVR4 grep lacks -e, says [e-mail].
!   if (/bin/echo -n testing; /bin/echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
      ac_n= ac_c='
  ' ac_t='    '
    else
***************
*** 401,414 ****



! echo $ac_n "checking whether ${MAKE-make} sets \$MAKE""... $ac_c" 1>&4
  set dummy ${MAKE-make}; ac_make=$2
! if eval "test \"`echo '${'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
!   echo $ac_n "(cached) $ac_c" 1>&4
  else
    cat > conftestmake <<\EOF
  all:
!     @echo 'ac_maketemp="${MAKE}"'
  EOF
  # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
  eval `${MAKE-make} -f conftestmake 2>/dev/null | grep temp=`
--- 401,414 ----



! /bin/echo $ac_n "checking whether ${MAKE-make} sets \$MAKE""... $ac_c" 1>&4
  set dummy ${MAKE-make}; ac_make=$2
! if eval "test \"`/bin/echo '${'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
!   /bin/echo $ac_n "(cached) $ac_c" 1>&4
  else
    cat > conftestmake <<\EOF
  all:
!     @/bin/echo 'ac_maketemp="${MAKE}"'
  EOF
  # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
  eval `${MAKE-make} -f conftestmake 2>/dev/null | grep temp=`
***************
*** 419,438 ****
  fi
  rm -f conftestmake
  fi
! if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
!   echo "$ac_t""yes" 1>&4
    SET_MAKE=
  else
!   echo "$ac_t""no" 1>&4
    SET_MAKE="MAKE=${MAKE-make}"
  fi


  # 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.
--- 419,438 ----
  fi
  rm -f conftestmake
  fi
! if eval "test \"`/bin/echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
!   /bin/echo "$ac_t""yes" 1>&4
    SET_MAKE=
  else
!   /bin/echo "$ac_t""no" 1>&4
    SET_MAKE="MAKE=${MAKE-make}"
  fi


  # 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 \"`/bin/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.
***************
*** 451,465 ****
  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__
--- 451,465 ----
  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 \"`/bin/echo '${'ac_cv_prog_gcc'+set}'`\" = set"; then
!   /bin/echo $ac_n "(cached) $ac_c" 1>&4
  else
    cat > conftest.c <<EOF
  #ifdef __GNUC__
***************
*** 472,486 ****
    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
    ac_cv_prog_gcc_g=yes
  else
--- 472,486 ----
    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 \"`/bin/echo '${'ac_cv_prog_gcc_g'+set}'`\" = set"; then
!   /bin/echo $ac_n "(cached) $ac_c" 1>&4
  else
!   /bin/echo 'void f(){}' > conftest.c
  if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
    ac_cv_prog_gcc_g=yes
  else
***************
*** 489,495 ****
  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
--- 489,495 ----
  rm -f conftest*

  fi
!     /bin/echo "$ac_t""$ac_cv_prog_gcc_g" 1>&4
      if test $ac_cv_prog_gcc_g = yes; then
        CFLAGS="-g -O"
      else
***************
*** 514,520 ****
    fi
  done
  if test -z "$ac_aux_dir"; then
!   { echo "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; }
  fi
  ac_config_guess=$ac_aux_dir/config.guess
  ac_config_sub=$ac_aux_dir/config.sub
--- 514,520 ----
    fi
  done
  if test -z "$ac_aux_dir"; then
!   { /bin/echo "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; }
  fi
  ac_config_guess=$ac_aux_dir/config.guess
  ac_config_sub=$ac_aux_dir/config.sub
***************
*** 530,544 ****
  # 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
--- 530,545 ----
  # 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
! INSTALL="/bin/install -c"
  if test -z "$INSTALL"; then
! if eval "test \"`/bin/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
!     ''|.|/bin) ;;
      *)
        # OSF1 and SCO ODT 3.0 have their own names for install.
        for ac_prog in ginstall installbsd scoinst install; do
***************
*** 563,569 ****
  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.
--- 564,570 ----
  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.
***************
*** 573,581 ****

  # 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.
--- 574,582 ----

  # 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 \"`/bin/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.
***************
*** 594,610 ****
  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


! 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
--- 595,611 ----
  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


! /bin/echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&4
  if test -d /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
***************
*** 616,622 ****
      CC="$CC -Xp"
    fi
  else
!   echo "$ac_t""no" 1>&4
    ISC=
  fi

--- 617,623 ----
      CC="$CC -Xp"
    fi
  else
!   /bin/echo "$ac_t""no" 1>&4
    ISC=
  fi

***************
*** 624,633 ****
  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 634 "configure"
--- 625,634 ----
  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 \"`/bin/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 634 "configure"
***************
*** 649,670 ****
  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 "
--- 650,671 ----
  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 \"`/bin/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 "
***************
*** 688,704 ****
  LIBS="$ac_save_LIBS"

  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 "
--- 689,705 ----
  LIBS="$ac_save_LIBS"

  fi
! if eval "test \"`/bin/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 \"`/bin/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 "
***************
*** 722,744 ****
  LIBS="$ac_save_LIBS"

  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 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.
--- 723,745 ----
  LIBS="$ac_save_LIBS"

  fi
! if eval "test \"`/bin/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 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 \"`/bin/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.
***************
*** 756,762 ****
  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
--- 757,763 ----
  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
***************
*** 770,776 ****
  if test -z "$ac_err"; then
    :
  else
!   echo "$ac_err" >&5
    rm -rf conftest*
    CPP=/lib/cpp
  fi
--- 771,777 ----
  if test -z "$ac_err"; then
    :
  else
!   /bin/echo "$ac_err" >&5
    rm -rf conftest*
    CPP=/lib/cpp
  fi
***************
*** 781,792 ****
  fi
  fi
  CPP="$ac_cv_prog_CPP"
! echo "$ac_t""$CPP" 1>&4

  # 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
--- 782,793 ----
  fi
  fi
  CPP="$ac_cv_prog_CPP"
! /bin/echo "$ac_t""$CPP" 1>&4

  # 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 \"`/bin/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
***************
*** 806,816 ****
  rm -fr conftest*
  fi
  cross_compiling=$ac_cv_c_cross
! echo "$ac_t""$ac_cv_c_cross" 1>&4

! 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 817 "configure"
--- 807,817 ----
  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 for ANSI C header files""... $ac_c" 1>&4
! if eval "test \"`/bin/echo '${'ac_cv_header_stdc'+set}'`\" = set"; then
!   /bin/echo $ac_n "(cached) $ac_c" 1>&4
  else
    cat > conftest.$ac_ext <<EOF
  #line 817 "configure"
***************
*** 826,832 ****
    rm -rf conftest*
    ac_cv_header_stdc=yes
  else
!   echo "$ac_err" >&5
    rm -rf conftest*
    ac_cv_header_stdc=no
  fi
--- 827,833 ----
    rm -rf conftest*
    ac_cv_header_stdc=yes
  else
!   /bin/echo "$ac_err" >&5
    rm -rf conftest*
    ac_cv_header_stdc=no
  fi
***************
*** 895,901 ****
  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
--- 896,902 ----
  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
***************
*** 903,914 ****

  fi

! echo $ac_n "checking whether closedir returns void""... $ac_c" 1>&4
! if eval "test \"`echo '${'ac_cv_func_closedir_void'+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 915 "configure"
--- 904,915 ----

  fi

! /bin/echo $ac_n "checking whether closedir returns void""... $ac_c" 1>&4
! if eval "test \"`/bin/echo '${'ac_cv_func_closedir_void'+set}'`\" = set"; then
!   /bin/echo $ac_n "(cached) $ac_c" 1>&4
  else
    if test "$cross_compiling" = yes; then
!     { /bin/echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
  else
  cat > conftest.$ac_ext <<EOF
  #line 915 "configure"
***************
*** 926,932 ****
  fi
  rm -fr conftest*
  fi
! echo "$ac_t""$ac_cv_func_closedir_void" 1>&4
  if test $ac_cv_func_closedir_void = yes; then
    cat >> confdefs.h <<\EOF
  #define CLOSEDIR_VOID 1
--- 927,933 ----
  fi
  rm -fr conftest*
  fi
! /bin/echo "$ac_t""$ac_cv_func_closedir_void" 1>&4
  if test $ac_cv_func_closedir_void = yes; then
    cat >> confdefs.h <<\EOF
  #define CLOSEDIR_VOID 1
***************
*** 937,946 ****
  for ac_hdr in assert.h float.h limits.h memory.h pwd.h stdlib.h \
                   string.h unistd.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 947 "configure"
--- 938,947 ----
  for ac_hdr in assert.h float.h limits.h memory.h pwd.h stdlib.h \
                   string.h unistd.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 \"`/bin/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 947 "configure"
***************
*** 953,982 ****
    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_func in basename bcopy memmove putenv
  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 983 "configure"
--- 954,983 ----
    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 \"`/bin/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_func in basename bcopy memmove putenv
  do
! /bin/echo $ac_n "checking for $ac_func""... $ac_c" 1>&4
! if eval "test \"`/bin/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 983 "configure"
***************
*** 1009,1030 ****
  rm -f conftest*

  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 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 1031 "configure"
--- 1010,1031 ----
  rm -f conftest*

  fi
! if eval "test \"`/bin/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 working const""... $ac_c" 1>&4
! if eval "test \"`/bin/echo '${'ac_cv_c_const'+set}'`\" = set"; then
!   /bin/echo $ac_n "(cached) $ac_c" 1>&4
  else
    cat > conftest.$ac_ext <<EOF
  #line 1031 "configure"
***************
*** 1087,1093 ****
  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
--- 1088,1094 ----
  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
***************
*** 1098,1106 ****


  # This is a GNU libc invention.
! echo $ac_n "checking whether program_invocation_name is predefined""... $ac_c" 1>&4
! if eval "test \"`echo '${'kb_cv_var_program_inv_name'+set}'`\" = set"; then
!   echo $ac_n "(cached) $ac_c" 1>&4
  else
    cat > conftest.$ac_ext <<EOF
  #line 1107 "configure"
--- 1099,1107 ----


  # This is a GNU libc invention.
! /bin/echo $ac_n "checking whether program_invocation_name is predefined""... $ac_c" 1>&4
! if eval "test \"`/bin/echo '${'kb_cv_var_program_inv_name'+set}'`\" = set"; then
!   /bin/echo $ac_n "(cached) $ac_c" 1>&4
  else
    cat > conftest.$ac_ext <<EOF
  #line 1107 "configure"
***************
*** 1121,1127 ****
  rm -f conftest*

  fi
! echo "$ac_t""$kb_cv_var_program_inv_name" 1>&4
  if test $kb_cv_var_program_inv_name = yes; then
    cat >> confdefs.h <<\EOF
  #define HAVE_PROGRAM_INVOCATION_NAME 1
--- 1122,1128 ----
  rm -f conftest*

  fi
! /bin/echo "$ac_t""$kb_cv_var_program_inv_name" 1>&4
  if test $kb_cv_var_program_inv_name = yes; then
    cat >> confdefs.h <<\EOF
  #define HAVE_PROGRAM_INVOCATION_NAME 1
***************
*** 1134,1142 ****
  # This test program is due to Mike Hibler <[e-mail]>.
  # We don't actually need to run this if we don't have putenv, but it
  # doesn't hurt.
! echo $ac_n "checking whether putenv uses malloc""... $ac_c" 1>&4
! if eval "test \"`echo '${'kb_cv_func_putenv_malloc'+set}'`\" = set"; then
!   echo $ac_n "(cached) $ac_c" 1>&4
  else
    if test "$cross_compiling" = yes; then
    kb_cv_func_putenv_malloc=no
--- 1135,1143 ----
  # This test program is due to Mike Hibler <[e-mail]>.
  # We don't actually need to run this if we don't have putenv, but it
  # doesn't hurt.
! /bin/echo $ac_n "checking whether putenv uses malloc""... $ac_c" 1>&4
! if eval "test \"`/bin/echo '${'kb_cv_func_putenv_malloc'+set}'`\" = set"; then
!   /bin/echo $ac_n "(cached) $ac_c" 1>&4
  else
    if test "$cross_compiling" = yes; then
    kb_cv_func_putenv_malloc=no
***************
*** 1204,1210 ****
  fi
  rm -fr conftest*
  fi
! echo "$ac_t""$kb_cv_func_putenv_malloc" 1>&4
  if test $kb_cv_func_putenv_malloc = yes; then
    cat >> confdefs.h <<\EOF
  #define SMART_PUTENV 1
--- 1205,1211 ----
  fi
  rm -fr conftest*
  fi
! /bin/echo "$ac_t""$kb_cv_func_putenv_malloc" 1>&4
  if test $kb_cv_func_putenv_malloc = yes; then
    cat >> confdefs.h <<\EOF
  #define SMART_PUTENV 1
***************
*** 1215,1221 ****

  trap '' 1 2 15
  if test -w $cache_file; then
! echo "updating cache $cache_file"
  cat > $cache_file <<\EOF
  # This file is a shell script that caches the results of configure
  # tests run on this system so they can be shared between configure
--- 1216,1222 ----

  trap '' 1 2 15
  if test -w $cache_file; then
! /bin/echo "updating cache $cache_file"
  cat > $cache_file <<\EOF
  # This file is a shell script that caches the results of configure
  # tests run on this system so they can be shared between configure
***************
*** 1233,1243 ****
  #
  EOF
  # Ultrix sh set writes to stderr and can't be redirected directly.
  (set) 2>&1 |
!   sed -n "s/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/: \${\1='\2'}/p" \
!   >> $cache_file
  else
! echo "not updating unwritable cache $cache_file"
  fi

  trap 'rm -fr conftest* confdefs* core $ac_clean_files; exit 1' 1 2 15
--- 1234,1247 ----
  #
  EOF
  # Ultrix sh set writes to stderr and can't be redirected directly.
+ # On AmigaDOS, the {} chars get eaten, so add them back with separate
+ # sed commands.
  (set) 2>&1 |
!   sed -n "s/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/: \${\1='\2'}/p" |
!   sed "s@\\\$@\${@" |
!   sed "s@\$@}@" >> $cache_file
  else
! /bin/echo "not updating unwritable cache $cache_file"
  fi

  trap 'rm -fr conftest* confdefs* core $ac_clean_files; exit 1' 1 2 15
***************
*** 1260,1266 ****
  # Without the "./", some shells look in PATH for config.status.
  : ${CONFIG_STATUS=./config.status}

! echo creating $CONFIG_STATUS
  rm -f $CONFIG_STATUS
  cat > $CONFIG_STATUS <<EOF
  #!/bin/sh
--- 1264,1270 ----
  # Without the "./", some shells look in PATH for config.status.
  : ${CONFIG_STATUS=./config.status}

! /bin/echo creating $CONFIG_STATUS
  rm -f $CONFIG_STATUS
  cat > $CONFIG_STATUS <<EOF
  #!/bin/sh
***************
*** 1279,1292 ****
  do
    case "\$ac_option" in
    -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
!     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 ;;
!   *) echo "\$ac_cs_usage"; exit 1 ;;
    esac
  done

--- 1283,1296 ----
  do
    case "\$ac_option" in
    -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
!     /bin/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)
!     /bin/echo "\$ac_cs_usage"; exit 0 ;;
!   *) /bin/echo "\$ac_cs_usage"; exit 1 ;;
    esac
  done

***************
*** 1326,1346 ****
  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
--- 1330,1350 ----
  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
***************
*** 1348,1354 ****
    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"
--- 1352,1358 ----
    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"
***************
*** 1359,1367 ****
    [/$]*) INSTALL="$ac_given_INSTALL" ;;
    *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
    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" ;;
--- 1363,1371 ----
    [/$]*) INSTALL="$ac_given_INSTALL" ;;
    *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
    esac
!   /bin/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" ;;
***************
*** 1374,1387 ****
    # getline or system. (Anyway, configure scripts aren't supposed to use awk.)
    # Use \@...@<cmd> form of sed address because the filename may contain /.
    # Can't use only one -e and commands {dr foo} because foo has to be last.
!   # Use @e initially instead of -e because GNU echo has a -e option.
    # USe `X' to mean a bunch of backslashes; this is for FreeBSD.
    file_substs=`sed -n \
  "/^ac_include/s%ac_include[     ]*\(.*\)%@e 'X@^&@r \1' -e 'X@^&@d'%p" \
                 $ac_given_srcdir/${ac_file}.in`
    if test -n "$file_substs"; then
      # Change @e back to -e and X@^ to \@^.
!     file_subst_cmd="sed `echo $file_substs \
                           | sed -e 's/@e/-e/g' -e 's/X@^/\\\\\@^/g'`"
    else
      # If no substitutions and hence no sed commands, don't choke.
--- 1378,1391 ----
    # getline or system. (Anyway, configure scripts aren't supposed to use awk.)
    # Use \@...@<cmd> form of sed address because the filename may contain /.
    # Can't use only one -e and commands {dr foo} because foo has to be last.
!   # Use @e initially instead of -e because GNU /bin/echo has a -e option.
    # USe `X' to mean a bunch of backslashes; this is for FreeBSD.
    file_substs=`sed -n \
  "/^ac_include/s%ac_include[     ]*\(.*\)%@e 'X@^&@r \1' -e 'X@^&@d'%p" \
                 $ac_given_srcdir/${ac_file}.in`
    if test -n "$file_substs"; then
      # Change @e back to -e and X@^ to \@^.
!     file_subst_cmd="sed `/bin/echo $file_substs \
                           | sed -e 's/@e/-e/g' -e 's/X@^/\\\\\@^/g'`"
    else
      # If no substitutions and hence no sed commands, don't choke.
***************
*** 1424,1435 ****
  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

!   echo creating $ac_file

    rm -f conftest.frag conftest.in conftest.out
    cp $ac_given_srcdir/$ac_file_in conftest.in
--- 1428,1439 ----
  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

!   /bin/echo creating $ac_file

    rm -f conftest.frag conftest.in conftest.out
    cp $ac_given_srcdir/$ac_file_in conftest.in
***************
*** 1470,1478 ****
    # grep -c gives empty output for an empty file on some AIX systems.
    if test -z "$ac_lines" || test "$ac_lines" -eq 0; then break; fi
    # Write a limited-size here document to conftest.frag.
!   echo '  cat > conftest.frag <<CEOF' >> $CONFIG_STATUS
    sed ${ac_max_here_lines}q conftest.vals >> $CONFIG_STATUS
!   echo 'CEOF
    sed -f conftest.frag conftest.in > conftest.out
    rm -f conftest.in
    mv conftest.out conftest.in
--- 1474,1482 ----
    # grep -c gives empty output for an empty file on some AIX systems.
    if test -z "$ac_lines" || test "$ac_lines" -eq 0; then break; fi
    # Write a limited-size here document to conftest.frag.
!   /bin/echo '  cat > conftest.frag <<CEOF' >> $CONFIG_STATUS
    sed ${ac_max_here_lines}q conftest.vals >> $CONFIG_STATUS
!   /bin/echo 'CEOF
    sed -f conftest.frag conftest.in > conftest.out
    rm -f conftest.in
    mv conftest.out conftest.in
***************
*** 1485,1495 ****

  cat >> $CONFIG_STATUS <<\EOF
    rm -f conftest.frag conftest.h
!   echo "/* $ac_file.  Generated automatically by configure.  */" > conftest.h
    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
--- 1489,1499 ----

  cat >> $CONFIG_STATUS <<\EOF
    rm -f conftest.frag conftest.h
!   /bin/echo "/* $ac_file.  Generated automatically by configure.  */" > conftest.h
    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 unixtex-6.1b-base/make/common.make unixtex-6.1b/make/common.make
*** unixtex-6.1b-base/make/common.make    Sun Jan  8 17:20:16 1995
--- unixtex-6.1b/make/common.make    Sun Apr  2 21:38:24 1995
***************
*** 6,11 ****
--- 6,16 ----
  VPATH = @srcdir@

  CC = @CC@
+ #LN_S = @LN_S@
+ LN_S = cp -p
+ #LN = @LN_S@
+ LN = cp -p
+
  # CFLAGS is used for both compilation and linking.
  CFLAGS = @CFLAGS@ $(XCFLAGS)

diff -rc --new-file unixtex-6.1b-base/make/paths.make unixtex-6.1b/make/paths.make
*** unixtex-6.1b-base/make/paths.make    Sun Jan  8 17:20:20 1995
--- unixtex-6.1b/make/paths.make    Sun Apr  2 21:47:42 1995
***************
*** 10,16 ****
  # Instead, give the -prefix/-exec-prefix options to configure.
  # (See kpathsea/INSTALL for more details.) This is arguably
  # a bug, but it's not likely to change soon.
! prefix = @prefix@
  exec_prefix = @exec_prefix@

  # Architecture-dependent executables.
--- 10,17 ----
  # Instead, give the -prefix/-exec-prefix options to configure.
  # (See kpathsea/INSTALL for more details.) This is arguably
  # a bug, but it's not likely to change soon.
! #prefix = @prefix@
! prefix = /gnu
  exec_prefix = @exec_prefix@

  # Architecture-dependent executables.
diff -rc --new-file unixtex-6.1b-base/web2c/Makefile.in unixtex-6.1b/web2c/Makefile.in
*** unixtex-6.1b-base/web2c/Makefile.in    Sun Apr  2 06:05:54 1995
--- unixtex-6.1b/web2c/Makefile.in    Mon Apr  3 23:26:34 1995
***************
*** 74,81 ****
  # install-bases' will try to install.  See `README' for a brief
  # description of each of these formats.
  bases = mf.base cmmf.base
! fmts = tex.fmt
! # latex.fmt slitex.fmt etex.fmt amslatex.fmt amstex.fmt texinfo.fmt
  # inrstex.fmt picplus.fmt

  # The name of the file that defines your local devices, for use with
--- 74,81 ----
  # install-bases' will try to install.  See `README' for a brief
  # description of each of these formats.
  bases = mf.base cmmf.base
! fmts = tex.fmt latex.fmt
! # slitex.fmt etex.fmt amslatex.fmt amstex.fmt texinfo.fmt
  # inrstex.fmt picplus.fmt

  # The name of the file that defines your local devices, for use with
***************
*** 90,96 ****
  DEFS = $(XDEFS)

  # CFLAGS is used for both compilation and linking.
! CFLAGS = -g $(XCFLAGS)

  # Do not override CPPFLAGS; change CFLAGS or DEFS instead.
  CPPFLAGS = $(XCPPFLAGS) -I. -I$(srcdir) -I$(kpathsea_parent) \
--- 90,96 ----
  DEFS = $(XDEFS)

  # CFLAGS is used for both compilation and linking.
! CFLAGS = $(XCFLAGS)

  # Do not override CPPFLAGS; change CFLAGS or DEFS instead.
  CPPFLAGS = $(XCPPFLAGS) -I. -I$(srcdir) -I$(kpathsea_parent) \
***************
*** 374,395 ****
                            -o -name \*.start     \
                            -o -name \*.yacc      \
                         \) -print`; do           \
!           ln $$f $(distdir)/`dirname $$f`;    \
          done
!     ln lib/*.c lib/*.h $(distdir)/lib
      rm -f lib/c-auto.h
!     ln mf/MFwindow/*.c $(distdir)/mf/MFwindow
      rm -f mf/MFwindow/x11.c mf/MFwindow/sun.c
!     ln mf/MFtrap/trap.* mf/MFtrap/trapin.log mf/MFtrap/trapman.tex \
        $(distdir)/mf/MFtrap
!     ln fontutil/gftodmem.h $(distdir)/fontutil
!     ln tex/TeXtrip/trip.* tex/TeXtrip/tripin.log \
             tex/TeXtrip/tripman.tex tex/TeXtrip/tripos.tex \
        $(distdir)/tex/TeXtrip
      for d in tex mf bibtex; do rm -f $(distdir)/$$d/c$$d.ch; done
!     ln web/tangleboot.* $(distdir)/web
      rm -f $(distdir)/web/tangleboot.o
!     ln web2c/*.c web2c/*.h $(distdir)/web2c
      (cd $(distdir)/web2c; mv y.tab.c y.tab.c-dist; \
        mv y.tab.h y.tab.h-dist; \
        mv lex.yy.c lex.yy.c-dist)
--- 374,395 ----
                            -o -name \*.start     \
                            -o -name \*.yacc      \
                         \) -print`; do           \
!           $(LN) $$f $(distdir)/`dirname $$f`;    \
          done
!     $(LN) lib/*.c lib/*.h $(distdir)/lib
      rm -f lib/c-auto.h
!     $(LN) mf/MFwindow/*.c $(distdir)/mf/MFwindow
      rm -f mf/MFwindow/x11.c mf/MFwindow/sun.c
!     $(LN) mf/MFtrap/trap.* mf/MFtrap/trapin.log mf/MFtrap/trapman.tex \
        $(distdir)/mf/MFtrap
!     $(LN) fontutil/gftodmem.h $(distdir)/fontutil
!     $(LN) tex/TeXtrip/trip.* tex/TeXtrip/tripin.log \
             tex/TeXtrip/tripman.tex tex/TeXtrip/tripos.tex \
        $(distdir)/tex/TeXtrip
      for d in tex mf bibtex; do rm -f $(distdir)/$$d/c$$d.ch; done
!     $(LN) web/tangleboot.* $(distdir)/web
      rm -f $(distdir)/web/tangleboot.o
!     $(LN) web2c/*.c web2c/*.h $(distdir)/web2c
      (cd $(distdir)/web2c; mv y.tab.c y.tab.c-dist; \
        mv y.tab.h y.tab.h-dist; \
        mv lex.yy.c lex.yy.c-dist)
***************
*** 409,416 ****
      cd ..; cp -p $(top_files) $(distname)/$(top_distdir)
      cd ..; echo >>$(distname)/$(top_distdir)/ChangeLog
      cd ..; cat kutil/ChangeLog >>$(distname)/$(top_distdir)/ChangeLog
!     -ln $(ln_files) $(distdir)
!     ln $(program_files) $(distdir)
      cd $(kpathsea_dir); $(MAKE) distdir=$(kpathsea_distdir) \
        ln_files='$(ln_files)' distdir
      ungnumake $(distdir)/Makefile.in $(kpathsea_distdir)/Makefile.in \
--- 409,416 ----
      cd ..; cp -p $(top_files) $(distname)/$(top_distdir)
      cd ..; echo >>$(distname)/$(top_distdir)/ChangeLog
      cd ..; cat kutil/ChangeLog >>$(distname)/$(top_distdir)/ChangeLog
!     -$(LN) $(ln_files) $(distdir)
!     $(LN) $(program_files) $(distdir)
      cd $(kpathsea_dir); $(MAKE) distdir=$(kpathsea_distdir) \
        ln_files='$(ln_files)' distdir
      ungnumake $(distdir)/Makefile.in $(kpathsea_distdir)/Makefile.in \
***************
*** 453,459 ****
      cd $(top_distdir)/$(distname); \
            mkdir `cd ../..; find -name \*.web -exec dirname '{}' \; | uniq`
      for d in `find . -name $(distdir) -prune -o -name \*.web -print` ; do\
!           ln $$d $(distdir)/`dirname $$d`;                \
          done
      GZIP=-9 tar czf web-$(version). $(top_distdir)
      rm -rf $(top_distdir)
--- 453,459 ----
      cd $(top_distdir)/$(distname); \
            mkdir `cd ../..; find -name \*.web -exec dirname '{}' \; | uniq`
      for d in `find . -name $(distdir) -prune -o -name \*.web -print` ; do\
!           $(LN) $$d $(distdir)/`dirname $$d`;                \
          done
      GZIP=-9 tar czf web-$(version). $(top_distdir)
      rm -rf $(top_distdir)
diff -rc --new-file unixtex-6.1b-base/web2c/bibtex/Makefile.in unixtex-6.1b/web2c/bibtex/Makefile.in
*** unixtex-6.1b-base/web2c/bibtex/Makefile.in    Thu Feb  3 12:48:30 1994
--- unixtex-6.1b/web2c/bibtex/Makefile.in    Sun Apr  2 21:43:26 1995
***************
*** 16,29 ****
  commono = ../lib/lib.a $(kpathsea)

  # Routines used in TeX, Metafont, and BibTeX.
! fileioc = ../lib/openinout.c
  fileioo = openinout.o

  program = bibtex

  CC = @CC@
! CFLAGS = -g
! CPPFLAGS = -DBibTeX -I$(srcdir)/../lib -I../..

  CCLD = $(CC)
  LDFLAGS = $(CFLAGS) $(XLDFLAGS)
--- 16,29 ----
  commono = ../lib/lib.a $(kpathsea)

  # Routines used in TeX, Metafont, and BibTeX.
! fileioc = $(srcdir)/../lib/openinout.c
  fileioo = openinout.o

  program = bibtex

  CC = @CC@
! CFLAGS =
! CPPFLAGS = -DBibTeX -I../lib -I$(srcdir)/../lib -I../.. -I$(srcdir)/../..

  CCLD = $(CC)
  LDFLAGS = $(CFLAGS) $(XLDFLAGS)
***************
*** 39,49 ****
  .SUFFIXES:
  .SUFFIXES: .o .c .p .ch
  .p.c:
!     $(SHELL) $(srcdir)/../bibtex/convert $*.p $*.c
  .ch.p:
!     ../web/tangle $*.web c$*.ch
  .c.o:
!     $(CC) $(CPPFLAGS) $(CFLAGS) -c $*.c


  default: all
--- 39,52 ----
  .SUFFIXES:
  .SUFFIXES: .o .c .p .ch
  .p.c:
!     $(SHELL) $(srcdir)/../bibtex/convert $< $*.tmp $(srcdir)
!     sed "s:^void main_body() {:void main_body() { standardoutput = stdout; standardinput = stdin;:" <$*.tmp >$*.c
  .ch.p:
!     ../web/tangle $(srcdir)/$*.web c$*.ch
!     cp $(srcdir)/$*.p $*.p
!     rm -f $(srcdir)/$*.p
  .c.o:
!     $(CC) $(CPPFLAGS) $(CFLAGS) -c $<


  default: all
diff -rc --new-file unixtex-6.1b-base/web2c/bibtex/convert unixtex-6.1b/web2c/bibtex/convert
*** unixtex-6.1b-base/web2c/bibtex/convert    Sun Nov  7 20:12:52 1993
--- unixtex-6.1b/web2c/bibtex/convert    Sun Apr  2 20:23:28 1995
***************
*** 1,9 ****
  #!/bin/sh
  # Convert Bibtex to C.
!
  sed=sed

! cat ../lib/common.defines $1 \
      | ../web2c/web2c -hcpascal.h \
          | $sed -e '1a\
  \#include \<setjmp.h\> \
--- 1,9 ----
  #!/bin/sh
  # Convert Bibtex to C.
! srcdir=$3
  sed=sed

! cat $srcdir/../lib/common.defines $1 \
      | ../web2c/web2c -hcpascal.h \
          | $sed -e '1a\
  \#include \<setjmp.h\> \
diff -rc --new-file unixtex-6.1b-base/web2c/configure unixtex-6.1b/web2c/configure
*** unixtex-6.1b-base/web2c/configure    Sun Apr  2 06:05:56 1995
--- unixtex-6.1b/web2c/configure    Mon Apr  3 17:27:04 1995
***************
*** 9,15 ****

  # Defaults:
  ac_help=
! ac_default_prefix=/usr/local
  # Any additions from configure.in:
  ac_help="$ac_help
    --with-x                use the X Window System"
--- 9,15 ----

  # Defaults:
  ac_help=
! ac_default_prefix=/gnu
  # Any additions from configure.in:
  ac_help="$ac_help
    --with-x                use the X Window System"
***************
*** 51,57 ****
    fi

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

--- 51,57 ----
    fi

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

***************
*** 72,92 ****
      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 ;;
--- 72,92 ----
      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
!       { /bin/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
!       { /bin/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 ;;
***************
*** 218,233 ****
      verbose=yes ;;

    -version | --version | --versio | --versi | --vers)
!     echo "configure generated by autoconf version 2.1"
      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 ;;
--- 218,233 ----
      verbose=yes ;;

    -version | --version | --versio | --versi | --vers)
!     /bin/echo "configure generated by autoconf version 2.1"
      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
!       { /bin/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 ;;
***************
*** 235,246 ****
      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)
--- 235,246 ----
      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
!       { /bin/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)
***************
*** 261,275 ****
    | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
      x_libraries="$ac_optarg" ;;

!   -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; }
      ;;

    *)
!     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
!       { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
      fi
      nonopt="$ac_option"
      ;;
--- 261,275 ----
    | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
      x_libraries="$ac_optarg" ;;

!   -*) { /bin/echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; }
      ;;

    *)
!     if test -n "`/bin/echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
!       /bin/echo "configure: warning: $ac_option: invalid host type" 1>&2
      fi
      if test "x$nonopt" != xNONE; then
!       { /bin/echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
      fi
      nonopt="$ac_option"
      ;;
***************
*** 278,284 ****
  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
--- 278,284 ----
  done

  if test -n "$ac_prev"; then
!   { /bin/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
***************
*** 297,303 ****
  fi
  exec 5>./config.log

! echo "\
  This file contains any messages produced by compilers while
  running configure, to aid debugging if configure makes a mistake.
  " 1>&5
--- 297,303 ----
  fi
  exec 5>./config.log

! /bin/echo "\
  This file contains any messages produced by compilers while
  running configure, to aid debugging if configure makes a mistake.
  " 1>&5
***************
*** 328,334 ****
  # 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.
--- 328,334 ----
  # 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.
***************
*** 339,345 ****
    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
--- 339,345 ----
    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
***************
*** 350,361 ****
  fi
  if test ! -r $srcdir/$ac_unique_file; then
    if test "$ac_srcdir_defaulted" = yes; then
!     { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; }
    else
!     { 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
--- 350,361 ----
  fi
  if test ! -r $srcdir/$ac_unique_file; then
    if test "$ac_srcdir_defaulted" = yes; then
!     { /bin/echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; }
    else
!     { /bin/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
***************
*** 367,382 ****
  fi
  for ac_site_file in $CONFIG_SITE; do
    if test -r "$ac_site_file"; then
!     echo "loading site script $ac_site_file"
      . "$ac_site_file"
    fi
  done

  if test -r "$cache_file"; then
!   echo "loading cache $cache_file"
    . $cache_file
  else
!   echo "creating cache $cache_file"
    > $cache_file
  fi

--- 367,382 ----
  fi
  for ac_site_file in $CONFIG_SITE; do
    if test -r "$ac_site_file"; then
!     /bin/echo "loading site script $ac_site_file"
      . "$ac_site_file"
    fi
  done

  if test -r "$cache_file"; then
!   /bin/echo "loading cache $cache_file"
    . $cache_file
  else
!   /bin/echo "creating cache $cache_file"
    > $cache_file
  fi

***************
*** 386,394 ****
  ac_compile='${CC-cc} $CFLAGS $CPPFLAGS conftest.$ac_ext -c 1>&5 2>&5'
  ac_link='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext -o conftest $LIBS 1>&5 2>&5'

! if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
    # Stardent Vistra SVR4 grep lacks -e, says [e-mail].
!   if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
      ac_n= ac_c='
  ' ac_t='    '
    else
--- 386,394 ----
  ac_compile='${CC-cc} $CFLAGS $CPPFLAGS conftest.$ac_ext -c 1>&5 2>&5'
  ac_link='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext -o conftest $LIBS 1>&5 2>&5'

! if (/bin/echo "testing\c"; /bin/echo 1,2,3) | grep c >/dev/null; then
    # Stardent Vistra SVR4 grep lacks -e, says [e-mail].
!   if (/bin/echo -n testing; /bin/echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
      ac_n= ac_c='
  ' ac_t='    '
    else
***************
*** 406,419 ****



! echo $ac_n "checking whether ${MAKE-make} sets \$MAKE""... $ac_c" 1>&4
  set dummy ${MAKE-make}; ac_make=$2
! if eval "test \"`echo '${'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
!   echo $ac_n "(cached) $ac_c" 1>&4
  else
    cat > conftestmake <<\EOF
  all:
!     @echo 'ac_maketemp="${MAKE}"'
  EOF
  # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
  eval `${MAKE-make} -f conftestmake 2>/dev/null | grep temp=`
--- 406,419 ----



! /bin/echo $ac_n "checking whether ${MAKE-make} sets \$MAKE""... $ac_c" 1>&4
  set dummy ${MAKE-make}; ac_make=$2
! if eval "test \"`/bin/echo '${'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
!   /bin/echo $ac_n "(cached) $ac_c" 1>&4
  else
    cat > conftestmake <<\EOF
  all:
!     @/bin/echo 'ac_maketemp="${MAKE}"'
  EOF
  # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
  eval `${MAKE-make} -f conftestmake 2>/dev/null | grep temp=`
***************
*** 424,443 ****
  fi
  rm -f conftestmake
  fi
! if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
!   echo "$ac_t""yes" 1>&4
    SET_MAKE=
  else
!   echo "$ac_t""no" 1>&4
    SET_MAKE="MAKE=${MAKE-make}"
  fi


  # 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.
--- 424,443 ----
  fi
  rm -f conftestmake
  fi
! if eval "test \"`/bin/echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
!   /bin/echo "$ac_t""yes" 1>&4
    SET_MAKE=
  else
!   /bin/echo "$ac_t""no" 1>&4
    SET_MAKE="MAKE=${MAKE-make}"
  fi


  # 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 \"`/bin/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.
***************
*** 456,470 ****
  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__
--- 456,470 ----
  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 \"`/bin/echo '${'ac_cv_prog_gcc'+set}'`\" = set"; then
!   /bin/echo $ac_n "(cached) $ac_c" 1>&4
  else
    cat > conftest.c <<EOF
  #ifdef __GNUC__
***************
*** 477,491 ****
    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
    ac_cv_prog_gcc_g=yes
  else
--- 477,491 ----
    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 \"`/bin/echo '${'ac_cv_prog_gcc_g'+set}'`\" = set"; then
!   /bin/echo $ac_n "(cached) $ac_c" 1>&4
  else
!   /bin/echo 'void f(){}' > conftest.c
  if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
    ac_cv_prog_gcc_g=yes
  else
***************
*** 494,500 ****
  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
--- 494,500 ----
  rm -f conftest*

  fi
!     /bin/echo "$ac_t""$ac_cv_prog_gcc_g" 1>&4
      if test $ac_cv_prog_gcc_g = yes; then
        CFLAGS="-g -O"
      else
***************
*** 519,525 ****
    fi
  done
  if test -z "$ac_aux_dir"; then
!   { echo "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; }
  fi
  ac_config_guess=$ac_aux_dir/config.guess
  ac_config_sub=$ac_aux_dir/config.sub
--- 519,525 ----
    fi
  done
  if test -z "$ac_aux_dir"; then
!   { /bin/echo "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; }
  fi
  ac_config_guess=$ac_aux_dir/config.guess
  ac_config_sub=$ac_aux_dir/config.sub
***************
*** 535,549 ****
  # 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
--- 535,550 ----
  # 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
! INSTALL="/bin/install -c"
  if test -z "$INSTALL"; then
! if eval "test \"`/bin/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
!     ''|.|/bin) ;;
      *)
        # OSF1 and SCO ODT 3.0 have their own names for install.
        for ac_prog in ginstall installbsd scoinst install; do
***************
*** 568,574 ****
  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.
--- 569,575 ----
  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.
***************
*** 578,586 ****

  # 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.
--- 579,587 ----

  # 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 \"`/bin/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.
***************
*** 599,615 ****
  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


! 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
--- 600,616 ----
  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


! /bin/echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&4
  if test -d /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
***************
*** 621,627 ****
      CC="$CC -Xp"
    fi
  else
!   echo "$ac_t""no" 1>&4
    ISC=
  fi

--- 622,628 ----
      CC="$CC -Xp"
    fi
  else
!   /bin/echo "$ac_t""no" 1>&4
    ISC=
  fi

***************
*** 629,638 ****
  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 639 "configure"
--- 630,639 ----
  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 \"`/bin/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 639 "configure"
***************
*** 654,675 ****
  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 "
--- 655,676 ----
  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 \"`/bin/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 "
***************
*** 693,709 ****
  LIBS="$ac_save_LIBS"

  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 "
--- 694,710 ----
  LIBS="$ac_save_LIBS"

  fi
! if eval "test \"`/bin/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 \"`/bin/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 "
***************
*** 727,749 ****
  LIBS="$ac_save_LIBS"

  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 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.
--- 728,750 ----
  LIBS="$ac_save_LIBS"

  fi
! if eval "test \"`/bin/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 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 \"`/bin/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.
***************
*** 761,767 ****
  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
--- 762,768 ----
  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
***************
*** 775,781 ****
  if test -z "$ac_err"; then
    :
  else
!   echo "$ac_err" >&5
    rm -rf conftest*
    CPP=/lib/cpp
  fi
--- 776,782 ----
  if test -z "$ac_err"; then
    :
  else
!   /bin/echo "$ac_err" >&5
    rm -rf conftest*
    CPP=/lib/cpp
  fi
***************
*** 786,797 ****
  fi
  fi
  CPP="$ac_cv_prog_CPP"
! echo "$ac_t""$CPP" 1>&4

  # 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
--- 787,798 ----
  fi
  fi
  CPP="$ac_cv_prog_CPP"
! /bin/echo "$ac_t""$CPP" 1>&4

  # 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 \"`/bin/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
***************
*** 811,821 ****
  rm -fr conftest*
  fi
  cross_compiling=$ac_cv_c_cross
! echo "$ac_t""$ac_cv_c_cross" 1>&4

! 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 822 "configure"
--- 812,822 ----
  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 for ANSI C header files""... $ac_c" 1>&4
! if eval "test \"`/bin/echo '${'ac_cv_header_stdc'+set}'`\" = set"; then
!   /bin/echo $ac_n "(cached) $ac_c" 1>&4
  else
    cat > conftest.$ac_ext <<EOF
  #line 822 "configure"
***************
*** 831,837 ****
    rm -rf conftest*
    ac_cv_header_stdc=yes
  else
!   echo "$ac_err" >&5
    rm -rf conftest*
    ac_cv_header_stdc=no
  fi
--- 832,838 ----
    rm -rf conftest*
    ac_cv_header_stdc=yes
  else
!   /bin/echo "$ac_err" >&5
    rm -rf conftest*
    ac_cv_header_stdc=no
  fi
***************
*** 900,906 ****
  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
--- 901,907 ----
  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
***************
*** 908,919 ****

  fi

! echo $ac_n "checking whether closedir returns void""... $ac_c" 1>&4
! if eval "test \"`echo '${'ac_cv_func_closedir_void'+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 920 "configure"
--- 909,920 ----

  fi

! /bin/echo $ac_n "checking whether closedir returns void""... $ac_c" 1>&4
! if eval "test \"`/bin/echo '${'ac_cv_func_closedir_void'+set}'`\" = set"; then
!   /bin/echo $ac_n "(cached) $ac_c" 1>&4
  else
    if test "$cross_compiling" = yes; then
!     { /bin/echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
  else
  cat > conftest.$ac_ext <<EOF
  #line 920 "configure"
***************
*** 931,937 ****
  fi
  rm -fr conftest*
  fi
! echo "$ac_t""$ac_cv_func_closedir_void" 1>&4
  if test $ac_cv_func_closedir_void = yes; then
    cat >> confdefs.h <<\EOF
  #define CLOSEDIR_VOID 1
--- 932,938 ----
  fi
  rm -fr conftest*
  fi
! /bin/echo "$ac_t""$ac_cv_func_closedir_void" 1>&4
  if test $ac_cv_func_closedir_void = yes; then
    cat >> confdefs.h <<\EOF
  #define CLOSEDIR_VOID 1
***************
*** 942,951 ****
  for ac_hdr in assert.h float.h limits.h memory.h pwd.h stdlib.h \
                   string.h unistd.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 952 "configure"
--- 943,952 ----
  for ac_hdr in assert.h float.h limits.h memory.h pwd.h stdlib.h \
                   string.h unistd.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 \"`/bin/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 952 "configure"
***************
*** 958,987 ****
    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_func in basename bcopy memmove putenv
  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 988 "configure"
--- 959,988 ----
    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 \"`/bin/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_func in basename bcopy memmove putenv
  do
! /bin/echo $ac_n "checking for $ac_func""... $ac_c" 1>&4
! if eval "test \"`/bin/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 988 "configure"
***************
*** 1014,1035 ****
  rm -f conftest*

  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 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 1036 "configure"
--- 1015,1036 ----
  rm -f conftest*

  fi
! if eval "test \"`/bin/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 working const""... $ac_c" 1>&4
! if eval "test \"`/bin/echo '${'ac_cv_c_const'+set}'`\" = set"; then
!   /bin/echo $ac_n "(cached) $ac_c" 1>&4
  else
    cat > conftest.$ac_ext <<EOF
  #line 1036 "configure"
***************
*** 1092,1098 ****
  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
--- 1093,1099 ----
  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
***************
*** 1103,1111 ****


  # This is a GNU libc invention.
! echo $ac_n "checking whether program_invocation_name is predefined""... $ac_c" 1>&4
! if eval "test \"`echo '${'kb_cv_var_program_inv_name'+set}'`\" = set"; then
!   echo $ac_n "(cached) $ac_c" 1>&4
  else
    cat > conftest.$ac_ext <<EOF
  #line 1112 "configure"
--- 1104,1112 ----


  # This is a GNU libc invention.
! /bin/echo $ac_n "checking whether program_invocation_name is predefined""... $ac_c" 1>&4
! if eval "test \"`/bin/echo '${'kb_cv_var_program_inv_name'+set}'`\" = set"; then
!   /bin/echo $ac_n "(cached) $ac_c" 1>&4
  else
    cat > conftest.$ac_ext <<EOF
  #line 1112 "configure"
***************
*** 1126,1132 ****
  rm -f conftest*

  fi
! echo "$ac_t""$kb_cv_var_program_inv_name" 1>&4
  if test $kb_cv_var_program_inv_name = yes; then
    cat >> confdefs.h <<\EOF
  #define HAVE_PROGRAM_INVOCATION_NAME 1
--- 1127,1133 ----
  rm -f conftest*

  fi
! /bin/echo "$ac_t""$kb_cv_var_program_inv_name" 1>&4
  if test $kb_cv_var_program_inv_name = yes; then
    cat >> confdefs.h <<\EOF
  #define HAVE_PROGRAM_INVOCATION_NAME 1
***************
*** 1139,1147 ****
  # This test program is due to Mike Hibler <[e-mail]>.
  # We don't actually need to run this if we don't have putenv, but it
  # doesn't hurt.
! echo $ac_n "checking whether putenv uses malloc""... $ac_c" 1>&4
! if eval "test \"`echo '${'kb_cv_func_putenv_malloc'+set}'`\" = set"; then
!   echo $ac_n "(cached) $ac_c" 1>&4
  else
    if test "$cross_compiling" = yes; then
    kb_cv_func_putenv_malloc=no
--- 1140,1148 ----
  # This test program is due to Mike Hibler <[e-mail]>.
  # We don't actually need to run this if we don't have putenv, but it
  # doesn't hurt.
! /bin/echo $ac_n "checking whether putenv uses malloc""... $ac_c" 1>&4
! if eval "test \"`/bin/echo '${'kb_cv_func_putenv_malloc'+set}'`\" = set"; then
!   /bin/echo $ac_n "(cached) $ac_c" 1>&4
  else
    if test "$cross_compiling" = yes; then
    kb_cv_func_putenv_malloc=no
***************
*** 1209,1215 ****
  fi
  rm -fr conftest*
  fi
! echo "$ac_t""$kb_cv_func_putenv_malloc" 1>&4
  if test $kb_cv_func_putenv_malloc = yes; then
    cat >> confdefs.h <<\EOF
  #define SMART_PUTENV 1
--- 1210,1216 ----
  fi
  rm -fr conftest*
  fi
! /bin/echo "$ac_t""$kb_cv_func_putenv_malloc" 1>&4
  if test $kb_cv_func_putenv_malloc = yes; then
    cat >> confdefs.h <<\EOF
  #define SMART_PUTENV 1
***************
*** 1222,1230 ****
  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.
--- 1223,1231 ----
  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 \"`/bin/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.
***************
*** 1242,1250 ****
  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
--- 1243,1251 ----
  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
***************
*** 1253,1261 ****

  # 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.
--- 1254,1262 ----

  # 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 \"`/bin/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.
***************
*** 1274,1282 ****
  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"
--- 1275,1283 ----
  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"
***************
*** 1285,1293 ****
    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 "
--- 1286,1294 ----
    flex*) ac_lib=fl ;;
    *) ac_lib=l ;;
    esac
!   /bin/echo $ac_n "checking for -l$ac_lib""... $ac_c" 1>&4
! if eval "test \"`/bin/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 "
***************
*** 1311,1349 ****
  LIBS="$ac_save_LIBS"

  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

! echo $ac_n "checking whether ln -s works""... $ac_c" 1>&4
! if eval "test \"`echo '${'ac_cv_prog_LN_S'+set}'`\" = set"; then
!   echo $ac_n "(cached) $ac_c" 1>&4
  else
    rm -f conftestdata
  if ln -s X conftestdata 2>/dev/null
  then
    rm -f conftestdata
!   ac_cv_prog_LN_S="ln -s"
  else
!   ac_cv_prog_LN_S=ln
  fi
  fi
  LN_S="$ac_cv_prog_LN_S"
! if test "$ac_cv_prog_LN_S" = "ln -s"; then
!   echo "$ac_t""yes" 1>&4
  else
!   echo "$ac_t""no" 1>&4
  fi


! 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 1350 "configure"
--- 1312,1350 ----
  LIBS="$ac_save_LIBS"

  fi
! if eval "test \"`/bin/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

! /bin/echo $ac_n "checking whether ln -s works""... $ac_c" 1>&4
! if eval "test \"`/bin/echo '${'ac_cv_prog_LN_S'+set}'`\" = set"; then
!   /bin/echo $ac_n "(cached) $ac_c" 1>&4
  else
    rm -f conftestdata
  if ln -s X conftestdata 2>/dev/null
  then
    rm -f conftestdata
!   ac_cv_prog_LN_S="cp -p"
  else
!   ac_cv_prog_LN_S="cp -p"
  fi
  fi
  LN_S="$ac_cv_prog_LN_S"
! if test "$ac_cv_prog_LN_S" = "cp -p"; then
!   /bin/echo "$ac_t""yes" 1>&4
  else
!   /bin/echo "$ac_t""no" 1>&4
  fi


! /bin/echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&4
! if eval "test \"`/bin/echo '${'ac_cv_type_signal'+set}'`\" = set"; then
!   /bin/echo $ac_n "(cached) $ac_c" 1>&4
  else
    cat > conftest.$ac_ext <<EOF
  #line 1350 "configure"
***************
*** 1369,1384 ****
  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 whether char is unsigned""... $ac_c" 1>&4
! if eval "test \"`echo '${'ac_cv_c_char_unsigned'+set}'`\" = set"; then
!   echo $ac_n "(cached) $ac_c" 1>&4
  else
    if test "$GCC" = yes; then
    # GCC predefines this symbol on systems where it applies.
--- 1370,1385 ----
  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 whether char is unsigned""... $ac_c" 1>&4
! if eval "test \"`/bin/echo '${'ac_cv_c_char_unsigned'+set}'`\" = set"; then
!   /bin/echo $ac_n "(cached) $ac_c" 1>&4
  else
    if test "$GCC" = yes; then
    # GCC predefines this symbol on systems where it applies.
***************
*** 1402,1408 ****

  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 1409 "configure"
--- 1403,1409 ----

  else
  if test "$cross_compiling" = yes; then
!     { /bin/echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
  else
  cat > conftest.$ac_ext <<EOF
  #line 1409 "configure"
***************
*** 1425,1431 ****
  rm -fr conftest*
  fi
  fi
! echo "$ac_t""$ac_cv_c_char_unsigned" 1>&4
  if test $ac_cv_c_char_unsigned = yes && test "$GCC" != yes; then
    cat >> confdefs.h <<\EOF
  #define __CHAR_UNSIGNED__ 1
--- 1426,1432 ----
  rm -fr conftest*
  fi
  fi
! /bin/echo "$ac_t""$ac_cv_c_char_unsigned" 1>&4
  if test $ac_cv_c_char_unsigned = yes && test "$GCC" != yes; then
    cat >> confdefs.h <<\EOF
  #define __CHAR_UNSIGNED__ 1
***************
*** 1433,1441 ****

  fi

! echo $ac_n "checking whether long int is 64 bits""... $ac_c" 1>&4
  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 1442 "configure"
--- 1434,1442 ----

  fi

! /bin/echo $ac_n "checking whether long int is 64 bits""... $ac_c" 1>&4
  if test "$cross_compiling" = yes; then
!     { /bin/echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
  else
  cat > conftest.$ac_ext <<EOF
  #line 1442 "configure"
***************
*** 1444,1466 ****
  EOF
  eval $ac_link
  if test -s conftest && (./conftest; exit) 2>/dev/null; then
!   echo "$ac_t""yes" 1>&4
   cat >> confdefs.h <<\EOF
  #define LONG_64_BITS 1
  EOF

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

! 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 1467 "configure"
--- 1445,1467 ----
  EOF
  eval $ac_link
  if test -s conftest && (./conftest; exit) 2>/dev/null; then
!   /bin/echo "$ac_t""yes" 1>&4
   cat >> confdefs.h <<\EOF
  #define LONG_64_BITS 1
  EOF

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

! /bin/echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&4
! if eval "test \"`/bin/echo '${'ac_cv_c_bigendian'+set}'`\" = set"; then
!   /bin/echo $ac_n "(cached) $ac_c" 1>&4
  else
    if test "$cross_compiling" = yes; then
!     { /bin/echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
  else
  cat > conftest.$ac_ext <<EOF
  #line 1467 "configure"
***************
*** 1485,1491 ****
  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
--- 1486,1492 ----
  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
***************
*** 1494,1524 ****
  fi


! if eval "test \"`echo '${'ac_cv_prog_lex_output_root'+set}'`\" = set"; then
!   echo $ac_n "(cached) $ac_c" 1>&4
  else
    # The minimal lex program is just a single line: %%.  But some broken lexes
  # (Solaris, I think it was) want two %% lines, so accommodate them.
! echo '%%
  %%' | $LEX
  if test -f lex.yy.c; then
    ac_cv_prog_lex_output_root=lex.yy
  elif test -f lexyy.c; then
    ac_cv_prog_lex_output_root=lexyy
  else
!   { echo "configure: error: cannot find output from $LEX, giving up" 1>&2; exit 1; }
  fi
  fi
  LEX_OUTPUT_ROOT=$ac_cv_prog_lex_output_root
! echo $ac_n "checking for yytext declaration""... $ac_c" 1>&4
! if eval "test \"`echo '${'ac_cv_prog_lex_yytext_pointer'+set}'`\" = set"; then
!   echo $ac_n "(cached) $ac_c" 1>&4
  else
    # POSIX says lex can declare yytext either as a pointer or an array; the
  # default is implementation-dependent. Figure out which it is, since
  # not all implementations provide the %pointer and %array declarations.
  ac_cv_prog_lex_yytext_pointer=no
! echo 'extern char *yytext;' >>$LEX_OUTPUT_ROOT.c
  ac_save_LIBS="$LIBS"
  LIBS="$LIBS $LEXLIB"
  cat > conftest.$ac_ext <<EOF
--- 1495,1525 ----
  fi


! if eval "test \"`/bin/echo '${'ac_cv_prog_lex_output_root'+set}'`\" = set"; then
!   /bin/echo $ac_n "(cached) $ac_c" 1>&4
  else
    # The minimal lex program is just a single line: %%.  But some broken lexes
  # (Solaris, I think it was) want two %% lines, so accommodate them.
! /bin/echo '%%
  %%' | $LEX
  if test -f lex.yy.c; then
    ac_cv_prog_lex_output_root=lex.yy
  elif test -f lexyy.c; then
    ac_cv_prog_lex_output_root=lexyy
  else
!   { /bin/echo "configure: error: cannot find output from $LEX, giving up" 1>&2; exit 1; }
  fi
  fi
  LEX_OUTPUT_ROOT=$ac_cv_prog_lex_output_root
! /bin/echo $ac_n "checking for yytext declaration""... $ac_c" 1>&4
! if eval "test \"`/bin/echo '${'ac_cv_prog_lex_yytext_pointer'+set}'`\" = set"; then
!   /bin/echo $ac_n "(cached) $ac_c" 1>&4
  else
    # POSIX says lex can declare yytext either as a pointer or an array; the
  # default is implementation-dependent. Figure out which it is, since
  # not all implementations provide the %pointer and %array declarations.
  ac_cv_prog_lex_yytext_pointer=no
! /bin/echo 'extern char *yytext;' >>$LEX_OUTPUT_ROOT.c
  ac_save_LIBS="$LIBS"
  LIBS="$LIBS $LEXLIB"
  cat > conftest.$ac_ext <<EOF
***************
*** 1539,1545 ****
  LIBS="$ac_save_LIBS"
  rm -f "${LEX_OUTPUT_ROOT}.c"
  fi
! echo "$ac_t""$ac_cv_prog_lex_yytext_pointer" 1>&4
  if test $ac_cv_prog_lex_yytext_pointer = yes; then
    cat >> confdefs.h <<\EOF
  #define YYTEXT_POINTER 1
--- 1540,1546 ----
  LIBS="$ac_save_LIBS"
  rm -f "${LEX_OUTPUT_ROOT}.c"
  fi
! /bin/echo "$ac_t""$ac_cv_prog_lex_yytext_pointer" 1>&4
  if test $ac_cv_prog_lex_yytext_pointer = yes; then
    cat >> confdefs.h <<\EOF
  #define YYTEXT_POINTER 1
***************
*** 1550,1556 ****



! echo $ac_n "checking for sunwindow libraries""... $ac_c" 1>&4
  cat > conftest.$ac_ext <<EOF
  #line 1556 "configure"
  #include "confdefs.h"
--- 1551,1557 ----



! /bin/echo $ac_n "checking for sunwindow libraries""... $ac_c" 1>&4
  cat > conftest.$ac_ext <<EOF
  #line 1556 "configure"
  #include "confdefs.h"
***************
*** 1570,1578 ****
  fi
  rm -f conftest*

! echo "$ac_t""$SUNWIN" 1>&4

! echo $ac_n "checking for xview libraries""... $ac_c" 1>&4
  cat > conftest.$ac_ext <<EOF
  #line 1578 "configure"
  #include "confdefs.h"
--- 1571,1579 ----
  fi
  rm -f conftest*

! /bin/echo "$ac_t""$SUNWIN" 1>&4

! /bin/echo $ac_n "checking for xview libraries""... $ac_c" 1>&4
  cat > conftest.$ac_ext <<EOF
  #line 1578 "configure"
  #include "confdefs.h"
***************
*** 1592,1600 ****
  fi
  rm -f conftest*

! echo "$ac_t""$XVIEWWIN" 1>&4

! echo $ac_n "checking for X11 libraries""... $ac_c" 1>&4
  cat > conftest.$ac_ext <<EOF
  #line 1600 "configure"
  #include "confdefs.h"
--- 1593,1601 ----
  fi
  rm -f conftest*

! /bin/echo "$ac_t""$XVIEWWIN" 1>&4

! /bin/echo $ac_n "checking for X11 libraries""... $ac_c" 1>&4
  cat > conftest.$ac_ext <<EOF
  #line 1600 "configure"
  #include "confdefs.h"
***************
*** 1607,1622 ****
  if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
    egrep "yes" >/dev/null 2>&1; then
    rm -rf conftest*
!   X11WIN=yes
  else
    rm -rf conftest*
    X11WIN=no
  fi
  rm -f conftest*

! echo "$ac_t""$X11WIN" 1>&4

! echo $ac_n "checking for X10 libraries""... $ac_c" 1>&4
  cat > conftest.$ac_ext <<EOF
  #line 1622 "configure"
  #include "confdefs.h"
--- 1608,1625 ----
  if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
    egrep "yes" >/dev/null 2>&1; then
    rm -rf conftest*
! #  Force off.  Gets set on AmigaDOS for some reason...
! #  X11WIN=yes
!   X11WIN=no
  else
    rm -rf conftest*
    X11WIN=no
  fi
  rm -f conftest*

! /bin/echo "$ac_t""$X11WIN" 1>&4

! /bin/echo $ac_n "checking for X10 libraries""... $ac_c" 1>&4
  cat > conftest.$ac_ext <<EOF
  #line 1622 "configure"
  #include "confdefs.h"
***************
*** 1636,1642 ****
  fi
  rm -f conftest*

! echo "$ac_t""$X10WIN" 1>&4

  if test $XVIEWWIN = yes; then
    wlibs="-lxview -lolgx -lX11 $wlibs"
--- 1639,1645 ----
  fi
  rm -f conftest*

! /bin/echo "$ac_t""$X10WIN" 1>&4

  if test $XVIEWWIN = yes; then
    wlibs="-lxview -lolgx -lX11 $wlibs"
***************
*** 1647,1653 ****
  # paths, otherwise set no_x=yes.
  # Uses ac_ vars as temps to allow command line to override cache and checks.
  # --without-x overrides everything else, but does not touch the cache.
! echo $ac_n "checking for X""... $ac_c" 1>&4

  # Check whether --with-x or --without-x was given.
  withval="$with_x"
--- 1650,1656 ----
  # paths, otherwise set no_x=yes.
  # Uses ac_ vars as temps to allow command line to override cache and checks.
  # --without-x overrides everything else, but does not touch the cache.
! /bin/echo $ac_n "checking for X""... $ac_c" 1>&4

  # Check whether --with-x or --without-x was given.
  withval="$with_x"
***************
*** 1661,1668 ****
    if test "x$x_includes" != xNONE && test "x$x_libraries" != xNONE; then
      no_x=
    else
! if eval "test \"`echo '${'ac_cv_path_x'+set}'`\" = set"; then
!   echo $ac_n "(cached) $ac_c" 1>&4
  else
    # One or both of the vars are not set, and there is no cached value.
  no_x=yes
--- 1664,1671 ----
    if test "x$x_includes" != xNONE && test "x$x_libraries" != xNONE; then
      no_x=
    else
! if eval "test \"`/bin/echo '${'ac_cv_path_x'+set}'`\" = set"; then
!   /bin/echo $ac_n "(cached) $ac_c" 1>&4
  else
    # One or both of the vars are not set, and there is no cached value.
  no_x=yes
***************
*** 1672,1678 ****
    # Make sure to not put "make" in the Imakefile rules, since we grep it out.
    cat > Imakefile <<'EOF'
  acfindx:
!     @echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"'
  EOF
    if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then
      no_x=
--- 1675,1681 ----
    # Make sure to not put "make" in the Imakefile rules, since we grep it out.
    cat > Imakefile <<'EOF'
  acfindx:
!     @/bin/echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"'
  EOF
    if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then
      no_x=
***************
*** 1684,1694 ****
        ac_im_usrlibdir=$ac_im_libdir
      fi
      case "$ac_im_incroot" in
!     /usr/include) ;;
      *) ac_x_includes="$ac_im_incroot" ;;
      esac
      case "$ac_im_usrlibdir" in
!     /usr/lib | /lib) ;;
      *) ac_x_libraries="$ac_im_usrlibdir" ;;
      esac
    fi
--- 1687,1697 ----
        ac_im_usrlibdir=$ac_im_libdir
      fi
      case "$ac_im_incroot" in
!     /gnu/include) ;;
      *) ac_x_includes="$ac_im_incroot" ;;
      esac
      case "$ac_im_usrlibdir" in
!     /gnu/lib | /lib) ;;
      *) ac_x_libraries="$ac_im_usrlibdir" ;;
      esac
    fi
***************
*** 1711,1753 ****
    rm -rf conftest*
    no_x= ac_x_includes=
  else
!   echo "$ac_err" >&5
    rm -rf conftest*
      for ac_dir in               \
!     /usr/X11R6/include        \
!     /usr/X11R5/include        \
!     /usr/X11R4/include        \
                                \
!     /usr/include/X11R6        \
!     /usr/include/X11R5        \
!     /usr/include/X11R4        \
                                \
!     /usr/local/X11R6/include  \
!     /usr/local/X11R5/include  \
!     /usr/local/X11R4/include  \
                                \
!     /usr/local/include/X11R6  \
!     /usr/local/include/X11R5  \
!     /usr/local/include/X11R4  \
                                \
!     /usr/X11/include          \
!     /usr/include/X11          \
!     /usr/local/X11/include    \
!     /usr/local/include/X11    \
                                \
!     /usr/X386/include         \
!     /usr/x386/include         \
!     /usr/XFree86/include/X11  \
                                \
!     /usr/include              \
!     /usr/local/include        \
!     /usr/unsupported/include  \
!     /usr/athena/include       \
!     /usr/local/x11r5/include  \
!     /usr/lpp/Xamples/include  \
                                \
!     /usr/openwin/include      \
!     /usr/openwin/share/include \
      ; \
    do
      if test -r "$ac_dir/$x_direct_test_include"; then
--- 1714,1756 ----
    rm -rf conftest*
    no_x= ac_x_includes=
  else
!   /bin/echo "$ac_err" >&5
    rm -rf conftest*
      for ac_dir in               \
!     /gnu/X11R6/include        \
!     /gnu/X11R5/include        \
!     /gnu/X11R4/include        \
                                \
!     /gnu/include/X11R6        \
!     /gnu/include/X11R5        \
!     /gnu/include/X11R4        \
                                \
!     /gnu/local/X11R6/include  \
!     /gnu/local/X11R5/include  \
!     /gnu/local/X11R4/include  \
                                \
!     /gnu/local/include/X11R6  \
!     /gnu/local/include/X11R5  \
!     /gnu/local/include/X11R4  \
                                \
!     /gnu/X11/include          \
!     /gnu/include/X11          \
!     /gnu/local/X11/include    \
!     /gnu/local/include/X11    \
                                \
!     /gnu/X386/include         \
!     /gnu/x386/include         \
!     /gnu/XFree86/include/X11  \
                                \
!     /gnu/include              \
!     /gnu/local/include        \
!     /gnu/unsupported/include  \
!     /gnu/athena/include       \
!     /gnu/local/x11r5/include  \
!     /gnu/lpp/Xamples/include  \
                                \
!     /gnu/openwin/include      \
!     /gnu/openwin/share/include \
      ; \
    do
      if test -r "$ac_dir/$x_direct_test_include"; then
***************
*** 1779,1819 ****
    rm -rf conftest*
    LIBS="$ac_save_LIBS"
  # First see if replacing the include by lib works.
! for ac_dir in `echo "$ac_x_includes" | sed s/include/lib/` \
!     /usr/X11R6/lib        \
!     /usr/X11R5/lib        \
!     /usr/X11R4/lib        \
                            \
!     /usr/lib/X11R6        \
!     /usr/lib/X11R5        \
!     /usr/lib/X11R4        \
                            \
!     /usr/local/X11R6/lib  \
!     /usr/local/X11R5/lib  \
!     /usr/local/X11R4/lib  \
                            \
!     /usr/local/lib/X11R6  \
!     /usr/local/lib/X11R5  \
!     /usr/local/lib/X11R4  \
                            \
!     /usr/X11/lib          \
!     /usr/lib/X11          \
!     /usr/local/X11/lib    \
!     /usr/local/lib/X11    \
                            \
!     /usr/X386/lib         \
!     /usr/x386/lib         \
!     /usr/XFree86/lib/X11  \
                            \
!     /usr/lib              \
!     /usr/local/lib        \
!     /usr/unsupported/lib  \
!     /usr/athena/lib       \
!     /usr/local/x11r5/lib  \
!     /usr/lpp/Xamples/lib  \
                            \
!     /usr/openwin/lib      \
!     /usr/openwin/share/lib \
      ; \
  do
    for ac_extension in a so sl; do
--- 1782,1822 ----
    rm -rf conftest*
    LIBS="$ac_save_LIBS"
  # First see if replacing the include by lib works.
! for ac_dir in `/bin/echo "$ac_x_includes" | sed s/include/lib/` \
!     /gnu/X11R6/lib        \
!     /gnu/X11R5/lib        \
!     /gnu/X11R4/lib        \
                            \
!     /gnu/lib/X11R6        \
!     /gnu/lib/X11R5        \
!     /gnu/lib/X11R4        \
                            \
!     /gnu/local/X11R6/lib  \
!     /gnu/local/X11R5/lib  \
!     /gnu/local/X11R4/lib  \
                            \
!     /gnu/local/lib/X11R6  \
!     /gnu/local/lib/X11R5  \
!     /gnu/local/lib/X11R4  \
                            \
!     /gnu/X11/lib          \
!     /gnu/lib/X11          \
!     /gnu/local/X11/lib    \
!     /gnu/local/lib/X11    \
                            \
!     /gnu/X386/lib         \
!     /gnu/x386/lib         \
!     /gnu/XFree86/lib/X11  \
                            \
!     /gnu/lib              \
!     /gnu/local/lib        \
!     /gnu/unsupported/lib  \
!     /gnu/athena/lib       \
!     /gnu/local/x11r5/lib  \
!     /gnu/lpp/Xamples/lib  \
                            \
!     /gnu/openwin/lib      \
!     /gnu/openwin/share/lib \
      ; \
  do
    for ac_extension in a so sl; do
***************
*** 1838,1849 ****
  fi # $with_x != no

  if test "$no_x" = yes; then
!   echo "$ac_t""no" 1>&4
  else
    test "x$x_includes" = xNONE && x_includes=$ac_x_includes
    test "x$x_libraries" = xNONE && x_libraries=$ac_x_libraries
    ac_cv_path_x="no_x= ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
!   echo "$ac_t""libraries $x_libraries, headers $x_includes" 1>&4
  fi

    if test "$no_x" = yes; then
--- 1841,1852 ----
  fi # $with_x != no

  if test "$no_x" = yes; then
!   /bin/echo "$ac_t""no" 1>&4
  else
    test "x$x_includes" = xNONE && x_includes=$ac_x_includes
    test "x$x_libraries" = xNONE && x_libraries=$ac_x_libraries
    ac_cv_path_x="no_x= ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
!   /bin/echo "$ac_t""libraries $x_libraries, headers $x_includes" 1>&4
  fi

    if test "$no_x" = yes; then
***************
*** 1875,1883 ****
    # These have to be linked with before -lX11, unlike the other
    # libraries we check for below, so use a different variable.
    #  [e-mail], [e-mail].
!   echo $ac_n "checking for -lICE""... $ac_c" 1>&4
! if eval "test \"`echo '${'ac_cv_lib_ICE'+set}'`\" = set"; then
!   echo $ac_n "(cached) $ac_c" 1>&4
  else
    ac_save_LIBS="$LIBS"
  LIBS="$LIBS -lICE "
--- 1878,1886 ----
    # These have to be linked with before -lX11, unlike the other
    # libraries we check for below, so use a different variable.
    #  [e-mail], [e-mail].
!   /bin/echo $ac_n "checking for -lICE""... $ac_c" 1>&4
! if eval "test \"`/bin/echo '${'ac_cv_lib_ICE'+set}'`\" = set"; then
!   /bin/echo $ac_n "(cached) $ac_c" 1>&4
  else
    ac_save_LIBS="$LIBS"
  LIBS="$LIBS -lICE "
***************
*** 1901,1911 ****
  LIBS="$ac_save_LIBS"

  fi
! if eval "test \"`echo '$ac_cv_lib_'ICE`\" = yes"; then
!   echo "$ac_t""yes" 1>&4
    X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
  else
!   echo "$ac_t""no" 1>&4
  fi

    LDFLAGS="$ac_save_LDFLAGS"
--- 1904,1914 ----
  LIBS="$ac_save_LIBS"

  fi
! if eval "test \"`/bin/echo '$ac_cv_lib_'ICE`\" = yes"; then
!   /bin/echo "$ac_t""yes" 1>&4
    X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
  else
!   /bin/echo "$ac_t""no" 1>&4
  fi

    LDFLAGS="$ac_save_LDFLAGS"
***************
*** 1918,1926 ****
      # [e-mail] says this is needed for Ultrix, if the X
      # libraries were built with DECnet support.  And [e-mail] says
      # the Alpha needs dnet_stub (dnet does not exist).
!     echo $ac_n "checking for -ldnet""... $ac_c" 1>&4
! if eval "test \"`echo '${'ac_cv_lib_dnet'+set}'`\" = set"; then
!   echo $ac_n "(cached) $ac_c" 1>&4
  else
    ac_save_LIBS="$LIBS"
  LIBS="$LIBS -ldnet "
--- 1921,1929 ----
      # [e-mail] says this is needed for Ultrix, if the X
      # libraries were built with DECnet support.  And [e-mail] says
      # the Alpha needs dnet_stub (dnet does not exist).
!     /bin/echo $ac_n "checking for -ldnet""... $ac_c" 1>&4
! if eval "test \"`/bin/echo '${'ac_cv_lib_dnet'+set}'`\" = set"; then
!   /bin/echo $ac_n "(cached) $ac_c" 1>&4
  else
    ac_save_LIBS="$LIBS"
  LIBS="$LIBS -ldnet "
***************
*** 1944,1960 ****
  LIBS="$ac_save_LIBS"

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

      if test $ac_cv_lib_dnet = no; then
!       echo $ac_n "checking for -ldnet_stub""... $ac_c" 1>&4
! if eval "test \"`echo '${'ac_cv_lib_dnet_stub'+set}'`\" = set"; then
!   echo $ac_n "(cached) $ac_c" 1>&4
  else
    ac_save_LIBS="$LIBS"
  LIBS="$LIBS -ldnet_stub "
--- 1947,1963 ----
  LIBS="$ac_save_LIBS"

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

      if test $ac_cv_lib_dnet = no; then
!       /bin/echo $ac_n "checking for -ldnet_stub""... $ac_c" 1>&4
! if eval "test \"`/bin/echo '${'ac_cv_lib_dnet_stub'+set}'`\" = set"; then
!   /bin/echo $ac_n "(cached) $ac_c" 1>&4
  else
    ac_save_LIBS="$LIBS"
  LIBS="$LIBS -ldnet_stub "
***************
*** 1978,1988 ****
  LIBS="$ac_save_LIBS"

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

      fi
--- 1981,1991 ----
  LIBS="$ac_save_LIBS"

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

      fi
***************
*** 1991,1999 ****
      # to get the SysV transport functions.
      # Not sure which flavor of 386 UNIX this is, but it seems harmless to
      # check for it.
!     echo $ac_n "checking for -lnsl""... $ac_c" 1>&4
! if eval "test \"`echo '${'ac_cv_lib_nsl'+set}'`\" = set"; then
!   echo $ac_n "(cached) $ac_c" 1>&4
  else
    ac_save_LIBS="$LIBS"
  LIBS="$LIBS -lnsl "
--- 1994,2002 ----
      # to get the SysV transport functions.
      # Not sure which flavor of 386 UNIX this is, but it seems harmless to
      # check for it.
!     /bin/echo $ac_n "checking for -lnsl""... $ac_c" 1>&4
! if eval "test \"`/bin/echo '${'ac_cv_lib_nsl'+set}'`\" = set"; then
!   /bin/echo $ac_n "(cached) $ac_c" 1>&4
  else
    ac_save_LIBS="$LIBS"
  LIBS="$LIBS -lnsl "
***************
*** 2017,2027 ****
  LIBS="$ac_save_LIBS"

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


--- 2020,2030 ----
  LIBS="$ac_save_LIBS"

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


***************
*** 2029,2037 ****
      # socket/setsockopt and other routines are undefined under SCO ODT 2.0.
      # But -lsocket is broken on IRIX, according to [e-mail].
      if test "`(uname) 2>/dev/null`" != IRIX; then
!       echo $ac_n "checking for -lsocket""... $ac_c" 1>&4
! if eval "test \"`echo '${'ac_cv_lib_socket'+set}'`\" = set"; then
!   echo $ac_n "(cached) $ac_c" 1>&4
  else
    ac_save_LIBS="$LIBS"
  LIBS="$LIBS -lsocket "
--- 2032,2040 ----
      # socket/setsockopt and other routines are undefined under SCO ODT 2.0.
      # But -lsocket is broken on IRIX, according to [e-mail].
      if test "`(uname) 2>/dev/null`" != IRIX; then
!       /bin/echo $ac_n "checking for -lsocket""... $ac_c" 1>&4
! if eval "test \"`/bin/echo '${'ac_cv_lib_socket'+set}'`\" = set"; then
!   /bin/echo $ac_n "(cached) $ac_c" 1>&4
  else
    ac_save_LIBS="$LIBS"
  LIBS="$LIBS -lsocket "
***************
*** 2055,2065 ****
  LIBS="$ac_save_LIBS"

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

      fi
--- 2058,2068 ----
  LIBS="$ac_save_LIBS"

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

      fi
***************
*** 2078,2084 ****
  fi


! echo $ac_n "checking for small TeX""... $ac_c" 1>&4
  cat > conftest.$ac_ext <<EOF
  #line 2084 "configure"
  #include "confdefs.h"
--- 2081,2087 ----
  fi


! /bin/echo $ac_n "checking for small TeX""... $ac_c" 1>&4
  cat > conftest.$ac_ext <<EOF
  #line 2084 "configure"
  #include "confdefs.h"
***************
*** 2098,2104 ****
  fi
  rm -f conftest*

! echo "$ac_t""$SMALLTeX" 1>&4
  if test $SMALLTeX = yes; then
    (cd $srcdir/tex && rm -f ctex.ch && sed -f small.sed <tex.ch >ctex.ch)
    cat >> confdefs.h <<\EOF
--- 2101,2107 ----
  fi
  rm -f conftest*

! /bin/echo "$ac_t""$SMALLTeX" 1>&4
  if test $SMALLTeX = yes; then
    (cd $srcdir/tex && rm -f ctex.ch && sed -f small.sed <tex.ch >ctex.ch)
    cat >> confdefs.h <<\EOF
***************
*** 2107,2113 ****

  fi

! echo $ac_n "checking for small MF""... $ac_c" 1>&4
  cat > conftest.$ac_ext <<EOF
  #line 2113 "configure"
  #include "confdefs.h"
--- 2110,2116 ----

  fi

! /bin/echo $ac_n "checking for small MF""... $ac_c" 1>&4
  cat > conftest.$ac_ext <<EOF
  #line 2113 "configure"
  #include "confdefs.h"
***************
*** 2127,2138 ****
  fi
  rm -f conftest*

! echo "$ac_t""$SMALLMF" 1>&4
  if test $SMALLMF = yes; then
    (cd $srcdir/mf && rm -f cmf.ch && sed -f small.sed <mf.ch >cmf.ch)
  fi

! echo $ac_n "checking for small BibTeX""... $ac_c" 1>&4
  cat > conftest.$ac_ext <<EOF
  #line 2138 "configure"
  #include "confdefs.h"
--- 2130,2141 ----
  fi
  rm -f conftest*

! /bin/echo "$ac_t""$SMALLMF" 1>&4
  if test $SMALLMF = yes; then
    (cd $srcdir/mf && rm -f cmf.ch && sed -f small.sed <mf.ch >cmf.ch)
  fi

! /bin/echo $ac_n "checking for small BibTeX""... $ac_c" 1>&4
  cat > conftest.$ac_ext <<EOF
  #line 2138 "configure"
  #include "confdefs.h"
***************
*** 2152,2158 ****
  fi
  rm -f conftest*

! echo "$ac_t""$SMALLBibTeX" 1>&4
  if test $SMALLBibTeX = yes; then
    (cd $srcdir/bibtex \
     && rm -f cbibtex.ch && sed -f small.sed <bibtex.ch >cbibtex.ch)
--- 2155,2161 ----
  fi
  rm -f conftest*

! /bin/echo "$ac_t""$SMALLBibTeX" 1>&4
  if test $SMALLBibTeX = yes; then
    (cd $srcdir/bibtex \
     && rm -f cbibtex.ch && sed -f small.sed <bibtex.ch >cbibtex.ch)
***************
*** 2160,2166 ****

  trap '' 1 2 15
  if test -w $cache_file; then
! echo "updating cache $cache_file"
  cat > $cache_file <<\EOF
  # This file is a shell script that caches the results of configure
  # tests run on this system so they can be shared between configure
--- 2163,2169 ----

  trap '' 1 2 15
  if test -w $cache_file; then
! /bin/echo "updating cache $cache_file"
  cat > $cache_file <<\EOF
  # This file is a shell script that caches the results of configure
  # tests run on this system so they can be shared between configure
***************
*** 2178,2188 ****
  #
  EOF
  # Ultrix sh set writes to stderr and can't be redirected directly.
  (set) 2>&1 |
!   sed -n "s/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/: \${\1='\2'}/p" \
!   >> $cache_file
  else
! echo "not updating unwritable cache $cache_file"
  fi

  trap 'rm -fr conftest* confdefs* core $ac_clean_files; exit 1' 1 2 15
--- 2181,2194 ----
  #
  EOF
  # Ultrix sh set writes to stderr and can't be redirected directly.
+ # On AmigaDOS, the {} chars get eaten, so add them back with separate
+ # sed commands.
  (set) 2>&1 |
!   sed -n "s/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/: \${\1='\2'}/p" |
!   sed "s@\\\$@\${@" |
!   sed "s@\$@}@" >> $cache_file
  else
! /bin/echo "not updating unwritable cache $cache_file"
  fi

  trap 'rm -fr conftest* confdefs* core $ac_clean_files; exit 1' 1 2 15
***************
*** 2205,2211 ****
  # Without the "./", some shells look in PATH for config.status.
  : ${CONFIG_STATUS=./config.status}

! echo creating $CONFIG_STATUS
  rm -f $CONFIG_STATUS
  cat > $CONFIG_STATUS <<EOF
  #!/bin/sh
--- 2211,2217 ----
  # Without the "./", some shells look in PATH for config.status.
  : ${CONFIG_STATUS=./config.status}

! /bin/echo creating $CONFIG_STATUS
  rm -f $CONFIG_STATUS
  cat > $CONFIG_STATUS <<EOF
  #!/bin/sh
***************
*** 2224,2237 ****
  do
    case "\$ac_option" in
    -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
!     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 ;;
!   *) echo "\$ac_cs_usage"; exit 1 ;;
    esac
  done

--- 2230,2243 ----
  do
    case "\$ac_option" in
    -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
!     /bin/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)
!     /bin/echo "\$ac_cs_usage"; exit 0 ;;
!   *) /bin/echo "\$ac_cs_usage"; exit 1 ;;
    esac
  done

***************
*** 2285,2305 ****
  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
--- 2291,2311 ----
  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
***************
*** 2307,2313 ****
    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"
--- 2313,2319 ----
    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"
***************
*** 2318,2326 ****
    [/$]*) INSTALL="$ac_given_INSTALL" ;;
    *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
    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" ;;
--- 2324,2332 ----
    [/$]*) INSTALL="$ac_given_INSTALL" ;;
    *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
    esac
!   /bin/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" ;;
***************
*** 2333,2346 ****
    # getline or system. (Anyway, configure scripts aren't supposed to use awk.)
    # Use \@...@<cmd> form of sed address because the filename may contain /.
    # Can't use only one -e and commands {dr foo} because foo has to be last.
!   # Use @e initially instead of -e because GNU echo has a -e option.
    # USe `X' to mean a bunch of backslashes; this is for FreeBSD.
    file_substs=`sed -n \
  "/^ac_include/s%ac_include[     ]*\(.*\)%@e 'X@^&@r \1' -e 'X@^&@d'%p" \
                 $ac_given_srcdir/${ac_file}.in`
    if test -n "$file_substs"; then
      # Change @e back to -e and X@^ to \@^.
!     file_subst_cmd="sed `echo $file_substs \
                           | sed -e 's/@e/-e/g' -e 's/X@^/\\\\\@^/g'`"
    else
      # If no substitutions and hence no sed commands, don't choke.
--- 2339,2352 ----
    # getline or system. (Anyway, configure scripts aren't supposed to use awk.)
    # Use \@...@<cmd> form of sed address because the filename may contain /.
    # Can't use only one -e and commands {dr foo} because foo has to be last.
!   # Use @e initially instead of -e because GNU /bin/echo has a -e option.
    # USe `X' to mean a bunch of backslashes; this is for FreeBSD.
    file_substs=`sed -n \
  "/^ac_include/s%ac_include[     ]*\(.*\)%@e 'X@^&@r \1' -e 'X@^&@d'%p" \
                 $ac_given_srcdir/${ac_file}.in`
    if test -n "$file_substs"; then
      # Change @e back to -e and X@^ to \@^.
!     file_subst_cmd="sed `/bin/echo $file_substs \
                           | sed -e 's/@e/-e/g' -e 's/X@^/\\\\\@^/g'`"
    else
      # If no substitutions and hence no sed commands, don't choke.
***************
*** 2383,2394 ****
  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

!   echo creating $ac_file

    rm -f conftest.frag conftest.in conftest.out
    cp $ac_given_srcdir/$ac_file_in conftest.in
--- 2389,2400 ----
  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

!   /bin/echo creating $ac_file

    rm -f conftest.frag conftest.in conftest.out
    cp $ac_given_srcdir/$ac_file_in conftest.in
***************
*** 2429,2437 ****
    # grep -c gives empty output for an empty file on some AIX systems.
    if test -z "$ac_lines" || test "$ac_lines" -eq 0; then break; fi
    # Write a limited-size here document to conftest.frag.
!   echo '  cat > conftest.frag <<CEOF' >> $CONFIG_STATUS
    sed ${ac_max_here_lines}q conftest.vals >> $CONFIG_STATUS
!   echo 'CEOF
    sed -f conftest.frag conftest.in > conftest.out
    rm -f conftest.in
    mv conftest.out conftest.in
--- 2435,2443 ----
    # grep -c gives empty output for an empty file on some AIX systems.
    if test -z "$ac_lines" || test "$ac_lines" -eq 0; then break; fi
    # Write a limited-size here document to conftest.frag.
!   /bin/echo '  cat > conftest.frag <<CEOF' >> $CONFIG_STATUS
    sed ${ac_max_here_lines}q conftest.vals >> $CONFIG_STATUS
!   /bin/echo 'CEOF
    sed -f conftest.frag conftest.in > conftest.out
    rm -f conftest.in
    mv conftest.out conftest.in
***************
*** 2444,2454 ****

  cat >> $CONFIG_STATUS <<\EOF
    rm -f conftest.frag conftest.h
!   echo "/* $ac_file.  Generated automatically by configure.  */" > conftest.h
    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
--- 2450,2460 ----

  cat >> $CONFIG_STATUS <<\EOF
    rm -f conftest.frag conftest.h
!   /bin/echo "/* $ac_file.  Generated automatically by configure.  */" > conftest.h
    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 unixtex-6.1b-base/web2c/dviutil/Makefile.in unixtex-6.1b/web2c/dviutil/Makefile.in
*** unixtex-6.1b-base/web2c/dviutil/Makefile.in    Thu Feb  3 12:48:32 1994
--- unixtex-6.1b/web2c/dviutil/Makefile.in    Sun Apr  2 21:43:44 1995
***************
*** 18,25 ****
  program = dvicopy dvitype

  CC = @CC@
! CFLAGS = -g
! CPPFLAGS = -I$(srcdir)/../lib -I../..

  CCLD = $(CC)
  LDFLAGS = $(CFLAGS) $(XLDFLAGS)
--- 18,25 ----
  program = dvicopy dvitype

  CC = @CC@
! CFLAGS =
! CPPFLAGS = -I../lib -I$(srcdir)/../lib -I../.. -I$(srcdir)/../..

  CCLD = $(CC)
  LDFLAGS = $(CFLAGS) $(XLDFLAGS)
***************
*** 33,43 ****
  .SUFFIXES:
  .SUFFIXES: .o .c .p .ch
  .p.c:
!     $(SHELL) $(srcdir)/../lib/convert $*.p $*.c
  .ch.p:
!     ../web/tangle $*.web $*.ch
  .c.o:
!     $(CC) $(CPPFLAGS) $(CFLAGS) -c $*.c


  default: all
--- 33,45 ----
  .SUFFIXES:
  .SUFFIXES: .o .c .p .ch
  .p.c:
!     $(SHELL) $(srcdir)/../lib/convert $< $*.c $(srcdir)
  .ch.p:
!     ../web/tangle $(srcdir)/$*.web $<
!     cp $(srcdir)/$*.p $*.p
!     rm -f $(srcdir)/$*.p
  .c.o:
!     $(CC) $(CPPFLAGS) $(CFLAGS) -c $<


  default: all
diff -rc --new-file unixtex-6.1b-base/web2c/fontutil/Makefile.in unixtex-6.1b/web2c/fontutil/Makefile.in
*** unixtex-6.1b-base/web2c/fontutil/Makefile.in    Thu Feb  3 12:48:32 1994
--- unixtex-6.1b/web2c/fontutil/Makefile.in    Sun Apr  2 21:43:56 1995
***************
*** 18,25 ****
  program = gftodvi gftopk mft pktogf pktype vftovp vptovf gftype pltotf tftopl

  CC = @CC@
! CFLAGS = -g
! CPPFLAGS = -I$(srcdir)/../lib -I../..

  CCLD = $(CC)
  LDFLAGS = $(CFLAGS) $(XLDFLAGS)
--- 18,25 ----
  program = gftodvi gftopk mft pktogf pktype vftovp vptovf gftype pltotf tftopl

  CC = @CC@
! CFLAGS =
! CPPFLAGS = -I../lib -I$(srcdir)/../lib -I../.. -I$(srcdir)/../.. -I. -I$(srcdir)

  CCLD = $(CC)
  LDFLAGS = $(CFLAGS) $(XLDFLAGS)
***************
*** 33,43 ****
  .SUFFIXES:
  .SUFFIXES: .o .c .p .ch
  .p.c:
!     $(SHELL) $(srcdir)/../lib/convert $*.p $*.c
  .ch.p:
!     ../web/tangle $*.web $*.ch
  .c.o:
!     $(CC) $(CPPFLAGS) $(CFLAGS) -c $*.c


  default: all
--- 33,45 ----
  .SUFFIXES:
  .SUFFIXES: .o .c .p .ch
  .p.c:
!     $(SHELL) $(srcdir)/../lib/convert $< $*.c $(srcdir)
  .ch.p:
!     ../web/tangle $(srcdir)/$*.web $<
!     cp $(srcdir)/$*.p $*.p
!     rm -f $(srcdir)/$*.p
  .c.o:
!     $(CC) $(CPPFLAGS) $(CFLAGS) -c $<


  default: all
diff -rc --new-file unixtex-6.1b-base/web2c/lib/Makefile.in unixtex-6.1b/web2c/lib/Makefile.in
*** unixtex-6.1b-base/web2c/lib/Makefile.in    Thu Feb  3 12:48:34 1994
--- unixtex-6.1b/web2c/lib/Makefile.in    Sun Apr  2 19:44:56 1995
***************
*** 7,14 ****
  # Unlike all other directories, we need @DEFS@ here because we need
  # -DHAVE_CONFIG_H to compile getopt.
  CC = @CC@
! CFLAGS = -g
! CPPFLAGS = @DEFS@ -I../lib -I../..

  AR = ar
  ARFLAGS = cq
--- 7,14 ----
  # Unlike all other directories, we need @DEFS@ here because we need
  # -DHAVE_CONFIG_H to compile getopt.
  CC = @CC@
! CFLAGS =
! CPPFLAGS = @DEFS@ -I../lib -I../.. -I$(srcdir)/../..

  AR = ar
  ARFLAGS = cq
***************
*** 40,46 ****
  # Do not use CPPFLAGS for this, because including "config.h" might
  # result in a conflicting decl of xmalloc. How annoying.
  alloca.o: alloca.c
!     $(CC) $(CFLAGS) -c alloca.c

  Makefile: Makefile.in ../config.status
      cd ..; $(SHELL) config.status
--- 40,46 ----
  # Do not use CPPFLAGS for this, because including "config.h" might
  # result in a conflicting decl of xmalloc. How annoying.
  alloca.o: alloca.c
!     $(CC) $(CFLAGS) -c $(srcdir)/alloca.c

  Makefile: Makefile.in ../config.status
      cd ..; $(SHELL) config.status
diff -rc --new-file unixtex-6.1b-base/web2c/lib/c-auto.h.in unixtex-6.1b/web2c/lib/c-auto.h.in
*** unixtex-6.1b-base/web2c/lib/c-auto.h.in    Sun Apr  2 06:05:56 1995
--- unixtex-6.1b/web2c/lib/c-auto.h.in    Mon Apr  3 22:05:28 1995
***************
*** 59,66 ****
  #ifndef X10WIN
  #undef X10WIN        /* X Version 10 */
  #endif
! #ifndef NO_X11WIN
! #define X11WIN        /* X Version 11 */
  #endif

  /* Define these to true invoke MakeTeX{TeX,MF,TFM} scripts by default
--- 59,66 ----
  #ifndef X10WIN
  #undef X10WIN        /* X Version 10 */
  #endif
! #ifndef X11WIN
! #undef X11WIN        /* X Version 11 */
  #endif

  /* Define these to true invoke MakeTeX{TeX,MF,TFM} scripts by default
diff -rc --new-file unixtex-6.1b-base/web2c/lib/convert unixtex-6.1b/web2c/lib/convert
*** unixtex-6.1b-base/web2c/lib/convert    Sun May  9 17:32:34 1993
--- unixtex-6.1b/web2c/lib/convert    Sun Apr  2 18:43:42 1995
***************
*** 3,15 ****
  #
  # $1 is the Pascal file to be converted.
  # $2 is the C file to be created.
! # $3, if present, is extended with .h, and #included in the C file, and
  # extended with .defines, and prepended along with the common
  # definitions.

  pascalfile=$1
  basefile=`basename $1 .p`
  cfile=$2

  # We use cpascal.h instead of config.h because getopt.c and perhaps
  # other straight C routines don't need or want the Pascal definitions of
--- 3,17 ----
  #
  # $1 is the Pascal file to be converted.
  # $2 is the C file to be created.
! # $3 is the source directory, which might not be '.'
! # $4, if present, is extended with .h, and #included in the C file, and
  # extended with .defines, and prepended along with the common
  # definitions.

  pascalfile=$1
  basefile=`basename $1 .p`
  cfile=$2
+ srcdir=$3

  # We use cpascal.h instead of config.h because getopt.c and perhaps
  # other straight C routines don't need or want the Pascal definitions of
***************
*** 17,28 ****
  hfile=cpascal.h
  defnfile=

! if test $# -eq 3; then
!   hfile=$3.h
!   defnfile=$3.defines
  fi

! cat ../lib/common.defines $defnfile $pascalfile \
      | ../web2c/web2c -h$hfile -c$basefile \
      | ../web2c/fixwrites $basefile > $cfile

--- 19,30 ----
  hfile=cpascal.h
  defnfile=

! if test $# -eq 4; then
!   hfile=$4.h
!   defnfile=$4.defines
  fi

! cat $srcdir/../lib/common.defines $defnfile $pascalfile \
      | ../web2c/web2c -h$hfile -c$basefile \
      | ../web2c/fixwrites $basefile > $cfile

diff -rc --new-file unixtex-6.1b-base/web2c/lib/openinout.c unixtex-6.1b/web2c/lib/openinout.c
*** unixtex-6.1b-base/web2c/lib/openinout.c    Sun Apr  2 06:05:58 1995
--- unixtex-6.1b/web2c/lib/openinout.c    Sun Apr  2 21:14:26 1995
***************
*** 8,15 ****

  #ifdef BibTeX
  /* See comments in bibtex.ch for why we need these.  */
! FILE *standardinput = stdin;
! FILE *standardoutput = stdout;

  /* Because we don't generate a .h file with all the global definitions
     for BibTeX, as we do with TeX and Metafont, we must declare these
--- 8,15 ----

  #ifdef BibTeX
  /* See comments in bibtex.ch for why we need these.  */
! FILE *standardinput /* = stdin */;
! FILE *standardoutput /* = stdout */;

  /* Because we don't generate a .h file with all the global definitions
     for BibTeX, as we do with TeX and Metafont, we must declare these
diff -rc --new-file unixtex-6.1b-base/web2c/lib/texmf.c unixtex-6.1b/web2c/lib/texmf.c
*** unixtex-6.1b-base/web2c/lib/texmf.c    Sun Apr  2 06:05:58 1995
--- unixtex-6.1b/web2c/lib/texmf.c    Mon Apr  3 22:44:30 1995
***************
*** 62,68 ****
  /* The entry point: set up for reading the command line, which will
     happen in `topenin', then call the main body.  */

! void
  main (ac, av)
      int ac;
      char *av[];
--- 62,68 ----
  /* The entry point: set up for reading the command line, which will
     happen in `topenin', then call the main body.  */

! int
  main (ac, av)
      int ac;
      char *av[];
diff -rc --new-file unixtex-6.1b-base/web2c/man/Makefile.in unixtex-6.1b/web2c/man/Makefile.in
*** unixtex-6.1b-base/web2c/man/Makefile.in    Thu Feb  3 12:48:34 1994
--- unixtex-6.1b/web2c/man/Makefile.in    Sun Apr  2 21:14:26 1995
***************
*** 127,139 ****
  # The edited file always has extension .1; we change it when we install.
  .SUFFIXES: .man .1 .txt .ps .dvi
  .man.1:
!     sed -f sedscript $*.man >$@
  .1.dvi:
!     $(DITROFF) -Tdvi -man $*.1 >$@
  .1.ps:
!     $(DITROFF) -Tps -man $*.1 >$@
  .1.txt:
!     $(DITROFF) -Tascii -man $*.1 | col -b | expand >$@

  all: $(manfiles)
  .PHONY: dw
--- 127,139 ----
  # The edited file always has extension .1; we change it when we install.
  .SUFFIXES: .man .1 .txt .ps .dvi
  .man.1:
!     sed -f sedscript $(srcdir)/$*.man >$@
  .1.dvi:
!     $(DITROFF) -Tdvi -man $(srcdir)/$*.1 >$@
  .1.ps:
!     $(DITROFF) -Tps -man $(srcdir)/$*.1 >$@
  .1.txt:
!     $(DITROFF) -Tascii -man $(srcdir)/$*.1 | col -b | expand >$@

  all: $(manfiles)
  .PHONY: dw
diff -rc --new-file unixtex-6.1b-base/web2c/mf/MFwindow/Makefile.in unixtex-6.1b/web2c/mf/MFwindow/Makefile.in
*** unixtex-6.1b-base/web2c/mf/MFwindow/Makefile.in    Thu Feb  3 12:48:38 1994
--- unixtex-6.1b/web2c/mf/MFwindow/Makefile.in    Sun Apr  2 20:25:06 1995
***************
*** 14,20 ****
  CC = @CC@
  CFLAGS = -g
  # We need `-I.' for mfd.h (when compiling the files from ../lib).
! CPPFLAGS = -I$(srcdir)/../../lib -I../../.. -I. $(x_include_flags)

  LN = @LN_S@
  RANLIB = @RANLIB@
--- 14,20 ----
  CC = @CC@
  CFLAGS = -g
  # We need `-I.' for mfd.h (when compiling the files from ../lib).
! CPPFLAGS = -I../../lib -I$(srcdir)/../../lib -I../../.. -I$(srcdir)/../../.. -I. -I$(srcdir) $(x_include_flags)

  LN = @LN_S@
  RANLIB = @RANLIB@
***************
*** 29,35 ****
  .SUFFIXES:
  .SUFFIXES: .o .c
  .c.o:
!     $(CC) $(CPPFLAGS) $(CFLAGS) -c $*.c


  default: all
--- 29,35 ----
  .SUFFIXES:
  .SUFFIXES: .o .c
  .c.o:
!     $(CC) $(CPPFLAGS) $(CFLAGS) -c $<


  default: all
diff -rc --new-file unixtex-6.1b-base/web2c/mf/Makefile.in unixtex-6.1b/web2c/mf/Makefile.in
*** unixtex-6.1b-base/web2c/mf/Makefile.in    Sun Apr  2 06:05:58 1995
--- unixtex-6.1b/web2c/mf/Makefile.in    Mon Apr  3 19:59:32 1995
***************
*** 35,42 ****
  program = inimf virmf

  CC = @CC@
! CFLAGS = -g
! CPPFLAGS = -DMF -I$(srcdir)/../lib -I../..

  CCLD = $(CC)
  RANLIB = @RANLIB@
--- 35,42 ----
  program = inimf virmf

  CC = @CC@
! CFLAGS =
! CPPFLAGS = -DMF -I../lib -I$(srcdir)/../lib -I../.. -I$(srcdir)/../..

  CCLD = $(CC)
  RANLIB = @RANLIB@
***************
*** 66,72 ****
  localmodes = modes.mf

  # And how to make them.
! inimf = MFPOOL=. ./inimf


  # What to pass to submakes.
--- 66,74 ----
  localmodes = modes.mf

  # And how to make them.
! #inimf = MFPOOL=$(srcdir) ./inimf
! # For AmigaDOS, do this:
! inimf = echo "$(srcdir)" >env:MFPOOL; ./inimf


  # What to pass to submakes.
***************
*** 77,83 ****
  .SUFFIXES:
  .SUFFIXES: .o .c
  .c.o:
!     $(CC) $(CPPFLAGS) $(CFLAGS) -c $*.c


  default: all
--- 79,85 ----
  .SUFFIXES:
  .SUFFIXES: .o .c
  .c.o:
!     $(CC) $(CPPFLAGS) $(CFLAGS) -c $<


  default: all
***************
*** 145,151 ****
            rm -f mfd.h*; else mv mfd.h.bak mfd.h; fi

  mf.p mf.pool: mf.web cmf.ch
!     ../web/tangle mf.web cmf.ch

  cmf.ch: $(mfsrcdir)/mf.ch
      rm -f cmf.ch
--- 147,156 ----
            rm -f mfd.h*; else mv mfd.h.bak mfd.h; fi

  mf.p mf.pool: mf.web cmf.ch
!     ../web/tangle $(srcdir)/mf.web cmf.ch
!     cp $(srcdir)/mf.p mf.p
!     cp $(srcdir)/mf.pool mf.pool
!     rm -f $(srcdir)/mf.p $(srcdir)/mf.pool

  cmf.ch: $(mfsrcdir)/mf.ch
      rm -f cmf.ch
***************
*** 154,160 ****
  # The convert script produces the following files:
  mf0.c mf1.c mf2.c mf3.c mf4.c mf5.c mf6.c mf7.c mf8.c mf9.c \
  imf.c coerce.h mfd.h: mf.p coerce.add $(commondefines)
!     $(SHELL) $(mfsrcdir)/convert
      touch mfd.h

  # The (hand-coded) file $(extrac) and the (generated) file itex.c have
--- 159,165 ----
  # The convert script produces the following files:
  mf0.c mf1.c mf2.c mf3.c mf4.c mf5.c mf6.c mf7.c mf8.c mf9.c \
  imf.c coerce.h mfd.h: mf.p coerce.add $(commondefines)
!     $(SHELL) $(mfsrcdir)/convert $(srcdir)
      touch mfd.h

  # The (hand-coded) file $(extrac) and the (generated) file itex.c have
diff -rc --new-file unixtex-6.1b-base/web2c/mf/convert unixtex-6.1b/web2c/mf/convert
*** unixtex-6.1b-base/web2c/mf/convert    Sat Dec 11 18:23:44 1993
--- unixtex-6.1b/web2c/mf/convert    Sun Apr  2 19:58:08 1995
***************
*** 1,6 ****
  #!/bin/sh
  # Convert Metafont to C.
!
  sed=sed

  $sed -e '
--- 1,6 ----
  #!/bin/sh
  # Convert Metafont to C.
! srcdir=$1
  sed=sed

  $sed -e '
***************
*** 13,19 ****
      }
      s/\.hh/.hhfield/g
      s/\.lh/.lhfield/g
! ' ../lib/common.defines ../lib/texmf.defines mf.p \
      | ../web2c/web2c -htexmf.h -m \
      | $sed -e '
          s/else write/else\
--- 13,19 ----
      }
      s/\.hh/.hhfield/g
      s/\.lh/.lhfield/g
! ' $srcdir/../lib/common.defines $srcdir/../lib/texmf.defines mf.p \
      | ../web2c/web2c -htexmf.h -m \
      | $sed -e '
          s/else write/else\
***************
*** 26,30 ****
      | ../web2c/fixwrites \
      | ../web2c/splitup mf

! cat coerce.h coerce.add >xcoerce.h
  mv xcoerce.h coerce.h
--- 26,30 ----
      | ../web2c/fixwrites \
      | ../web2c/splitup mf

! cat coerce.h $srcdir/coerce.add >xcoerce.h
  mv xcoerce.h coerce.h
diff -rc --new-file unixtex-6.1b-base/web2c/tex/Makefile.in unixtex-6.1b/web2c/tex/Makefile.in
*** unixtex-6.1b-base/web2c/tex/Makefile.in    Thu Feb  3 12:48:36 1994
--- unixtex-6.1b/web2c/tex/Makefile.in    Mon Apr  3 22:52:24 1995
***************
*** 36,43 ****

  # The -DTeX here is used for patgen, too, but that doesn't hurt anything.
  CC = @CC@
! CFLAGS = -g
! CPPFLAGS = -DTeX -I$(srcdir)/../lib -I../..

  CCLD = $(CC)
  LDFLAGS = $(CFLAGS) $(XLDFLAGS)
--- 36,43 ----

  # The -DTeX here is used for patgen, too, but that doesn't hurt anything.
  CC = @CC@
! CFLAGS =
! CPPFLAGS = -DTeX -I../lib -I$(srcdir)/../lib -I../.. -I$(srcdir)/../..

  CCLD = $(CC)
  LDFLAGS = $(CFLAGS) $(XLDFLAGS)
***************
*** 61,67 ****
    picplus.fmt slitex.fmt tex.fmt texinfo.fmt

  # And how to make them.
! initex = TEXPOOL=. ./initex


  # What to pass to submakes.
--- 61,69 ----
    picplus.fmt slitex.fmt tex.fmt texinfo.fmt

  # And how to make them.
! #initex = TEXPOOL=$(srcdir) ./initex
! # For AmigaDOS, do this:
! initex = echo "$(srcdir)" >env:TEXPOOL; ./initex


  # What to pass to submakes.
***************
*** 73,83 ****
  .SUFFIXES:
  .SUFFIXES: .o .c .p .ch
  .p.c:
!     $(SHELL) $(srcdir)/../lib/convert $*.p $*.c
  .ch.p:
!     ../web/tangle $*.web $*.ch
  .c.o:
!     $(CC) $(CPPFLAGS) $(CFLAGS) -c $*.c


  default: all
--- 75,87 ----
  .SUFFIXES:
  .SUFFIXES: .o .c .p .ch
  .p.c:
!     $(SHELL) $(srcdir)/../lib/convert $< $*.c $(srcdir)
  .ch.p:
!     ../web/tangle $(srcdir)/$*.web $<
!     cp $(srcdir)/$*.p $*.p
!     rm -f $(srcdir)/$*.p
  .c.o:
!     $(CC) $(CPPFLAGS) $(CFLAGS) -c $<


  default: all
***************
*** 183,190 ****
      if grep 'memmax 2999' texd.h.bak >/dev/null 2>&1; then \
            rm -f texd.h*; else mv texd.h.bak texd.h; fi

! tex.p: tex.web ctex.ch
!     ../web/tangle tex.web ctex.ch

  # If you're building mltex, reportedly have to add:
  #        sed -e 's/xiiix/(/;s/xtttx/)/' tex.p >tex.pp
--- 187,197 ----
      if grep 'memmax 2999' texd.h.bak >/dev/null 2>&1; then \
            rm -f texd.h*; else mv texd.h.bak texd.h; fi

! tex.p tex.pool: tex.web ctex.ch
!     ../web/tangle $(srcdir)/tex.web ctex.ch
!     cp $(srcdir)/tex.p tex.p
!     cp $(srcdir)/tex.pool tex.pool
!     rm -f $(srcdir)/tex.p $(srcdir)/tex.pool

  # If you're building mltex, reportedly have to add:
  #        sed -e 's/xiiix/(/;s/xtttx/)/' tex.p >tex.pp
***************
*** 198,204 ****
  # timestamp is later than the rest.
  tex0.c tex1.c tex2.c tex3.c tex4.c tex5.c tex6.c tex7.c tex8.c tex9.c \
  itex.c coerce.h texd.h: tex.p coerce.add $(commondefines)
!     $(SHELL) $(texsrcdir)/convert
      touch texd.h

  # The (hand-coded) file $(extrac) and the (generated) file itex.c have
--- 205,211 ----
  # timestamp is later than the rest.
  tex0.c tex1.c tex2.c tex3.c tex4.c tex5.c tex6.c tex7.c tex8.c tex9.c \
  itex.c coerce.h texd.h: tex.p coerce.add $(commondefines)
!     $(SHELL) $(texsrcdir)/convert $(srcdir)
      touch texd.h

  # The (hand-coded) file $(extrac) and the (generated) file itex.c have
diff -rc --new-file unixtex-6.1b-base/web2c/tex/convert unixtex-6.1b/web2c/tex/convert
*** unixtex-6.1b-base/web2c/tex/convert    Sun Nov  7 20:12:54 1993
--- unixtex-6.1b/web2c/tex/convert    Sun Apr  2 19:50:20 1995
***************
*** 1,11 ****
  #!/bin/sh
  # Convert TeX to C.
!
! cat ../lib/common.defines ../lib/texmf.defines tex.p \
      | ../web2c/web2c -t -htexmf.h \
      | ../web2c/fixwrites -t \
      | ../web2c/regfix \
      | ../web2c/splitup

! cat coerce.h coerce.add > xcoerce.h
  mv xcoerce.h coerce.h
--- 1,11 ----
  #!/bin/sh
  # Convert TeX to C.
! srcdir=$1
! cat $srcdir/../lib/common.defines $srcdir/../lib/texmf.defines tex.p \
      | ../web2c/web2c -t -htexmf.h \
      | ../web2c/fixwrites -t \
      | ../web2c/regfix \
      | ../web2c/splitup

! cat coerce.h $srcdir/coerce.add > xcoerce.h
  mv xcoerce.h coerce.h
diff -rc --new-file unixtex-6.1b-base/web2c/web/Makefile.in unixtex-6.1b/web2c/web/Makefile.in
*** unixtex-6.1b-base/web2c/web/Makefile.in    Thu Feb  3 12:48:36 1994
--- unixtex-6.1b/web2c/web/Makefile.in    Sun Apr  2 23:05:00 1995
***************
*** 19,26 ****
  program = tangle weave pooltype

  CC = @CC@
! CFLAGS = -g
! CPPFLAGS = -I$(srcdir)/../lib -I../..

  CCLD = $(CC)
  LDFLAGS = $(CFLAGS) $(XLDFLAGS)
--- 19,26 ----
  program = tangle weave pooltype

  CC = @CC@
! CFLAGS =
! CPPFLAGS = -I../lib -I$(srcdir)/../lib -I../.. -I$(srcdir)/../..

  CCLD = $(CC)
  LDFLAGS = $(CFLAGS) $(XLDFLAGS)
***************
*** 34,44 ****
  .SUFFIXES:
  .SUFFIXES: .o .c .p .ch
  .p.c:
!     $(SHELL) $(srcdir)/../lib/convert $*.p $*.c
  .ch.p:
!     ./tangle $*.web $*.ch
  .c.o:
!     $(CC) $(CPPFLAGS) $(CFLAGS) -c $*.c


  default: $(all)
--- 34,46 ----
  .SUFFIXES:
  .SUFFIXES: .o .c .p .ch
  .p.c:
!     $(SHELL) $(srcdir)/../lib/convert $< $*.c $(srcdir)
  .ch.p:
!     ./tangle $(srcdir)/$*.web $<
!     cp $(srcdir)/$*.p $*.p
!     rm -f $(srcdir)/$*.p
  .c.o:
!     $(CC) $(CPPFLAGS) $(CFLAGS) -c $<


  default: $(all)
***************
*** 53,65 ****

  tangleboot.c tangleboot.h: tangleboot.p
      cd ../web2c; $(MAKE) all
!     $(SHELL) $(srcdir)/../lib/convert tangleboot.p temp.c
      sed s/tangle.h/tangleboot.h/ < temp.c > tangleboot.c
      rm -f temp.c

  # To make tangleboot.p, we must assume a working tangle.
  tangleboot.p: tangle.web tangle.ch
!     tangle tangle.web tangle.ch
      mv tangle.p tangleboot.p


--- 55,67 ----

  tangleboot.c tangleboot.h: tangleboot.p
      cd ../web2c; $(MAKE) all
!     $(SHELL) $(srcdir)/../lib/convert tangleboot.p temp.c $(srcdir)
      sed s/tangle.h/tangleboot.h/ < temp.c > tangleboot.c
      rm -f temp.c

  # To make tangleboot.p, we must assume a working tangle.
  tangleboot.p: tangle.web tangle.ch
!     tangle $(srcdir)/tangle.web $(srcdir)/tangle.ch
      mv tangle.p tangleboot.p


***************
*** 73,79 ****
  # which we can use to make the other programs.  (We don't bother to make
  # tangle again using itself.)
  tangle.p: tangleboot tangle.web tangle.ch
!     ./tangleboot tangle.web tangle.ch

  tangle.web:
      @echo "You seem to be missing tangle.web, perhaps because you"
--- 75,83 ----
  # which we can use to make the other programs.  (We don't bother to make
  # tangle again using itself.)
  tangle.p: tangleboot tangle.web tangle.ch
!     ./tangleboot $(srcdir)/tangle.web $(srcdir)/tangle.ch
!     cp $(srcdir)/tangle.p tangle.p
!     rm -f $(srcdir)/tangle.p

  tangle.web:
      @echo "You seem to be missing tangle.web, perhaps because you"
diff -rc --new-file unixtex-6.1b-base/web2c/web2c/Makefile.in unixtex-6.1b/web2c/web2c/Makefile.in
*** unixtex-6.1b-base/web2c/web2c/Makefile.in    Thu Feb  3 12:48:36 1994
--- unixtex-6.1b/web2c/web2c/Makefile.in    Sun Apr  2 19:44:34 1995
***************
*** 14,21 ****
  commono = ../lib/lib.a $(kpathsea)

  CC = @CC@
! CFLAGS = -g
! CPPFLAGS = -I$(srcdir)/../lib -I../..

  LEX = @LEX@
  LEXLIB = @LEXLIB@
--- 14,21 ----
  commono = ../lib/lib.a $(kpathsea)

  CC = @CC@
! CFLAGS =
! CPPFLAGS = -I. -I../lib -I$(srcdir)/../lib -I../.. -I$(srcdir)/../..

  LEX = @LEX@
  LEXLIB = @LEXLIB@
***************
*** 32,38 ****
  .SUFFIXES:
  .SUFFIXES: .o .c
  .c.o:
!     $(CC) $(CPPFLAGS) $(CFLAGS) -c $*.c


  all: $(program)
--- 32,38 ----
  .SUFFIXES:
  .SUFFIXES: .o .c
  .c.o:
!     $(CC) $(CPPFLAGS) $(CFLAGS) -c $<


  all: $(program)
***************
*** 45,56 ****

  $(LEX_OUTPUT_ROOT).o: $(LEX_OUTPUT_ROOT).c y.tab.h
  $(LEX_OUTPUT_ROOT).c: web2c.lex
!     $(LEX) web2c.lex

  y.tab.o: y.tab.c
  y.tab.c y.tab.h: web2c.yacc
      @echo Expect one shift/reduce conflict.
!     $(YACC) -d -v web2c.yacc

  fixwrites: fixwrites.o
      $(CCLD) -o fixwrites $(LDFLAGS) fixwrites.o $(libs)
--- 45,56 ----

  $(LEX_OUTPUT_ROOT).o: $(LEX_OUTPUT_ROOT).c y.tab.h
  $(LEX_OUTPUT_ROOT).c: web2c.lex
!     $(LEX) $(srcdir)/web2c.lex

  y.tab.o: y.tab.c
  y.tab.c y.tab.h: web2c.yacc
      @echo Expect one shift/reduce conflict.
!     $(YACC) -d -v $(srcdir)/web2c.yacc

  fixwrites: fixwrites.o
      $(CCLD) -o fixwrites $(LDFLAGS) fixwrites.o $(libs)
diff -rc --new-file unixtex-6.1b-base/web2c/web2c/splitup.c unixtex-6.1b/web2c/web2c/splitup.c
*** unixtex-6.1b-base/web2c/web2c/splitup.c    Tue May 25 18:41:18 1993
--- unixtex-6.1b/web2c/web2c/splitup.c    Sun Apr  2 21:14:26 1995
***************
*** 24,30 ****
  char buffer[1024], filename[PATH_MAX];

  FILE *out, *ini, *temp;
! FILE *in = stdin;


  int
--- 24,30 ----
  char buffer[1024], filename[PATH_MAX];

  FILE *out, *ini, *temp;
! FILE *in /* = stdin */;


  int
***************
*** 32,37 ****
--- 32,38 ----
    int argc;
    char *argv[];
  {
+     in = stdin;        /* stdin might not be a compile time constant */
      if (argc > 1)
      output_name = argv[1];

diff -rc --new-file unixtex-6.1b-base/web2c/web2c/web2c.h unixtex-6.1b/web2c/web2c/web2c.h
*** unixtex-6.1b-base/web2c/web2c/web2c.h    Fri May 14 18:20:48 1993
--- unixtex-6.1b/web2c/web2c/web2c.h    Sun Apr  2 16:26:02 1995
***************
*** 56,59 ****
--- 56,61 ----
  extern void find_next_temp(), normal(), new_line(), indent_line(), my_output();
  extern void semicolon(), remove_locals(), mark(), initialize();
  extern int add_to_table(), search_table(), yyerror(), yylex(), yyparse();
+ #ifndef alloca
  extern void *alloca();
+ #endif
diff -rc --new-file unixtex-6.1b-base/xdvik/configure unixtex-6.1b/xdvik/configure
*** unixtex-6.1b-base/xdvik/configure    Fri Jan  6 14:53:00 1995
--- unixtex-6.1b/xdvik/configure    Mon Apr  3 21:44:08 1995
***************
*** 9,15 ****

  # Defaults:
  ac_help=
! ac_default_prefix=/usr/local
  # Any additions from configure.in:
  ac_help="$ac_help
    --with-x                use the X Window System"
--- 9,15 ----

  # Defaults:
  ac_help=
! ac_default_prefix=/gnu
  # Any additions from configure.in:
  ac_help="$ac_help
    --with-x                use the X Window System"
***************
*** 54,60 ****
    fi

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

--- 54,60 ----
    fi

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

***************
*** 75,95 ****
      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 ;;
--- 75,95 ----
      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
!       { /bin/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
!       { /bin/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 ;;
***************
*** 221,236 ****
      verbose=yes ;;

    -version | --version | --versio | --versi | --vers)
!     echo "configure generated by autoconf version 2.1"
      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 ;;
--- 221,236 ----
      verbose=yes ;;

    -version | --version | --versio | --versi | --vers)
!     /bin/echo "configure generated by autoconf version 2.1"
      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
!       { /bin/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 ;;
***************
*** 238,249 ****
      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)
--- 238,249 ----
      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
!       { /bin/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)
***************
*** 264,278 ****
    | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
      x_libraries="$ac_optarg" ;;

!   -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; }
      ;;

    *)
!     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
!       { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
      fi
      nonopt="$ac_option"
      ;;
--- 264,278 ----
    | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
      x_libraries="$ac_optarg" ;;

!   -*) { /bin/echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; }
      ;;

    *)
!     if test -n "`/bin/echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
!       /bin/echo "configure: warning: $ac_option: invalid host type" 1>&2
      fi
      if test "x$nonopt" != xNONE; then
!       { /bin/echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
      fi
      nonopt="$ac_option"
      ;;
***************
*** 281,287 ****
  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
--- 281,287 ----
  done

  if test -n "$ac_prev"; then
!   { /bin/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
***************
*** 300,306 ****
  fi
  exec 5>./config.log

! echo "\
  This file contains any messages produced by compilers while
  running configure, to aid debugging if configure makes a mistake.
  " 1>&5
--- 300,306 ----
  fi
  exec 5>./config.log

! /bin/echo "\
  This file contains any messages produced by compilers while
  running configure, to aid debugging if configure makes a mistake.
  " 1>&5
***************
*** 331,337 ****
  # 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.
--- 331,337 ----
  # 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.
***************
*** 342,348 ****
    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
--- 342,348 ----
    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
***************
*** 353,364 ****
  fi
  if test ! -r $srcdir/$ac_unique_file; then
    if test "$ac_srcdir_defaulted" = yes; then
!     { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; }
    else
!     { 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
--- 353,364 ----
  fi
  if test ! -r $srcdir/$ac_unique_file; then
    if test "$ac_srcdir_defaulted" = yes; then
!     { /bin/echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; }
    else
!     { /bin/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
***************
*** 370,385 ****
  fi
  for ac_site_file in $CONFIG_SITE; do
    if test -r "$ac_site_file"; then
!     echo "loading site script $ac_site_file"
      . "$ac_site_file"
    fi
  done

  if test -r "$cache_file"; then
!   echo "loading cache $cache_file"
    . $cache_file
  else
!   echo "creating cache $cache_file"
    > $cache_file
  fi

--- 370,385 ----
  fi
  for ac_site_file in $CONFIG_SITE; do
    if test -r "$ac_site_file"; then
!     /bin/echo "loading site script $ac_site_file"
      . "$ac_site_file"
    fi
  done

  if test -r "$cache_file"; then
!   /bin/echo "loading cache $cache_file"
    . $cache_file
  else
!   /bin/echo "creating cache $cache_file"
    > $cache_file
  fi

***************
*** 389,397 ****
  ac_compile='${CC-cc} $CFLAGS $CPPFLAGS conftest.$ac_ext -c 1>&5 2>&5'
  ac_link='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext -o conftest $LIBS 1>&5 2>&5'

! if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
    # Stardent Vistra SVR4 grep lacks -e, says [e-mail].
!   if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
      ac_n= ac_c='
  ' ac_t='    '
    else
--- 389,397 ----
  ac_compile='${CC-cc} $CFLAGS $CPPFLAGS conftest.$ac_ext -c 1>&5 2>&5'
  ac_link='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext -o conftest $LIBS 1>&5 2>&5'

! if (/bin/echo "testing\c"; /bin/echo 1,2,3) | grep c >/dev/null; then
    # Stardent Vistra SVR4 grep lacks -e, says [e-mail].
!   if (/bin/echo -n testing; /bin/echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
      ac_n= ac_c='
  ' ac_t='    '
    else
***************
*** 406,419 ****



! echo $ac_n "checking whether ${MAKE-make} sets \$MAKE""... $ac_c" 1>&4
  set dummy ${MAKE-make}; ac_make=$2
! if eval "test \"`echo '${'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
!   echo $ac_n "(cached) $ac_c" 1>&4
  else
    cat > conftestmake <<\EOF
  all:
!     @echo 'ac_maketemp="${MAKE}"'
  EOF
  # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
  eval `${MAKE-make} -f conftestmake 2>/dev/null | grep temp=`
--- 406,419 ----



! /bin/echo $ac_n "checking whether ${MAKE-make} sets \$MAKE""... $ac_c" 1>&4
  set dummy ${MAKE-make}; ac_make=$2
! if eval "test \"`/bin/echo '${'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
!   /bin/echo $ac_n "(cached) $ac_c" 1>&4
  else
    cat > conftestmake <<\EOF
  all:
!     @/bin/echo 'ac_maketemp="${MAKE}"'
  EOF
  # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
  eval `${MAKE-make} -f conftestmake 2>/dev/null | grep temp=`
***************
*** 424,443 ****
  fi
  rm -f conftestmake
  fi
! if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
!   echo "$ac_t""yes" 1>&4
    SET_MAKE=
  else
!   echo "$ac_t""no" 1>&4
    SET_MAKE="MAKE=${MAKE-make}"
  fi


  # 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.
--- 424,443 ----
  fi
  rm -f conftestmake
  fi
! if eval "test \"`/bin/echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
!   /bin/echo "$ac_t""yes" 1>&4
    SET_MAKE=
  else
!   /bin/echo "$ac_t""no" 1>&4
    SET_MAKE="MAKE=${MAKE-make}"
  fi


  # 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 \"`/bin/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.
***************
*** 456,470 ****
  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__
--- 456,470 ----
  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 \"`/bin/echo '${'ac_cv_prog_gcc'+set}'`\" = set"; then
!   /bin/echo $ac_n "(cached) $ac_c" 1>&4
  else
    cat > conftest.c <<EOF
  #ifdef __GNUC__
***************
*** 477,491 ****
    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
    ac_cv_prog_gcc_g=yes
  else
--- 477,491 ----
    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 \"`/bin/echo '${'ac_cv_prog_gcc_g'+set}'`\" = set"; then
!   /bin/echo $ac_n "(cached) $ac_c" 1>&4
  else
!   /bin/echo 'void f(){}' > conftest.c
  if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
    ac_cv_prog_gcc_g=yes
  else
***************
*** 494,500 ****
  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
--- 494,500 ----
  rm -f conftest*

  fi
!     /bin/echo "$ac_t""$ac_cv_prog_gcc_g" 1>&4
      if test $ac_cv_prog_gcc_g = yes; then
        CFLAGS="-g -O"
      else
***************
*** 519,525 ****
    fi
  done
  if test -z "$ac_aux_dir"; then
!   { echo "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; }
  fi
  ac_config_guess=$ac_aux_dir/config.guess
  ac_config_sub=$ac_aux_dir/config.sub
--- 519,525 ----
    fi
  done
  if test -z "$ac_aux_dir"; then
!   { /bin/echo "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; }
  fi
  ac_config_guess=$ac_aux_dir/config.guess
  ac_config_sub=$ac_aux_dir/config.sub
***************
*** 535,549 ****
  # 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
--- 535,550 ----
  # 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
! INSTALL="/bin/install -c"
  if test -z "$INSTALL"; then
! if eval "test \"`/bin/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
!     ''|.|/bin) ;;
      *)
        # OSF1 and SCO ODT 3.0 have their own names for install.
        for ac_prog in ginstall installbsd scoinst install; do
***************
*** 568,574 ****
  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.
--- 569,575 ----
  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.
***************
*** 578,586 ****

  # 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.
--- 579,587 ----

  # 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 \"`/bin/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.
***************
*** 599,615 ****
  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


! 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
--- 600,616 ----
  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


! /bin/echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&4
  if test -d /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
***************
*** 621,627 ****
      CC="$CC -Xp"
    fi
  else
!   echo "$ac_t""no" 1>&4
    ISC=
  fi

--- 622,628 ----
      CC="$CC -Xp"
    fi
  else
!   /bin/echo "$ac_t""no" 1>&4
    ISC=
  fi

***************
*** 629,638 ****
  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 639 "configure"
--- 630,639 ----
  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 \"`/bin/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 639 "configure"
***************
*** 654,675 ****
  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 "
--- 655,676 ----
  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 \"`/bin/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 "
***************
*** 693,709 ****
  LIBS="$ac_save_LIBS"

  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 "
--- 694,710 ----
  LIBS="$ac_save_LIBS"

  fi
! if eval "test \"`/bin/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 \"`/bin/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 "
***************
*** 727,749 ****
  LIBS="$ac_save_LIBS"

  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 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.
--- 728,750 ----
  LIBS="$ac_save_LIBS"

  fi
! if eval "test \"`/bin/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 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 \"`/bin/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.
***************
*** 761,767 ****
  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
--- 762,768 ----
  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
***************
*** 775,781 ****
  if test -z "$ac_err"; then
    :
  else
!   echo "$ac_err" >&5
    rm -rf conftest*
    CPP=/lib/cpp
  fi
--- 776,782 ----
  if test -z "$ac_err"; then
    :
  else
!   /bin/echo "$ac_err" >&5
    rm -rf conftest*
    CPP=/lib/cpp
  fi
***************
*** 786,797 ****
  fi
  fi
  CPP="$ac_cv_prog_CPP"
! echo "$ac_t""$CPP" 1>&4

  # 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
--- 787,798 ----
  fi
  fi
  CPP="$ac_cv_prog_CPP"
! /bin/echo "$ac_t""$CPP" 1>&4

  # 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 \"`/bin/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
***************
*** 811,821 ****
  rm -fr conftest*
  fi
  cross_compiling=$ac_cv_c_cross
! echo "$ac_t""$ac_cv_c_cross" 1>&4

! 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 822 "configure"
--- 812,822 ----
  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 for ANSI C header files""... $ac_c" 1>&4
! if eval "test \"`/bin/echo '${'ac_cv_header_stdc'+set}'`\" = set"; then
!   /bin/echo $ac_n "(cached) $ac_c" 1>&4
  else
    cat > conftest.$ac_ext <<EOF
  #line 822 "configure"
***************
*** 831,837 ****
    rm -rf conftest*
    ac_cv_header_stdc=yes
  else
!   echo "$ac_err" >&5
    rm -rf conftest*
    ac_cv_header_stdc=no
  fi
--- 832,838 ----
    rm -rf conftest*
    ac_cv_header_stdc=yes
  else
!   /bin/echo "$ac_err" >&5
    rm -rf conftest*
    ac_cv_header_stdc=no
  fi
***************
*** 900,906 ****
  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
--- 901,907 ----
  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
***************
*** 908,919 ****

  fi

! echo $ac_n "checking whether closedir returns void""... $ac_c" 1>&4
! if eval "test \"`echo '${'ac_cv_func_closedir_void'+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 920 "configure"
--- 909,920 ----

  fi

! /bin/echo $ac_n "checking whether closedir returns void""... $ac_c" 1>&4
! if eval "test \"`/bin/echo '${'ac_cv_func_closedir_void'+set}'`\" = set"; then
!   /bin/echo $ac_n "(cached) $ac_c" 1>&4
  else
    if test "$cross_compiling" = yes; then
!     { /bin/echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
  else
  cat > conftest.$ac_ext <<EOF
  #line 920 "configure"
***************
*** 931,937 ****
  fi
  rm -fr conftest*
  fi
! echo "$ac_t""$ac_cv_func_closedir_void" 1>&4
  if test $ac_cv_func_closedir_void = yes; then
    cat >> confdefs.h <<\EOF
  #define CLOSEDIR_VOID 1
--- 932,938 ----
  fi
  rm -fr conftest*
  fi
! /bin/echo "$ac_t""$ac_cv_func_closedir_void" 1>&4
  if test $ac_cv_func_closedir_void = yes; then
    cat >> confdefs.h <<\EOF
  #define CLOSEDIR_VOID 1
***************
*** 942,951 ****
  for ac_hdr in assert.h float.h limits.h memory.h pwd.h stdlib.h \
                   string.h unistd.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 952 "configure"
--- 943,952 ----
  for ac_hdr in assert.h float.h limits.h memory.h pwd.h stdlib.h \
                   string.h unistd.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 \"`/bin/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 952 "configure"
***************
*** 958,987 ****
    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_func in basename bcopy memmove putenv
  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 988 "configure"
--- 959,988 ----
    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 \"`/bin/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_func in basename bcopy memmove putenv
  do
! /bin/echo $ac_n "checking for $ac_func""... $ac_c" 1>&4
! if eval "test \"`/bin/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 988 "configure"
***************
*** 1014,1035 ****
  rm -f conftest*

  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 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 1036 "configure"
--- 1015,1036 ----
  rm -f conftest*

  fi
! if eval "test \"`/bin/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 working const""... $ac_c" 1>&4
! if eval "test \"`/bin/echo '${'ac_cv_c_const'+set}'`\" = set"; then
!   /bin/echo $ac_n "(cached) $ac_c" 1>&4
  else
    cat > conftest.$ac_ext <<EOF
  #line 1036 "configure"
***************
*** 1092,1098 ****
  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
--- 1093,1099 ----
  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
***************
*** 1103,1111 ****


  # This is a GNU libc invention.
! echo $ac_n "checking whether program_invocation_name is predefined""... $ac_c" 1>&4
! if eval "test \"`echo '${'kb_cv_var_program_inv_name'+set}'`\" = set"; then
!   echo $ac_n "(cached) $ac_c" 1>&4
  else
    cat > conftest.$ac_ext <<EOF
  #line 1112 "configure"
--- 1104,1112 ----


  # This is a GNU libc invention.
! /bin/echo $ac_n "checking whether program_invocation_name is predefined""... $ac_c" 1>&4
! if eval "test \"`/bin/echo '${'kb_cv_var_program_inv_name'+set}'`\" = set"; then
!   /bin/echo $ac_n "(cached) $ac_c" 1>&4
  else
    cat > conftest.$ac_ext <<EOF
  #line 1112 "configure"
***************
*** 1126,1132 ****
  rm -f conftest*

  fi
! echo "$ac_t""$kb_cv_var_program_inv_name" 1>&4
  if test $kb_cv_var_program_inv_name = yes; then
    cat >> confdefs.h <<\EOF
  #define HAVE_PROGRAM_INVOCATION_NAME 1
--- 1127,1133 ----
  rm -f conftest*

  fi
! /bin/echo "$ac_t""$kb_cv_var_program_inv_name" 1>&4
  if test $kb_cv_var_program_inv_name = yes; then
    cat >> confdefs.h <<\EOF
  #define HAVE_PROGRAM_INVOCATION_NAME 1
***************
*** 1139,1147 ****
  # This test program is due to Mike Hibler <[e-mail]>.
  # We don't actually need to run this if we don't have putenv, but it
  # doesn't hurt.
! echo $ac_n "checking whether putenv uses malloc""... $ac_c" 1>&4
! if eval "test \"`echo '${'kb_cv_func_putenv_malloc'+set}'`\" = set"; then
!   echo $ac_n "(cached) $ac_c" 1>&4
  else
    if test "$cross_compiling" = yes; then
    kb_cv_func_putenv_malloc=no
--- 1140,1148 ----
  # This test program is due to Mike Hibler <[e-mail]>.
  # We don't actually need to run this if we don't have putenv, but it
  # doesn't hurt.
! /bin/echo $ac_n "checking whether putenv uses malloc""... $ac_c" 1>&4
! if eval "test \"`/bin/echo '${'kb_cv_func_putenv_malloc'+set}'`\" = set"; then
!   /bin/echo $ac_n "(cached) $ac_c" 1>&4
  else
    if test "$cross_compiling" = yes; then
    kb_cv_func_putenv_malloc=no
***************
*** 1209,1215 ****
  fi
  rm -fr conftest*
  fi
! echo "$ac_t""$kb_cv_func_putenv_malloc" 1>&4
  if test $kb_cv_func_putenv_malloc = yes; then
    cat >> confdefs.h <<\EOF
  #define SMART_PUTENV 1
--- 1210,1216 ----
  fi
  rm -fr conftest*
  fi
! /bin/echo "$ac_t""$kb_cv_func_putenv_malloc" 1>&4
  if test $kb_cv_func_putenv_malloc = yes; then
    cat >> confdefs.h <<\EOF
  #define SMART_PUTENV 1
***************
*** 1222,1228 ****
  # paths, otherwise set no_x=yes.
  # Uses ac_ vars as temps to allow command line to override cache and checks.
  # --without-x overrides everything else, but does not touch the cache.
! echo $ac_n "checking for X""... $ac_c" 1>&4

  # Check whether --with-x or --without-x was given.
  withval="$with_x"
--- 1223,1229 ----
  # paths, otherwise set no_x=yes.
  # Uses ac_ vars as temps to allow command line to override cache and checks.
  # --without-x overrides everything else, but does not touch the cache.
! /bin/echo $ac_n "checking for X""... $ac_c" 1>&4

  # Check whether --with-x or --without-x was given.
  withval="$with_x"
***************
*** 1236,1243 ****
    if test "x$x_includes" != xNONE && test "x$x_libraries" != xNONE; then
      no_x=
    else
! if eval "test \"`echo '${'ac_cv_path_x'+set}'`\" = set"; then
!   echo $ac_n "(cached) $ac_c" 1>&4
  else
    # One or both of the vars are not set, and there is no cached value.
  no_x=yes
--- 1237,1244 ----
    if test "x$x_includes" != xNONE && test "x$x_libraries" != xNONE; then
      no_x=
    else
! if eval "test \"`/bin/echo '${'ac_cv_path_x'+set}'`\" = set"; then
!   /bin/echo $ac_n "(cached) $ac_c" 1>&4
  else
    # One or both of the vars are not set, and there is no cached value.
  no_x=yes
***************
*** 1247,1253 ****
    # Make sure to not put "make" in the Imakefile rules, since we grep it out.
    cat > Imakefile <<'EOF'
  acfindx:
!     @echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"'
  EOF
    if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then
      no_x=
--- 1248,1254 ----
    # Make sure to not put "make" in the Imakefile rules, since we grep it out.
    cat > Imakefile <<'EOF'
  acfindx:
!     @/bin/echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"'
  EOF
    if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then
      no_x=
***************
*** 1259,1273 ****
        ac_im_usrlibdir=$ac_im_libdir
      fi
      case "$ac_im_incroot" in
!     /usr/include) ;;
      *) ac_x_includes="$ac_im_incroot" ;;
      esac
      case "$ac_im_usrlibdir" in
!     /usr/lib | /lib) ;;
      *) ac_x_libraries="$ac_im_usrlibdir" ;;
      esac
    fi
    cd ..
    rm -fr conftestdir
  fi

--- 1260,1276 ----
        ac_im_usrlibdir=$ac_im_libdir
      fi
      case "$ac_im_incroot" in
!     /gnu/include) ;;
      *) ac_x_includes="$ac_im_incroot" ;;
      esac
      case "$ac_im_usrlibdir" in
!     /gnu/lib | /lib) ;;
      *) ac_x_libraries="$ac_im_usrlibdir" ;;
      esac
    fi
    cd ..
+ # AmigaDOS hack, avoid race condition, wait for lock to clear
+   sleep 5
    rm -fr conftestdir
  fi

***************
*** 1286,1328 ****
    rm -rf conftest*
    no_x= ac_x_includes=
  else
!   echo "$ac_err" >&5
    rm -rf conftest*
      for ac_dir in               \
!     /usr/X11R6/include        \
!     /usr/X11R5/include        \
!     /usr/X11R4/include        \
                                \
!     /usr/include/X11R6        \
!     /usr/include/X11R5        \
!     /usr/include/X11R4        \
                                \
!     /usr/local/X11R6/include  \
!     /usr/local/X11R5/include  \
!     /usr/local/X11R4/include  \
                                \
!     /usr/local/include/X11R6  \
!     /usr/local/include/X11R5  \
!     /usr/local/include/X11R4  \
                                \
!     /usr/X11/include          \
!     /usr/include/X11          \
!     /usr/local/X11/include    \
!     /usr/local/include/X11    \
                                \
!     /usr/X386/include         \
!     /usr/x386/include         \
!     /usr/XFree86/include/X11  \
                                \
!     /usr/include              \
!     /usr/local/include        \
!     /usr/unsupported/include  \
!     /usr/athena/include       \
!     /usr/local/x11r5/include  \
!     /usr/lpp/Xamples/include  \
                                \
!     /usr/openwin/include      \
!     /usr/openwin/share/include \
      ; \
    do
      if test -r "$ac_dir/$x_direct_test_include"; then
--- 1289,1331 ----
    rm -rf conftest*
    no_x= ac_x_includes=
  else
!   /bin/echo "$ac_err" >&5
    rm -rf conftest*
      for ac_dir in               \
!     /gnu/X11R6/include        \
!     /gnu/X11R5/include        \
!     /gnu/X11R4/include        \
                                \
!     /gnu/include/X11R6        \
!     /gnu/include/X11R5        \
!     /gnu/include/X11R4        \
                                \
!     /gnu/local/X11R6/include  \
!     /gnu/local/X11R5/include  \
!     /gnu/local/X11R4/include  \
                                \
!     /gnu/local/include/X11R6  \
!     /gnu/local/include/X11R5  \
!     /gnu/local/include/X11R4  \
                                \
!     /gnu/X11/include          \
!     /gnu/include/X11          \
!     /gnu/local/X11/include    \
!     /gnu/local/include/X11    \
                                \
!     /gnu/X386/include         \
!     /gnu/x386/include         \
!     /gnu/XFree86/include/X11  \
                                \
!     /gnu/include              \
!     /gnu/local/include        \
!     /gnu/unsupported/include  \
!     /gnu/athena/include       \
!     /gnu/local/x11r5/include  \
!     /gnu/lpp/Xamples/include  \
                                \
!     /gnu/openwin/include      \
!     /gnu/openwin/share/include \
      ; \
    do
      if test -r "$ac_dir/$x_direct_test_include"; then
***************
*** 1354,1394 ****
    rm -rf conftest*
    LIBS="$ac_save_LIBS"
  # First see if replacing the include by lib works.
! for ac_dir in `echo "$ac_x_includes" | sed s/include/lib/` \
!     /usr/X11R6/lib        \
!     /usr/X11R5/lib        \
!     /usr/X11R4/lib        \
                            \
!     /usr/lib/X11R6        \
!     /usr/lib/X11R5        \
!     /usr/lib/X11R4        \
                            \
!     /usr/local/X11R6/lib  \
!     /usr/local/X11R5/lib  \
!     /usr/local/X11R4/lib  \
                            \
!     /usr/local/lib/X11R6  \
!     /usr/local/lib/X11R5  \
!     /usr/local/lib/X11R4  \
                            \
!     /usr/X11/lib          \
!     /usr/lib/X11          \
!     /usr/local/X11/lib    \
!     /usr/local/lib/X11    \
                            \
!     /usr/X386/lib         \
!     /usr/x386/lib         \
!     /usr/XFree86/lib/X11  \
                            \
!     /usr/lib              \
!     /usr/local/lib        \
!     /usr/unsupported/lib  \
!     /usr/athena/lib       \
!     /usr/local/x11r5/lib  \
!     /usr/lpp/Xamples/lib  \
                            \
!     /usr/openwin/lib      \
!     /usr/openwin/share/lib \
      ; \
  do
    for ac_extension in a so sl; do
--- 1357,1397 ----
    rm -rf conftest*
    LIBS="$ac_save_LIBS"
  # First see if replacing the include by lib works.
! for ac_dir in `/bin/echo "$ac_x_includes" | sed s/include/lib/` \
!     /gnu/X11R6/lib        \
!     /gnu/X11R5/lib        \
!     /gnu/X11R4/lib        \
                            \
!     /gnu/lib/X11R6        \
!     /gnu/lib/X11R5        \
!     /gnu/lib/X11R4        \
                            \
!     /gnu/local/X11R6/lib  \
!     /gnu/local/X11R5/lib  \
!     /gnu/local/X11R4/lib  \
                            \
!     /gnu/local/lib/X11R6  \
!     /gnu/local/lib/X11R5  \
!     /gnu/local/lib/X11R4  \
                            \
!     /gnu/X11/lib          \
!     /gnu/lib/X11          \
!     /gnu/local/X11/lib    \
!     /gnu/local/lib/X11    \
                            \
!     /gnu/X386/lib         \
!     /gnu/x386/lib         \
!     /gnu/XFree86/lib/X11  \
                            \
!     /gnu/lib              \
!     /gnu/local/lib        \
!     /gnu/unsupported/lib  \
!     /gnu/athena/lib       \
!     /gnu/local/x11r5/lib  \
!     /gnu/lpp/Xamples/lib  \
                            \
!     /gnu/openwin/lib      \
!     /gnu/openwin/share/lib \
      ; \
  do
    for ac_extension in a so sl; do
***************
*** 1413,1424 ****
  fi # $with_x != no

  if test "$no_x" = yes; then
!   echo "$ac_t""no" 1>&4
  else
    test "x$x_includes" = xNONE && x_includes=$ac_x_includes
    test "x$x_libraries" = xNONE && x_libraries=$ac_x_libraries
    ac_cv_path_x="no_x= ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
!   echo "$ac_t""libraries $x_libraries, headers $x_includes" 1>&4
  fi

  if test "$no_x" = yes; then
--- 1416,1427 ----
  fi # $with_x != no

  if test "$no_x" = yes; then
!   /bin/echo "$ac_t""no" 1>&4
  else
    test "x$x_includes" = xNONE && x_includes=$ac_x_includes
    test "x$x_libraries" = xNONE && x_libraries=$ac_x_libraries
    ac_cv_path_x="no_x= ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
!   /bin/echo "$ac_t""libraries $x_libraries, headers $x_includes" 1>&4
  fi

  if test "$no_x" = yes; then
***************
*** 1450,1458 ****
    # These have to be linked with before -lX11, unlike the other
    # libraries we check for below, so use a different variable.
    #  [e-mail], [e-mail].
!   echo $ac_n "checking for -lICE""... $ac_c" 1>&4
! if eval "test \"`echo '${'ac_cv_lib_ICE'+set}'`\" = set"; then
!   echo $ac_n "(cached) $ac_c" 1>&4
  else
    ac_save_LIBS="$LIBS"
  LIBS="$LIBS -lICE "
--- 1453,1461 ----
    # These have to be linked with before -lX11, unlike the other
    # libraries we check for below, so use a different variable.
    #  [e-mail], [e-mail].
!   /bin/echo $ac_n "checking for -lICE""... $ac_c" 1>&4
! if eval "test \"`/bin/echo '${'ac_cv_lib_ICE'+set}'`\" = set"; then
!   /bin/echo $ac_n "(cached) $ac_c" 1>&4
  else
    ac_save_LIBS="$LIBS"
  LIBS="$LIBS -lICE "
***************
*** 1476,1486 ****
  LIBS="$ac_save_LIBS"

  fi
! if eval "test \"`echo '$ac_cv_lib_'ICE`\" = yes"; then
!   echo "$ac_t""yes" 1>&4
    X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
  else
!   echo "$ac_t""no" 1>&4
  fi

    LDFLAGS="$ac_save_LDFLAGS"
--- 1479,1489 ----
  LIBS="$ac_save_LIBS"

  fi
! if eval "test \"`/bin/echo '$ac_cv_lib_'ICE`\" = yes"; then
!   /bin/echo "$ac_t""yes" 1>&4
    X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
  else
!   /bin/echo "$ac_t""no" 1>&4
  fi

    LDFLAGS="$ac_save_LDFLAGS"
***************
*** 1493,1501 ****
      # [e-mail] says this is needed for Ultrix, if the X
      # libraries were built with DECnet support.  And [e-mail] says
      # the Alpha needs dnet_stub (dnet does not exist).
!     echo $ac_n "checking for -ldnet""... $ac_c" 1>&4
! if eval "test \"`echo '${'ac_cv_lib_dnet'+set}'`\" = set"; then
!   echo $ac_n "(cached) $ac_c" 1>&4
  else
    ac_save_LIBS="$LIBS"
  LIBS="$LIBS -ldnet "
--- 1496,1504 ----
      # [e-mail] says this is needed for Ultrix, if the X
      # libraries were built with DECnet support.  And [e-mail] says
      # the Alpha needs dnet_stub (dnet does not exist).
!     /bin/echo $ac_n "checking for -ldnet""... $ac_c" 1>&4
! if eval "test \"`/bin/echo '${'ac_cv_lib_dnet'+set}'`\" = set"; then
!   /bin/echo $ac_n "(cached) $ac_c" 1>&4
  else
    ac_save_LIBS="$LIBS"
  LIBS="$LIBS -ldnet "
***************
*** 1519,1535 ****
  LIBS="$ac_save_LIBS"

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

      if test $ac_cv_lib_dnet = no; then
!       echo $ac_n "checking for -ldnet_stub""... $ac_c" 1>&4
! if eval "test \"`echo '${'ac_cv_lib_dnet_stub'+set}'`\" = set"; then
!   echo $ac_n "(cached) $ac_c" 1>&4
  else
    ac_save_LIBS="$LIBS"
  LIBS="$LIBS -ldnet_stub "
--- 1522,1538 ----
  LIBS="$ac_save_LIBS"

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

      if test $ac_cv_lib_dnet = no; then
!       /bin/echo $ac_n "checking for -ldnet_stub""... $ac_c" 1>&4
! if eval "test \"`/bin/echo '${'ac_cv_lib_dnet_stub'+set}'`\" = set"; then
!   /bin/echo $ac_n "(cached) $ac_c" 1>&4
  else
    ac_save_LIBS="$LIBS"
  LIBS="$LIBS -ldnet_stub "
***************
*** 1553,1563 ****
  LIBS="$ac_save_LIBS"

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

      fi
--- 1556,1566 ----
  LIBS="$ac_save_LIBS"

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

      fi
***************
*** 1566,1574 ****
      # to get the SysV transport functions.
      # Not sure which flavor of 386 UNIX this is, but it seems harmless to
      # check for it.
!     echo $ac_n "checking for -lnsl""... $ac_c" 1>&4
! if eval "test \"`echo '${'ac_cv_lib_nsl'+set}'`\" = set"; then
!   echo $ac_n "(cached) $ac_c" 1>&4
  else
    ac_save_LIBS="$LIBS"
  LIBS="$LIBS -lnsl "
--- 1569,1577 ----
      # to get the SysV transport functions.
      # Not sure which flavor of 386 UNIX this is, but it seems harmless to
      # check for it.
!     /bin/echo $ac_n "checking for -lnsl""... $ac_c" 1>&4
! if eval "test \"`/bin/echo '${'ac_cv_lib_nsl'+set}'`\" = set"; then
!   /bin/echo $ac_n "(cached) $ac_c" 1>&4
  else
    ac_save_LIBS="$LIBS"
  LIBS="$LIBS -lnsl "
***************
*** 1592,1602 ****
  LIBS="$ac_save_LIBS"

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


--- 1595,1605 ----
  LIBS="$ac_save_LIBS"

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


***************
*** 1604,1612 ****
      # socket/setsockopt and other routines are undefined under SCO ODT 2.0.
      # But -lsocket is broken on IRIX, according to [e-mail].
      if test "`(uname) 2>/dev/null`" != IRIX; then
!       echo $ac_n "checking for -lsocket""... $ac_c" 1>&4
! if eval "test \"`echo '${'ac_cv_lib_socket'+set}'`\" = set"; then
!   echo $ac_n "(cached) $ac_c" 1>&4
  else
    ac_save_LIBS="$LIBS"
  LIBS="$LIBS -lsocket "
--- 1607,1615 ----
      # socket/setsockopt and other routines are undefined under SCO ODT 2.0.
      # But -lsocket is broken on IRIX, according to [e-mail].
      if test "`(uname) 2>/dev/null`" != IRIX; then
!       /bin/echo $ac_n "checking for -lsocket""... $ac_c" 1>&4
! if eval "test \"`/bin/echo '${'ac_cv_lib_socket'+set}'`\" = set"; then
!   /bin/echo $ac_n "(cached) $ac_c" 1>&4
  else
    ac_save_LIBS="$LIBS"
  LIBS="$LIBS -lsocket "
***************
*** 1630,1640 ****
  LIBS="$ac_save_LIBS"

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

      fi
--- 1633,1643 ----
  LIBS="$ac_save_LIBS"

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

      fi
***************
*** 1642,1650 ****
  fi


! echo $ac_n "checking for vprintf""... $ac_c" 1>&4
! if eval "test \"`echo '${'ac_cv_func_vprintf'+set}'`\" = set"; then
!   echo $ac_n "(cached) $ac_c" 1>&4
  else
    cat > conftest.$ac_ext <<EOF
  #line 1651 "configure"
--- 1645,1653 ----
  fi


! /bin/echo $ac_n "checking for vprintf""... $ac_c" 1>&4
! if eval "test \"`/bin/echo '${'ac_cv_func_vprintf'+set}'`\" = set"; then
!   /bin/echo $ac_n "(cached) $ac_c" 1>&4
  else
    cat > conftest.$ac_ext <<EOF
  #line 1651 "configure"
***************
*** 1677,1696 ****
  rm -f conftest*

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

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

  if test "$ac_cv_func_vprintf" != yes; then
! echo $ac_n "checking for _doprnt""... $ac_c" 1>&4
! if eval "test \"`echo '${'ac_cv_func__doprnt'+set}'`\" = set"; then
!   echo $ac_n "(cached) $ac_c" 1>&4
  else
    cat > conftest.$ac_ext <<EOF
  #line 1697 "configure"
--- 1680,1699 ----
  rm -f conftest*

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

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

  if test "$ac_cv_func_vprintf" != yes; then
! /bin/echo $ac_n "checking for _doprnt""... $ac_c" 1>&4
! if eval "test \"`/bin/echo '${'ac_cv_func__doprnt'+set}'`\" = set"; then
!   /bin/echo $ac_n "(cached) $ac_c" 1>&4
  else
    cat > conftest.$ac_ext <<EOF
  #line 1697 "configure"
***************
*** 1723,1736 ****
  rm -f conftest*

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

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

  fi
--- 1726,1739 ----
  rm -f conftest*

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

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

  fi
***************
*** 1742,1750 ****
  # <sys/bsdtypes.h> is for ISC 4.0, to define fd_set in psgs.c.
  for ac_func in getwd isinf
  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 1751 "configure"
--- 1745,1753 ----
  # <sys/bsdtypes.h> is for ISC 4.0, to define fd_set in psgs.c.
  for ac_func in getwd isinf
  do
! /bin/echo $ac_n "checking for $ac_func""... $ac_c" 1>&4
! if eval "test \"`/bin/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 1751 "configure"
***************
*** 1777,1800 ****
  rm -f conftest*

  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_hdr in ieeefp.h sys/bsdtypes.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 1801 "configure"
--- 1780,1803 ----
  rm -f conftest*

  fi
! if eval "test \"`/bin/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_hdr in ieeefp.h sys/bsdtypes.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 \"`/bin/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 1801 "configure"
***************
*** 1807,1835 ****
    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


  # Do we have the SIGIO signal (and F_SETOWN and FASYNC)?
! echo $ac_n "checking for SIGIO""... $ac_c" 1>&4
! if eval "test \"`echo '${'kb_cv_sys_sigio'+set}'`\" = set"; then
!   echo $ac_n "(cached) $ac_c" 1>&4
  else
    cat > conftest.$ac_ext <<EOF
  #line 1836 "configure"
--- 1810,1838 ----
    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 \"`/bin/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


  # Do we have the SIGIO signal (and F_SETOWN and FASYNC)?
! /bin/echo $ac_n "checking for SIGIO""... $ac_c" 1>&4
! if eval "test \"`/bin/echo '${'kb_cv_sys_sigio'+set}'`\" = set"; then
!   /bin/echo $ac_n "(cached) $ac_c" 1>&4
  else
    cat > conftest.$ac_ext <<EOF
  #line 1836 "configure"
***************
*** 1851,1857 ****
  rm -f conftest*

  fi
! echo "$ac_t""$kb_cv_sys_sigio" 1>&4
  if test $kb_cv_sys_sigio = yes; then
    cat >> confdefs.h <<\EOF
  #define HAVE_SIGIO 1
--- 1854,1860 ----
  rm -f conftest*

  fi
! /bin/echo "$ac_t""$kb_cv_sys_sigio" 1>&4
  if test $kb_cv_sys_sigio = yes; then
    cat >> confdefs.h <<\EOF
  #define HAVE_SIGIO 1
***************
*** 1870,1876 ****
        no) PS_DEF=no;;
       dps) PS_DEF="$PS_DEF -DPS_DPS";;
      news) PS_DEF="$PS_DEF -DPS_NEWS";;
!        *) echo "configure: warning: Unknown --with-ps argument \`$withval'; using gs." 1>&2;;
   esac
  fi

--- 1873,1879 ----
        no) PS_DEF=no;;
       dps) PS_DEF="$PS_DEF -DPS_DPS";;
      news) PS_DEF="$PS_DEF -DPS_NEWS";;
!        *) /bin/echo "configure: warning: Unknown --with-ps argument \`$withval'; using gs." 1>&2;;
   esac
  fi

***************
*** 1878,1903 ****
  test "$PS_DEF" = no && PS_DEF=
  # If we're on Solaris and we want DPS, then add the extra compilation stuff
  # to get it.
! if echo "$PS_DEF" | grep PS_DPS >/dev/null; then
     if test "`(uname) 2>/dev/null`" = SunOS \
        && uname -r | grep '^5' >/dev/null; then
!     echo "$ac_t""adding DPS includes and libraries for Solaris" 1>&4
!     X_CFLAGS="$X_CFLAGS -I/usr/openwin/include/X11"
      # -lsunmath is for isinf.
!     X_LIBS="$X_LIBS -R/usr/openwin/lib /usr/openwin/lib/libdps.so -lsunmath"
    else
      # SunOS 4.x is simpler.
!     echo "$ac_t""adding DPS includes and libraries for SunOS 4.x" 1>&4
      X_LIBS="$X_LIBS -ldps"
    fi
! elif echo "$PS_DEF" | grep PS_NEWS >/dev/null; then
!     echo "$ac_t""adding NeWS libraries" 1>&4
      X_LIBS="$X_LIBS -lxview -lcps -lolgx -lxvps"
  fi

  trap '' 1 2 15
  if test -w $cache_file; then
! echo "updating cache $cache_file"
  cat > $cache_file <<\EOF
  # This file is a shell script that caches the results of configure
  # tests run on this system so they can be shared between configure
--- 1881,1906 ----
  test "$PS_DEF" = no && PS_DEF=
  # If we're on Solaris and we want DPS, then add the extra compilation stuff
  # to get it.
! if /bin/echo "$PS_DEF" | grep PS_DPS >/dev/null; then
     if test "`(uname) 2>/dev/null`" = SunOS \
        && uname -r | grep '^5' >/dev/null; then
!     /bin/echo "$ac_t""adding DPS includes and libraries for Solaris" 1>&4
!     X_CFLAGS="$X_CFLAGS -I/gnu/openwin/include/X11"
      # -lsunmath is for isinf.
!     X_LIBS="$X_LIBS -R/gnu/openwin/lib /gnu/openwin/lib/libdps.so -lsunmath"
    else
      # SunOS 4.x is simpler.
!     /bin/echo "$ac_t""adding DPS includes and libraries for SunOS 4.x" 1>&4
      X_LIBS="$X_LIBS -ldps"
    fi
! elif /bin/echo "$PS_DEF" | grep PS_NEWS >/dev/null; then
!     /bin/echo "$ac_t""adding NeWS libraries" 1>&4
      X_LIBS="$X_LIBS -lxview -lcps -lolgx -lxvps"
  fi

  trap '' 1 2 15
  if test -w $cache_file; then
! /bin/echo "updating cache $cache_file"
  cat > $cache_file <<\EOF
  # This file is a shell script that caches the results of configure
  # tests run on this system so they can be shared between configure
***************
*** 1915,1925 ****
  #
  EOF
  # Ultrix sh set writes to stderr and can't be redirected directly.
  (set) 2>&1 |
!   sed -n "s/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/: \${\1='\2'}/p" \
!   >> $cache_file
  else
! echo "not updating unwritable cache $cache_file"
  fi

  trap 'rm -fr conftest* confdefs* core $ac_clean_files; exit 1' 1 2 15
--- 1918,1931 ----
  #
  EOF
  # Ultrix sh set writes to stderr and can't be redirected directly.
+ # On AmigaDOS, the {} chars get eaten, so add them back with separate
+ # sed commands.
  (set) 2>&1 |
!   sed -n "s/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/: \${\1='\2'}/p" |
!   sed "s@\\\$@\${@" |
!   sed "s@\$@}@" >> $cache_file
  else
! /bin/echo "not updating unwritable cache $cache_file"
  fi

  trap 'rm -fr conftest* confdefs* core $ac_clean_files; exit 1' 1 2 15
***************
*** 1942,1948 ****
  # Without the "./", some shells look in PATH for config.status.
  : ${CONFIG_STATUS=./config.status}

! echo creating $CONFIG_STATUS
  rm -f $CONFIG_STATUS
  cat > $CONFIG_STATUS <<EOF
  #!/bin/sh
--- 1948,1954 ----
  # Without the "./", some shells look in PATH for config.status.
  : ${CONFIG_STATUS=./config.status}

! /bin/echo creating $CONFIG_STATUS
  rm -f $CONFIG_STATUS
  cat > $CONFIG_STATUS <<EOF
  #!/bin/sh
***************
*** 1961,1974 ****
  do
    case "\$ac_option" in
    -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
!     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 ;;
!   *) echo "\$ac_cs_usage"; exit 1 ;;
    esac
  done

--- 1967,1980 ----
  do
    case "\$ac_option" in
    -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
!     /bin/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)
!     /bin/echo "\$ac_cs_usage"; exit 0 ;;
!   *) /bin/echo "\$ac_cs_usage"; exit 1 ;;
    esac
  done

***************
*** 2013,2033 ****
  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
--- 2019,2039 ----
  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
***************
*** 2035,2041 ****
    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"
--- 2041,2047 ----
    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"
***************
*** 2046,2054 ****
    [/$]*) INSTALL="$ac_given_INSTALL" ;;
    *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
    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" ;;
--- 2052,2060 ----
    [/$]*) INSTALL="$ac_given_INSTALL" ;;
    *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
    esac
!   /bin/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" ;;
***************
*** 2061,2074 ****
    # getline or system. (Anyway, configure scripts aren't supposed to use awk.)
    # Use \@...@<cmd> form of sed address because the filename may contain /.
    # Can't use only one -e and commands {dr foo} because foo has to be last.
!   # Use @e initially instead of -e because GNU echo has a -e option.
    # USe `X' to mean a bunch of backslashes; this is for FreeBSD.
    file_substs=`sed -n \
  "/^ac_include/s%ac_include[     ]*\(.*\)%@e 'X@^&@r \1' -e 'X@^&@d'%p" \
                 $ac_given_srcdir/${ac_file}.in`
    if test -n "$file_substs"; then
      # Change @e back to -e and X@^ to \@^.
!     file_subst_cmd="sed `echo $file_substs \
                           | sed -e 's/@e/-e/g' -e 's/X@^/\\\\\@^/g'`"
    else
      # If no substitutions and hence no sed commands, don't choke.
--- 2067,2080 ----
    # getline or system. (Anyway, configure scripts aren't supposed to use awk.)
    # Use \@...@<cmd> form of sed address because the filename may contain /.
    # Can't use only one -e and commands {dr foo} because foo has to be last.
!   # Use @e initially instead of -e because GNU /bin/echo has a -e option.
    # USe `X' to mean a bunch of backslashes; this is for FreeBSD.
    file_substs=`sed -n \
  "/^ac_include/s%ac_include[     ]*\(.*\)%@e 'X@^&@r \1' -e 'X@^&@d'%p" \
                 $ac_given_srcdir/${ac_file}.in`
    if test -n "$file_substs"; then
      # Change @e back to -e and X@^ to \@^.
!     file_subst_cmd="sed `/bin/echo $file_substs \
                           | sed -e 's/@e/-e/g' -e 's/X@^/\\\\\@^/g'`"
    else
      # If no substitutions and hence no sed commands, don't choke.
***************
*** 2111,2122 ****
  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

!   echo creating $ac_file

    rm -f conftest.frag conftest.in conftest.out
    cp $ac_given_srcdir/$ac_file_in conftest.in
--- 2117,2128 ----
  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

!   /bin/echo creating $ac_file

    rm -f conftest.frag conftest.in conftest.out
    cp $ac_given_srcdir/$ac_file_in conftest.in
***************
*** 2157,2165 ****
    # grep -c gives empty output for an empty file on some AIX systems.
    if test -z "$ac_lines" || test "$ac_lines" -eq 0; then break; fi
    # Write a limited-size here document to conftest.frag.
!   echo '  cat > conftest.frag <<CEOF' >> $CONFIG_STATUS
    sed ${ac_max_here_lines}q conftest.vals >> $CONFIG_STATUS
!   echo 'CEOF
    sed -f conftest.frag conftest.in > conftest.out
    rm -f conftest.in
    mv conftest.out conftest.in
--- 2163,2171 ----
    # grep -c gives empty output for an empty file on some AIX systems.
    if test -z "$ac_lines" || test "$ac_lines" -eq 0; then break; fi
    # Write a limited-size here document to conftest.frag.
!   /bin/echo '  cat > conftest.frag <<CEOF' >> $CONFIG_STATUS
    sed ${ac_max_here_lines}q conftest.vals >> $CONFIG_STATUS
!   /bin/echo 'CEOF
    sed -f conftest.frag conftest.in > conftest.out
    rm -f conftest.in
    mv conftest.out conftest.in
***************
*** 2172,2182 ****

  cat >> $CONFIG_STATUS <<\EOF
    rm -f conftest.frag conftest.h
!   echo "/* $ac_file.  Generated automatically by configure.  */" > conftest.h
    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
--- 2178,2188 ----

  cat >> $CONFIG_STATUS <<\EOF
    rm -f conftest.frag conftest.h
!   /bin/echo "/* $ac_file.  Generated automatically by configure.  */" > conftest.h
    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