Update to 0.5.2, provided by Sean Doran in pkg/11142, with some minor

cleanup by me. Changes: 'open-source', new char-sets and -operations, new regexp system, some renaming (reduce-* -> *-fold), and lots of bugfixes.
author: wiz <wiz> 2001-02-27 19:37:46 +0000
committer: wiz <wiz> 2001-02-27 19:37:46 +0000
commit: e22f7dc9560a478e2543b442c5c824140b4f6eca (patch)
tree: a7b4c591ca3c5b3418faf41df3a74c83e15fc31b /shells/scsh
parent: 1fa04b19217163f821e95cd32b05c0268044d2d2 (diff)
download: pkgsrc-e22f7dc9560a478e2543b442c5c824140b4f6eca.tar.gz
13 files changed, 654 insertions, 933 deletions
diff --git a/shells/scsh/Makefile b/shells/scsh/Makefile
index 78976794f42..f23a759becf 100644
--- a/shells/scsh/Makefile
+++ b/shells/scsh/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2001/02/17 17:40:20 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2001/02/27 19:37:46 wiz Exp $
 # FreeBSD Id: Makefile,v 1.4 1997/07/15 15:00:30 cracauer Exp 
 #
 
-DISTNAME=		scsh-0.5.1
+DISTNAME=		scsh-0.5.2
 CATEGORIES=		shells lang
 MASTER_SITES=		ftp://ftp-swiss.ai.mit.edu/pub/su/scsh/
 
diff --git a/shells/scsh/files/md5 b/shells/scsh/files/md5
index 14d2a2932c6..91f8d0aa118 100644
--- a/shells/scsh/files/md5
+++ b/shells/scsh/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.2 1998/08/07 13:27:38 agc Exp $
+$NetBSD: md5,v 1.3 2001/02/27 19:37:47 wiz Exp $
 
-MD5 (scsh-0.5.1.tar.gz) = 907dfc1202bff6b4aa416d2026dbdd19
+MD5 (scsh-0.5.2.tar.gz) = 6661518731117eb21eda644aa5babe46
diff --git a/shells/scsh/files/patch-sum b/shells/scsh/files/patch-sum
index c99bd716b04..6f970a8a0ee 100644
--- a/shells/scsh/files/patch-sum
+++ b/shells/scsh/files/patch-sum
@@ -1,6 +1,6 @@
-$NetBSD: patch-sum,v 1.3 2000/05/20 23:05:39 dmcmahill Exp $
+$NetBSD: patch-sum,v 1.4 2001/02/27 19:37:47 wiz Exp $
 
-MD5 (patch-aa) = d42deff85c5714ce15cfd5b3cb7f75de
+MD5 (patch-aa) = 6d6f8801d508b8dc769bf7c5df0a91ce
 MD5 (patch-ab) = df53020f5f1b12486fc426f92e154a30
 MD5 (patch-ac) = ac0e044700bea35dd7b88768c10e1e2b
 MD5 (patch-ad) = 6b90b4233b175d2140f4b357fc665fc3
@@ -8,5 +8,10 @@ MD5 (patch-ae) = 1078379e1bd89f6d63e0b4db95120c46
 MD5 (patch-af) = d897362062386ea35fabf59bfbd299f3
 MD5 (patch-ag) = d3e067a90e4b55d2d27bdef28aa8ad97
 MD5 (patch-ah) = 6eb3bb6e657ad5d802c32062aafc37ab
-MD5 (patch-ai) = 7157ce97b6c188f58d76be0f634c98d0
-MD5 (patch-aj) = a760727620116680f16758a4f6e13244
+MD5 (patch-ai) = 2811a88832b1b432656775bbb997c3e9
+MD5 (patch-aj) = c996547257b2b8416fe993b928482f9b
+MD5 (patch-ak) = 0e716a351c534a63dd66f45e073d83a0
+MD5 (patch-al) = 7073b214382120c8a314be247520bccf
+MD5 (patch-am) = 568a483d935e57fba1042fbe2597ccb0
+MD5 (patch-an) = 78611e96bdfe4c0d1ef5087200eb1d69
+MD5 (patch-ao) = 5ce3c132995a0b5ee9377ef028c7c3a5
diff --git a/shells/scsh/patches/patch-aa b/shells/scsh/patches/patch-aa
index a3076936acb..10460615680 100644
--- a/shells/scsh/patches/patch-aa
+++ b/shells/scsh/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.3 1998/08/07 11:13:54 agc Exp $
+$NetBSD: patch-aa,v 1.4 2001/02/27 19:37:47 wiz Exp $
 
---- Makefile.in.orig	Mon Jun  9 03:46:05 1997
-+++ Makefile.in	Sat Feb  7 22:31:02 1998
+--- Makefile.in.orig	Wed Sep 15 16:54:48 1999
++++ Makefile.in	Sun Oct  1 21:46:02 2000
 @@ -139,7 +139,7 @@
  
  # The following is the first rule and therefore the "make" command's
@@ -11,7 +11,17 @@ $NetBSD: patch-aa,v 1.3 1998/08/07 11:13:54 agc Exp $
  
  # The developers are curious to know.  Don't be concerned if this fails.
  # You may comment these lines out if you wish to be discourteous.
-@@ -252,6 +252,7 @@
+@@ -156,6 +156,9 @@
+ .scm.c:
+ 	$(srcdir)/$(VM) -o $(srcdir)/$(VM) -i $(CIG) < $< > $*.c
+ 
++scsh/rdelim.c: 
++	$(srcdir)/$(VM) -o $(srcdir)/$(VM) -i $(CIG) < $< > $*.c
++
+ # These .h files mediate between the code exported from foo1.c
+ # and imported into foo.scm's stub foo.c.
+ 
+@@ -277,6 +280,7 @@
  	$(RM) -r $(LIB).old
  	if [ -d $(LIB) ] ; then mv $(LIB) $(LIB).old ; fi
  	mkdir $(LIB)
@@ -19,7 +29,17 @@ $NetBSD: patch-aa,v 1.3 1998/08/07 11:13:54 agc Exp $
  	mkdir $(LIB)/big
  	mkdir $(LIB)/cig
  	mkdir $(LIB)/doc
-@@ -279,8 +280,8 @@
+@@ -286,6 +290,9 @@
+ 	mkdir $(LIB)/misc
+ 	mkdir $(LIB)/opt
+ 	mkdir $(LIB)/scsh
++	mkdir $(LIB)/scsh/rx
++	mkdir $(LIB)/scsh/lib
++	mkdir $(LIB)/scsh/machine
+ 	mkdir $(LIB)/rts
+ 	mkdir $(LIB)/vm
+ 
+@@ -304,8 +311,8 @@
  	$(INSTALL_DATA) $(srcdir)/scheme48.h $(incdir)/
  
  install-cig: cig
@@ -30,7 +50,7 @@ $NetBSD: patch-aa,v 1.3 1998/08/07 11:13:54 agc Exp $
  	$(INSTALL_DATA) $(srcdir)/$(LIBCIG) $(LIB)/cig
  	$(INSTALL_DATA) $(srcdir)/cig/libcig.h $(LIB)/cig
  
-@@ -288,6 +289,7 @@
+@@ -313,6 +320,7 @@
  	      $(LIB)/misc $(LIB)/link $(LIB)/vm $(LIB)/doc
  	for f in $(srcdir)/rts/*num.scm; \
  	    do $(INSTALL_DATA) $$f $(LIB)/rts/; done
@@ -38,10 +58,31 @@ $NetBSD: patch-aa,v 1.3 1998/08/07 11:13:54 agc Exp $
  	for f in $(srcdir)/env/*.scm; do $(INSTALL_DATA) $$f $(LIB)/env/; done
  	for f in $(srcdir)/big/*.scm; do $(INSTALL_DATA) $$f $(LIB)/big/; done
  	for f in $(srcdir)/opt/*.scm; do $(INSTALL_DATA) $$f $(LIB)/opt/; done
-@@ -676,8 +678,8 @@
+@@ -627,7 +635,8 @@
+ 	scsh/time.scm \
+ 	scsh/top.scm \
+ 	scsh/tty.scm \
+-	scsh/utilities.scm
++	scsh/utilities.scm \
++	scsh/rx/let-match.scm
+ 
+ #    	scsh/dbm.scm db.scm ndbm.scm
+ #	static.scm static-heap.scm static1.scm
+@@ -656,6 +665,7 @@
+          $(srcdir)/scsh/machine/packages.scm \
+ 	 $(srcdir)/scsh/rx/packages.scm \
+ 	 $(srcdir)/scsh/rx/cond-package.scm \
++         $(srcdir)/scsh/rx/let-match.scm \
+ 	 $(srcdir)/scsh/scsh-package.scm \
+ 	 $(srcdir)/scsh/lib/string-pack.scm \
+ 	 $(srcdir)/scsh/lib/list-pack.scm \
+@@ -711,13 +721,20 @@
+ 
  install-scsh: scsh
- 	$(RM) $(bindir)/$(RUNNABLE)
- 	$(INSTALL_PROGRAM) $(srcdir)/scsh/scsh $(bindir)/$(RUNNABLE)
+ 	$(RM) $(bindir)/$(RUNNABLE)$(EXEEXT)
+-	$(INSTALL_PROGRAM) $(srcdir)/scsh/scsh$(EXEEXT) \
++	$(INSTALL_SCRIPT) $(srcdir)/scsh/scsh$(EXEEXT) \
+ 	    $(bindir)/$(RUNNABLE)$(EXEEXT)
 -	$(INSTALL_PROGRAM) $(srcdir)/scsh/scsh.image $(LIB)/scsh.image
 -	$(INSTALL_PROGRAM) $(srcdir)/$(LIBSCSH) $(libdir)/$(LIBSCSH)
 +	$(INSTALL_SCRIPT) $(srcdir)/scsh/scsh.image $(LIB)/scsh.image
@@ -49,3 +90,13 @@ $NetBSD: patch-aa,v 1.3 1998/08/07 11:13:54 agc Exp $
  	$(RANLIB) $(libdir)/$(LIBSCSH)
  	for f in $(srcdir)/scsh/*.scm; \
  	    do $(INSTALL_DATA) $$f $(LIB)/scsh/; done
++	for f in $(srcdir)/scsh/lib/*.scm; \
++            do $(INSTALL_DATA) $$f $(LIB)/scsh/lib/; done
++	for f in $(srcdir)/scsh/rx/*.scm; \
++            do $(INSTALL_DATA) $$f $(LIB)/scsh/rx/; done
++	for f in $(srcdir)/scsh/machine/*.scm; \
++            do $(INSTALL_DATA) $$f $(LIB)/scsh/machine/; done
++
+ 
+ clean-scsh:
+ 	$(RM) scsh/*.o scsh/regexp/*.o scsh/rx/*.o scsh/machine/*.o 
diff --git a/shells/scsh/patches/patch-ai b/shells/scsh/patches/patch-ai
index 334e80cf5d3..5bf2a04f6e0 100644
--- a/shells/scsh/patches/patch-ai
+++ b/shells/scsh/patches/patch-ai
@@ -1,10 +1,12 @@
-$NetBSD: patch-ai,v 1.1 2000/05/20 23:05:40 dmcmahill Exp $
+$NetBSD: patch-ai,v 1.2 2001/02/27 19:37:47 wiz Exp $
 
---- configure.in.orig	Sat May 20 17:07:20 2000
-+++ configure.in	Sat May 20 17:20:50 2000
-@@ -292,4 +292,5 @@
+--- configure.in.orig	Tue Feb 27 20:13:07 2001
++++ configure.in
+@@ -291,6 +291,7 @@
+   
    ## NetBSD and FreeBSD ( and maybe 386BSD also)
    *-*-*bsd* )
 +    LDFLAGS="-Wl,--export-dynamic"
      dir=bsd
+     SCSH_ELF
    ;;
diff --git a/shells/scsh/patches/patch-aj b/shells/scsh/patches/patch-aj
index d43f6ef01a3..eabfb9b26a9 100644
--- a/shells/scsh/patches/patch-aj
+++ b/shells/scsh/patches/patch-aj
@@ -1,61 +1,48 @@
-$NetBSD: patch-aj,v 1.1 2000/05/20 23:05:40 dmcmahill Exp $
+$NetBSD: patch-aj,v 1.2 2001/02/27 19:37:47 wiz Exp $
 
-generated with autoconf on the patched configure.in, no additional
-changes.
-
---- configure.orig	Sat May 20 17:07:23 2000
-+++ configure	Sat May 20 17:21:05 2000
-@@ -2,5 +2,5 @@
+--- configure.orig	Sun Oct  1 21:21:44 2000
++++ configure	Sun Oct  1 21:21:53 2000
+@@ -1,7 +1,7 @@
+ #! /bin/sh
  
  # Guess values for system-dependent variables and create Makefiles.
--# Generated automatically using autoconf version 2.10 
+-# Generated automatically using autoconf version 2.12 
 +# Generated automatically using autoconf version 2.13 
  # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
  #
-@@ -50,4 +50,7 @@
+ # This configure script is free software; the Free Software Foundation
+@@ -49,6 +49,7 @@
+ # Initialize some other variables.
  subdirs=
  MFLAGS= MAKEFLAGS=
 +SHELL=${CONFIG_SHELL-/bin/sh}
-+# Maximum number of lines to put in a shell here document.
-+ac_max_here_lines=12
+ # Maximum number of lines to put in a shell here document.
+ ac_max_here_lines=12
  
- ac_prev=
-@@ -331,5 +334,5 @@
+@@ -332,7 +333,7 @@
+     verbose=yes ;;
  
    -version | --version | --versio | --versi | --vers)
--    echo "configure generated by autoconf version 2.10"
+-    echo "configure generated by autoconf version 2.12"
 +    echo "configure generated by autoconf version 2.13"
      exit 0 ;;
  
-@@ -433,9 +436,12 @@
- 
- # NLS nuisances.
--# Only set LANG and LC_ALL to C if already set.
--# These must not be set unconditionally because not all systems understand
--# e.g. LANG=C (notably SCO).
--if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
-+# Only set these to C if already set.  These must not be set unconditionally
-+# because not all systems understand e.g. LANG=C (notably SCO).
-+# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
-+# Non-C LC_CTYPE values break the ctype check.
- if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
-+if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
-+if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
-+if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
- 
- # confdefs.h avoids OS command line length limits that DEFS can exceed.
-@@ -498,6 +504,9 @@
+   -with-* | --with-*)
+@@ -502,9 +503,11 @@
+ # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
  ac_cpp='$CPP $CPPFLAGS'
  ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
 -ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
 +ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-+cross_compiling=$ac_cv_prog_cc_cross
+ cross_compiling=$ac_cv_prog_cc_cross
  
 +ac_exeext=
 +ac_objext=o
  if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
    # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
-@@ -536,9 +545,10 @@
+   if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
+@@ -541,26 +544,26 @@
+ 
  
  # Make sure we can run config.sub.
 -if $ac_config_sub sun4 >/dev/null 2>&1; then :
@@ -64,36 +51,37 @@ changes.
  fi
  
  echo $ac_n "checking host system type""... $ac_c" 1>&6
+-echo "configure:550: checking host system type" >&5
 +echo "configure:553: checking host system type" >&5
  
  host_alias=$host
-@@ -547,5 +557,5 @@
+ case "$host_alias" in
+ NONE)
    case $nonopt in
    NONE)
 -    if host_alias=`$ac_config_guess`; then :
 +    if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then :
      else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; }
      fi ;;
-@@ -554,8 +564,8 @@
+   *) host_alias=$nonopt ;;
+   esac ;;
  esac
  
 -host=`$ac_config_sub $host_alias`
--host_cpu=`echo $host | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\1/'`
--host_vendor=`echo $host | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\2/'`
--host_os=`echo $host | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\3/'`
 +host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias`
-+host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-+host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-+host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
- echo "$ac_t""$host" 1>&6
- 
-@@ -564,4 +574,5 @@
+ host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+ host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+ host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+@@ -570,15 +573,16 @@
+ # Extract the first word of "gcc", so it can be a program name with args.
  set dummy gcc; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:574: checking for $ac_word" >&5
 +echo "configure:577: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -570,6 +581,7 @@
+ else
+   if test -n "$CC"; then
    ac_cv_prog_CC="$CC" # Let the user override the test.
  else
 -  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
@@ -103,13 +91,17 @@ changes.
 +  for ac_dir in $ac_dummy; do
      test -z "$ac_dir" && ac_dir=.
      if test -f $ac_dir/$ac_word; then
-@@ -592,4 +604,5 @@
+       ac_cv_prog_CC="gcc"
+@@ -599,16 +603,17 @@
+   # Extract the first word of "cc", so it can be a program name with args.
  set dummy cc; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:603: checking for $ac_word" >&5
 +echo "configure:607: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -598,7 +611,8 @@
+ else
+   if test -n "$CC"; then
    ac_cv_prog_CC="$CC" # Let the user override the test.
  else
 -  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
@@ -120,7 +112,9 @@ changes.
 +  for ac_dir in $ac_dummy; do
      test -z "$ac_dir" && ac_dir=.
      if test -f $ac_dir/$ac_word; then
-@@ -635,8 +649,90 @@
+       if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
+@@ -643,25 +648,61 @@
+   echo "$ac_t""no" 1>&6
  fi
  
 +  if test -z "$CC"; then
@@ -160,73 +154,77 @@ changes.
    test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
  fi
  
-+echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
+ echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
+-echo "configure:651: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 +echo "configure:690: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
-+
-+ac_ext=c
-+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ 
+ ac_ext=c
+ # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+-ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
 +ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-+cross_compiling=$ac_cv_prog_cc_cross
-+
+ cross_compiling=$ac_cv_prog_cc_cross
+ 
+-cat > conftest.$ac_ext <<EOF
+-#line 661 "configure"
 +cat > conftest.$ac_ext << EOF
 +
 +#line 701 "configure"
-+#include "confdefs.h"
+ #include "confdefs.h"
 +
-+main(){return(0);}
-+EOF
+ main(){return(0);}
+ EOF
+-if { (eval echo configure:665: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
 +if { (eval echo configure:706: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+  ac_cv_prog_cc_works=yes
-+  # If we can't run a trivial program, we are probably using a cross compiler.
-+  if (./conftest; exit) 2>/dev/null; then
-+    ac_cv_prog_cc_cross=no
-+  else
-+    ac_cv_prog_cc_cross=yes
-+  fi
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  ac_cv_prog_cc_works=no
-+fi
-+rm -fr conftest*
+   ac_cv_prog_cc_works=yes
+   # If we can't run a trivial program, we are probably using a cross compiler.
+   if (./conftest; exit) 2>/dev/null; then
+@@ -675,18 +716,24 @@
+   ac_cv_prog_cc_works=no
+ fi
+ rm -fr conftest*
 +ac_ext=c
 +# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
 +ac_cpp='$CPP $CPPFLAGS'
 +ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
 +ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
 +cross_compiling=$ac_cv_prog_cc_cross
-+
-+echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
-+if test $ac_cv_prog_cc_works = no; then
-+  { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
-+fi
-+echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
+ 
+ echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
+ if test $ac_cv_prog_cc_works = no; then
+   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
+ fi
+ echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
+-echo "configure:685: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 +echo "configure:732: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
-+echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
-+cross_compiling=$ac_cv_prog_cc_cross
-+
+ echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
+ cross_compiling=$ac_cv_prog_cc_cross
+ 
  echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
+-echo "configure:690: checking whether we are using GNU C" >&5
 +echo "configure:737: checking whether we are using GNU C" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -647,5 +743,5 @@
+ else
+@@ -695,7 +742,7 @@
+   yes;
  #endif
  EOF
--if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:650: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:699: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
 +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:746: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
    ac_cv_prog_gcc=yes
  else
-@@ -655,16 +751,24 @@
+   ac_cv_prog_gcc=no
+@@ -706,11 +753,15 @@
  
- echo "$ac_t""$ac_cv_prog_gcc" 1>&6
-+
  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>&6
--if eval "test \"`echo '$''{'ac_cv_prog_gcc_g'+set}'`\" = set"; then
+-  ac_test_CFLAGS="${CFLAGS+set}"
+-  ac_save_CFLAGS="$CFLAGS"
+-  CFLAGS=
+-  echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
+-echo "configure:714: checking whether ${CC-cc} accepts -g" >&5
 +else
 +  GCC=
 +fi
@@ -236,34 +234,22 @@ changes.
 +CFLAGS=
 +echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
 +echo "configure:765: checking whether ${CC-cc} accepts -g" >&5
-+if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
+ if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-   echo 'void f(){}' > conftest.c
- if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
--  ac_cv_prog_gcc_g=yes
-+  ac_cv_prog_cc_g=yes
- else
--  ac_cv_prog_gcc_g=no
-+  ac_cv_prog_cc_g=no
- fi
- rm -f conftest*
-@@ -672,17 +776,23 @@
+@@ -725,20 +776,24 @@
  fi
  
--echo "$ac_t""$ac_cv_prog_gcc_g" 1>&6
--    if test $ac_cv_prog_gcc_g = yes; then
--      CFLAGS="-g -O"
--    else
--      CFLAGS="-O"
--    fi
-+echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
+ echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
+-  if test "$ac_test_CFLAGS" = set; then
 +if test "$ac_test_CFLAGS" = set; then
-+  CFLAGS="$ac_save_CFLAGS"
+     CFLAGS="$ac_save_CFLAGS"
+-  elif test $ac_cv_prog_cc_g = yes; then
 +elif test $ac_cv_prog_cc_g = yes; then
 +  if test "$GCC" = yes; then
-+    CFLAGS="-g -O2"
-+  else
+     CFLAGS="-g -O2"
+   else
+-    CFLAGS="-O2"
 +    CFLAGS="-g"
    fi
  else
@@ -277,43 +263,37 @@ changes.
  fi
  
  echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6
+-echo "configure:742: checking for POSIXized ISC" >&5
 +echo "configure:797: checking for POSIXized ISC" >&5
  if test -d /etc/conf/kconfig.d &&
    grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1
-@@ -708,4 +818,5 @@
+ then
+@@ -762,20 +817,20 @@
+   case "$host" in
      *-*-linux* )
      echo $ac_n "checking for broken Linux that needs -static with -g""... $ac_c" 1>&6
+-echo "configure:766: checking for broken Linux that needs -static with -g" >&5
 +echo "configure:821: checking for broken Linux that needs -static with -g" >&5
      if eval "test \"`echo '$''{'scsh_cv_linux_static_debug'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -713,21 +824,21 @@
+ else
    
        cat > conftest.$ac_ext <<EOF
--#line 716 "configure"
+-#line 772 "configure"
 +#line 827 "configure"
  #include "confdefs.h"
  
--int main() { return 0; }
--int t() {
-+int main() {
+ int main() {
  
  ; return 0; }
  EOF
--if { (eval echo configure:724: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+-if { (eval echo configure:779: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
 +if { (eval echo configure:834: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    scsh_cv_linux_static_debug=no
  else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-   rm -rf conftest*
-   scsh_cv_linux_static_debug=yes
- fi
- rm -f conftest*
--
- fi
- 
-@@ -746,13 +857,15 @@
+@@ -801,28 +856,30 @@
+ # SunOS /usr/etc/install
  # IRIX /sbin/install
  # AIX /bin/install
 +# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
@@ -321,16 +301,18 @@ changes.
  # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
  # ./install, which can be erroneously created by make from ./install.sh.
  echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
+-echo "configure:809: checking for a BSD compatible install" >&5
 +echo "configure:865: checking for a BSD compatible install" >&5
  if test -z "$INSTALL"; then
  if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
--    IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+-    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS="${IFS}:"
 +    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
    for ac_dir in $PATH; do
      # Account for people who put trailing slashes in PATH elements.
-@@ -761,10 +874,11 @@
+     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
@@ -344,27 +326,24 @@ changes.
 -	    # OSF/1 installbsd also uses dspmsg, but is usable.
  	    :
  	  else
-@@ -777,5 +891,5 @@
-     esac
-   done
--  IFS="$ac_save_ifs"
-+  IFS="$ac_save_IFS"
- 
- fi
-@@ -796,4 +910,6 @@
+ 	    ac_cv_path_install="$ac_dir/$ac_prog -c"
+@@ -852,20 +909,23 @@
+ # It thinks the first close brace ends the variable substitution.
  test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
  
 +test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 +
  test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
  
-@@ -801,4 +917,5 @@
+ # Extract the first word of "ranlib", so it can be a program name with args.
  set dummy ranlib; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:861: checking for $ac_word" >&5
 +echo "configure:920: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -807,6 +924,7 @@
+ else
+   if test -n "$RANLIB"; then
    ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
  else
 -  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
@@ -374,609 +353,395 @@ changes.
 +  for ac_dir in $ac_dummy; do
      test -z "$ac_dir" && ac_dir=.
      if test -f $ac_dir/$ac_word; then
-@@ -827,13 +945,13 @@
+       ac_cv_prog_RANLIB="ranlib"
+@@ -884,12 +944,12 @@
+ fi
  
  echo $ac_n "checking for working const""... $ac_c" 1>&6
+-echo "configure:888: checking for working const" >&5
 +echo "configure:948: checking for working const" >&5
  if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
--#line 834 "configure"
+-#line 893 "configure"
 +#line 953 "configure"
  #include "confdefs.h"
  
--int main() { return 0; }
--int t() {
-+int main() {
+ int main() {
+@@ -938,7 +998,7 @@
  
- /* Ultrix mips cc rejects this.  */
-@@ -881,13 +999,14 @@
  ; return 0; }
  EOF
--if { (eval echo configure:884: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+-if { (eval echo configure:942: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
 +if { (eval echo configure:1002: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_c_const=yes
  else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-   rm -rf conftest*
-   ac_cv_c_const=no
- fi
- rm -f conftest*
--
- fi
+@@ -960,14 +1020,14 @@
  
-@@ -901,31 +1020,6 @@
  
- 
--# If we cannot run a trivial program, we must be cross compiling.
--echo $ac_n "checking whether cross-compiling""... $ac_c" 1>&6
--if eval "test \"`echo '$''{'ac_cv_c_cross'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
--else
--  if test "$cross_compiling" = yes; then
--  ac_cv_c_cross=yes
--else
--cat > conftest.$ac_ext <<EOF
--#line 913 "configure"
--#include "confdefs.h"
--main(){return(0);}
--EOF
--{ (eval echo configure:917: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
--if test -s conftest && (./conftest; exit) 2>/dev/null; then
--  ac_cv_c_cross=no
--else
--  ac_cv_c_cross=yes
--fi
--fi
--rm -fr conftest*
--fi
--
--echo "$ac_t""$ac_cv_c_cross" 1>&6
--cross_compiling=$ac_cv_c_cross
--
  echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
+-echo "configure:964: checking whether byte ordering is bigendian" >&5
 +echo "configure:1024: checking whether byte ordering is bigendian" >&5
  if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -934,10 +1028,9 @@
+ else
+   ac_cv_c_bigendian=unknown
  # See if sys/param.h defines the BYTE_ORDER macro.
  cat > conftest.$ac_ext <<EOF
--#line 937 "configure"
+-#line 971 "configure"
 +#line 1031 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #include <sys/param.h>
--int main() { return 0; }
--int t() {
-+int main() {
- 
- #if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN
-@@ -946,14 +1039,13 @@
+@@ -978,11 +1038,11 @@
+ #endif
  ; return 0; }
  EOF
--if { (eval echo configure:949: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+-if { (eval echo configure:982: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
 +if { (eval echo configure:1042: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    # It does; now see whether it defined to BIG_ENDIAN or not.
  cat > conftest.$ac_ext <<EOF
--#line 953 "configure"
+-#line 986 "configure"
 +#line 1046 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #include <sys/param.h>
--int main() { return 0; }
--int t() {
-+int main() {
- 
- #if BYTE_ORDER != BIG_ENDIAN
-@@ -962,22 +1054,25 @@
+@@ -993,7 +1053,7 @@
+ #endif
  ; return 0; }
  EOF
--if { (eval echo configure:965: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+-if { (eval echo configure:997: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
 +if { (eval echo configure:1057: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_c_bigendian=yes
  else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-   rm -rf conftest*
-   ac_cv_c_bigendian=no
- fi
- rm -f conftest*
--
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
- fi
- rm -f conftest*
--
- if test $ac_cv_c_bigendian = unknown; then
- if test "$cross_compiling" = yes; then
+@@ -1013,7 +1073,7 @@
      { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
  else
--cat > conftest.$ac_ext <<EOF
--#line 982 "configure"
-+  cat > conftest.$ac_ext <<EOF
+   cat > conftest.$ac_ext <<EOF
+-#line 1017 "configure"
 +#line 1077 "configure"
  #include "confdefs.h"
  main () {
-@@ -992,13 +1087,17 @@
+   /* Are we little or big endian?  From Harbison&Steele.  */
+@@ -1026,7 +1086,7 @@
+   exit (u.c[sizeof (long) - 1] == 1);
  }
  EOF
--{ (eval echo configure:995: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
--if test -s conftest && (./conftest; exit) 2>/dev/null; then
+-if { (eval echo configure:1030: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
 +if { (eval echo configure:1090: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+then
+ then
    ac_cv_c_bigendian=no
  else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -fr conftest*
-   ac_cv_c_bigendian=yes
- fi
--fi
- rm -fr conftest*
- fi
-+
-+fi
- fi
- 
-@@ -1079,4 +1178,5 @@
+@@ -1117,7 +1177,7 @@
+     LIBS=-lc
      
-   echo $ac_n "checking for Linux using ELF""... $ac_c" 1>&6
-+echo "configure:1181: checking for Linux using ELF" >&5
-   if eval "test \"`echo '$''{'scsh_cv_linux_elf'+set}'`\" = set"; then
+   echo $ac_n "checking for ELF""... $ac_c" 1>&6
+-echo "configure:1121: checking for ELF" >&5
++echo "configure:1181: checking for ELF" >&5
+   if eval "test \"`echo '$''{'scsh_cv_elf'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -1101,4 +1201,5 @@
-   ## NetBSD and FreeBSD ( and maybe 386BSD also)
-   *-*-*bsd* )
-+    LDFLAGS="-Wl,--export-dynamic"
+ else
+@@ -1143,7 +1203,7 @@
      dir=bsd
-   ;;
-@@ -1119,4 +1220,5 @@
+     
+   echo $ac_n "checking for ELF""... $ac_c" 1>&6
+-echo "configure:1147: checking for ELF" >&5
++echo "configure:1207: checking for ELF" >&5
+   if eval "test \"`echo '$''{'scsh_cv_elf'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1179,7 +1239,7 @@
+     dir=irix
      
    echo $ac_n "checking ${CC} for -cckr""... $ac_c" 1>&6
-+echo "configure:1223: checking ${CC} for -cckr" >&5
+-echo "configure:1183: checking ${CC} for -cckr" >&5
++echo "configure:1243: checking ${CC} for -cckr" >&5
    if eval "test \"`echo '$''{'s48_cv_cflag_ckr'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -1172,6 +1274,7 @@
+ else
+@@ -1240,7 +1300,7 @@
  ln -s $srcdir/$dir $srcdir/scsh/machine
  
--echo $ac_n "checking for -lm""... $ac_c" 1>&6
--ac_lib_var=`echo m'_'sqrt | tr './+\055' '__p_'`
-+echo $ac_n "checking for sqrt in -lm""... $ac_c" 1>&6
-+echo "configure:1278: checking for sqrt in -lm" >&5
-+ac_lib_var=`echo m'_'sqrt | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for sqrt in -lm""... $ac_c" 1>&6
+-echo "configure:1244: checking for sqrt in -lm" >&5
++echo "configure:1304: checking for sqrt in -lm" >&5
+ ac_lib_var=`echo m'_'sqrt | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -1180,5 +1283,5 @@
+@@ -1248,7 +1308,7 @@
+   ac_save_LIBS="$LIBS"
  LIBS="-lm  $LIBS"
  cat > conftest.$ac_ext <<EOF
--#line 1183 "configure"
-+#line 1286 "configure"
+-#line 1252 "configure"
++#line 1312 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -1187,13 +1290,14 @@
- char sqrt();
- 
--int main() { return 0; }
--int t() {
-+int main() {
+ /* We use char because int might match the return type of a gcc2
+@@ -1259,7 +1319,7 @@
  sqrt()
  ; return 0; }
  EOF
--if { (eval echo configure:1195: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
-+if { (eval echo configure:1297: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:1263: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:1323: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=no"
-@@ -1205,5 +1309,6 @@
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
--    ac_tr_lib=HAVE_LIB`echo m | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-+    ac_tr_lib=HAVE_LIB`echo m | sed -e 's/[^a-zA-Z0-9_]/_/g' \
-+    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
-   cat >> confdefs.h <<EOF
- #define $ac_tr_lib 1
-@@ -1216,6 +1321,7 @@
+@@ -1287,7 +1347,7 @@
  fi
  
--echo $ac_n "checking for -lgen""... $ac_c" 1>&6
--ac_lib_var=`echo gen'_'pathfind | tr './+\055' '__p_'`
-+echo $ac_n "checking for pathfind in -lgen""... $ac_c" 1>&6
-+echo "configure:1325: checking for pathfind in -lgen" >&5
-+ac_lib_var=`echo gen'_'pathfind | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for pathfind in -lgen""... $ac_c" 1>&6
+-echo "configure:1291: checking for pathfind in -lgen" >&5
++echo "configure:1351: checking for pathfind in -lgen" >&5
+ ac_lib_var=`echo gen'_'pathfind | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -1224,5 +1330,5 @@
+@@ -1295,7 +1355,7 @@
+   ac_save_LIBS="$LIBS"
  LIBS="-lgen  $LIBS"
  cat > conftest.$ac_ext <<EOF
--#line 1227 "configure"
-+#line 1333 "configure"
+-#line 1299 "configure"
++#line 1359 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -1231,13 +1337,14 @@
- char pathfind();
- 
--int main() { return 0; }
--int t() {
-+int main() {
+ /* We use char because int might match the return type of a gcc2
+@@ -1306,7 +1366,7 @@
  pathfind()
  ; return 0; }
  EOF
--if { (eval echo configure:1239: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
-+if { (eval echo configure:1344: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:1310: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:1370: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=no"
-@@ -1249,5 +1356,6 @@
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
--    ac_tr_lib=HAVE_LIB`echo gen | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-+    ac_tr_lib=HAVE_LIB`echo gen | sed -e 's/[^a-zA-Z0-9_]/_/g' \
-+    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
-   cat >> confdefs.h <<EOF
- #define $ac_tr_lib 1
-@@ -1260,6 +1368,7 @@
+@@ -1334,7 +1394,7 @@
  fi
  
--echo $ac_n "checking for -lnsl""... $ac_c" 1>&6
--ac_lib_var=`echo nsl'_'gethostbyaddr | tr './+\055' '__p_'`
-+echo $ac_n "checking for gethostbyaddr in -lnsl""... $ac_c" 1>&6
-+echo "configure:1372: checking for gethostbyaddr in -lnsl" >&5
-+ac_lib_var=`echo nsl'_'gethostbyaddr | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for gethostbyaddr in -lnsl""... $ac_c" 1>&6
+-echo "configure:1338: checking for gethostbyaddr in -lnsl" >&5
++echo "configure:1398: checking for gethostbyaddr in -lnsl" >&5
+ ac_lib_var=`echo nsl'_'gethostbyaddr | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -1268,5 +1377,5 @@
+@@ -1342,7 +1402,7 @@
+   ac_save_LIBS="$LIBS"
  LIBS="-lnsl  $LIBS"
  cat > conftest.$ac_ext <<EOF
--#line 1271 "configure"
-+#line 1380 "configure"
+-#line 1346 "configure"
++#line 1406 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -1275,13 +1384,14 @@
- char gethostbyaddr();
- 
--int main() { return 0; }
--int t() {
-+int main() {
+ /* We use char because int might match the return type of a gcc2
+@@ -1353,7 +1413,7 @@
  gethostbyaddr()
  ; return 0; }
  EOF
--if { (eval echo configure:1283: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
-+if { (eval echo configure:1391: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:1357: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:1417: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=no"
-@@ -1293,5 +1403,6 @@
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
--    ac_tr_lib=HAVE_LIB`echo nsl | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-+    ac_tr_lib=HAVE_LIB`echo nsl | sed -e 's/[^a-zA-Z0-9_]/_/g' \
-+    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
-   cat >> confdefs.h <<EOF
- #define $ac_tr_lib 1
-@@ -1304,6 +1415,7 @@
+@@ -1381,7 +1441,7 @@
  fi
  
--echo $ac_n "checking for -lsocket""... $ac_c" 1>&6
--ac_lib_var=`echo socket'_'socket | tr './+\055' '__p_'`
-+echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
-+echo "configure:1419: checking for socket in -lsocket" >&5
-+ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
+-echo "configure:1385: checking for socket in -lsocket" >&5
++echo "configure:1445: checking for socket in -lsocket" >&5
+ ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -1312,5 +1424,5 @@
+@@ -1389,7 +1449,7 @@
+   ac_save_LIBS="$LIBS"
  LIBS="-lsocket  $LIBS"
  cat > conftest.$ac_ext <<EOF
--#line 1315 "configure"
-+#line 1427 "configure"
+-#line 1393 "configure"
++#line 1453 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -1319,13 +1431,14 @@
- char socket();
- 
--int main() { return 0; }
--int t() {
-+int main() {
+ /* We use char because int might match the return type of a gcc2
+@@ -1400,7 +1460,7 @@
  socket()
  ; return 0; }
  EOF
--if { (eval echo configure:1327: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
-+if { (eval echo configure:1438: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:1404: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:1464: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=no"
-@@ -1337,5 +1450,6 @@
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
--    ac_tr_lib=HAVE_LIB`echo socket | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-+    ac_tr_lib=HAVE_LIB`echo socket | sed -e 's/[^a-zA-Z0-9_]/_/g' \
-+    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
-   cat >> confdefs.h <<EOF
- #define $ac_tr_lib 1
-@@ -1348,6 +1462,7 @@
+@@ -1428,7 +1488,7 @@
  fi
  
--echo $ac_n "checking for -lelf""... $ac_c" 1>&6
--ac_lib_var=`echo elf'_'nlist | tr './+\055' '__p_'`
-+echo $ac_n "checking for nlist in -lelf""... $ac_c" 1>&6
-+echo "configure:1466: checking for nlist in -lelf" >&5
-+ac_lib_var=`echo elf'_'nlist | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for nlist in -lelf""... $ac_c" 1>&6
+-echo "configure:1432: checking for nlist in -lelf" >&5
++echo "configure:1492: checking for nlist in -lelf" >&5
+ ac_lib_var=`echo elf'_'nlist | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -1356,5 +1471,5 @@
+@@ -1436,7 +1496,7 @@
+   ac_save_LIBS="$LIBS"
  LIBS="-lelf  $LIBS"
  cat > conftest.$ac_ext <<EOF
--#line 1359 "configure"
-+#line 1474 "configure"
+-#line 1440 "configure"
++#line 1500 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -1363,13 +1478,14 @@
- char nlist();
- 
--int main() { return 0; }
--int t() {
-+int main() {
+ /* We use char because int might match the return type of a gcc2
+@@ -1447,7 +1507,7 @@
  nlist()
  ; return 0; }
  EOF
--if { (eval echo configure:1371: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
-+if { (eval echo configure:1485: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:1451: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:1511: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=no"
-@@ -1381,5 +1497,6 @@
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
--    ac_tr_lib=HAVE_LIB`echo elf | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-+    ac_tr_lib=HAVE_LIB`echo elf | sed -e 's/[^a-zA-Z0-9_]/_/g' \
-+    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
-   cat >> confdefs.h <<EOF
- #define $ac_tr_lib 1
-@@ -1392,6 +1509,7 @@
+@@ -1475,7 +1535,7 @@
  fi
  
--echo $ac_n "checking for -lld""... $ac_c" 1>&6
--ac_lib_var=`echo ld'_'ldopen | tr './+\055' '__p_'`
-+echo $ac_n "checking for ldopen in -lld""... $ac_c" 1>&6
-+echo "configure:1513: checking for ldopen in -lld" >&5
-+ac_lib_var=`echo ld'_'ldopen | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for ldopen in -lld""... $ac_c" 1>&6
+-echo "configure:1479: checking for ldopen in -lld" >&5
++echo "configure:1539: checking for ldopen in -lld" >&5
+ ac_lib_var=`echo ld'_'ldopen | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -1400,5 +1518,5 @@
+@@ -1483,7 +1543,7 @@
+   ac_save_LIBS="$LIBS"
  LIBS="-lld  $LIBS"
  cat > conftest.$ac_ext <<EOF
--#line 1403 "configure"
-+#line 1521 "configure"
+-#line 1487 "configure"
++#line 1547 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -1407,13 +1525,14 @@
- char ldopen();
- 
--int main() { return 0; }
--int t() {
-+int main() {
+ /* We use char because int might match the return type of a gcc2
+@@ -1494,7 +1554,7 @@
  ldopen()
  ; return 0; }
  EOF
--if { (eval echo configure:1415: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
-+if { (eval echo configure:1532: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:1498: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:1558: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=no"
-@@ -1425,5 +1544,6 @@
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
--    ac_tr_lib=HAVE_LIB`echo ld | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-+    ac_tr_lib=HAVE_LIB`echo ld | sed -e 's/[^a-zA-Z0-9_]/_/g' \
-+    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
-   cat >> confdefs.h <<EOF
- #define $ac_tr_lib 1
-@@ -1436,6 +1556,7 @@
+@@ -1522,7 +1582,7 @@
  fi
  
--echo $ac_n "checking for -ldl""... $ac_c" 1>&6
--ac_lib_var=`echo dl'_'dlopen | tr './+\055' '__p_'`
-+echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
-+echo "configure:1560: checking for dlopen in -ldl" >&5
-+ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
+-echo "configure:1526: checking for dlopen in -ldl" >&5
++echo "configure:1586: checking for dlopen in -ldl" >&5
+ ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -1444,5 +1565,5 @@
+@@ -1530,7 +1590,7 @@
+   ac_save_LIBS="$LIBS"
  LIBS="-ldl  $LIBS"
  cat > conftest.$ac_ext <<EOF
--#line 1447 "configure"
-+#line 1568 "configure"
+-#line 1534 "configure"
++#line 1594 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -1451,13 +1572,14 @@
- char dlopen();
- 
--int main() { return 0; }
--int t() {
-+int main() {
+ /* We use char because int might match the return type of a gcc2
+@@ -1541,7 +1601,7 @@
  dlopen()
  ; return 0; }
  EOF
--if { (eval echo configure:1459: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
-+if { (eval echo configure:1579: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:1545: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:1605: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=no"
-@@ -1469,5 +1591,6 @@
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
--    ac_tr_lib=HAVE_LIB`echo dl | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-+    ac_tr_lib=HAVE_LIB`echo dl | sed -e 's/[^a-zA-Z0-9_]/_/g' \
-+    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
-   cat >> confdefs.h <<EOF
- #define $ac_tr_lib 1
-@@ -1480,6 +1603,7 @@
+@@ -1569,7 +1629,7 @@
  fi
  
--echo $ac_n "checking for -ldld""... $ac_c" 1>&6
--ac_lib_var=`echo dld'_'shl_findsym | tr './+\055' '__p_'`
-+echo $ac_n "checking for shl_findsym in -ldld""... $ac_c" 1>&6
-+echo "configure:1607: checking for shl_findsym in -ldld" >&5
-+ac_lib_var=`echo dld'_'shl_findsym | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for shl_findsym in -ldld""... $ac_c" 1>&6
+-echo "configure:1573: checking for shl_findsym in -ldld" >&5
++echo "configure:1633: checking for shl_findsym in -ldld" >&5
+ ac_lib_var=`echo dld'_'shl_findsym | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -1488,5 +1612,5 @@
+@@ -1577,7 +1637,7 @@
+   ac_save_LIBS="$LIBS"
  LIBS="-ldld  $LIBS"
  cat > conftest.$ac_ext <<EOF
--#line 1491 "configure"
-+#line 1615 "configure"
+-#line 1581 "configure"
++#line 1641 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -1495,13 +1619,14 @@
- char shl_findsym();
- 
--int main() { return 0; }
--int t() {
-+int main() {
+ /* We use char because int might match the return type of a gcc2
+@@ -1588,7 +1648,7 @@
  shl_findsym()
  ; return 0; }
  EOF
--if { (eval echo configure:1503: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
-+if { (eval echo configure:1626: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:1592: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:1652: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=no"
-@@ -1513,5 +1638,6 @@
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
--    ac_tr_lib=HAVE_LIB`echo dld | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-+    ac_tr_lib=HAVE_LIB`echo dld | sed -e 's/[^a-zA-Z0-9_]/_/g' \
-+    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
-   cat >> confdefs.h <<EOF
- #define $ac_tr_lib 1
-@@ -1526,9 +1652,10 @@
+@@ -1617,12 +1677,12 @@
+ 
  
  echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
-+echo "configure:1655: checking return type of signal handlers" >&5
+-echo "configure:1621: checking return type of signal handlers" >&5
++echo "configure:1681: checking return type of signal handlers" >&5
  if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
--#line 1533 "configure"
-+#line 1660 "configure"
+-#line 1626 "configure"
++#line 1686 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
-@@ -1543,18 +1670,18 @@
- #endif
- 
--int main() { return 0; }
--int t() {
-+int main() {
+ #include <signal.h>
+@@ -1639,7 +1699,7 @@
  int i;
  ; return 0; }
  EOF
--if { (eval echo configure:1551: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:1677: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+-if { (eval echo configure:1643: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:1703: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_type_signal=void
  else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-   rm -rf conftest*
-   ac_cv_type_signal=int
- fi
- rm -f conftest*
--
- fi
+@@ -1658,7 +1718,7 @@
  
-@@ -1566,4 +1693,5 @@
  
  echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-+echo "configure:1696: checking how to run the C preprocessor" >&5
+-echo "configure:1662: checking how to run the C preprocessor" >&5
++echo "configure:1722: checking how to run the C preprocessor" >&5
  # On Suns, sometimes $CPP names a directory.
  if test -n "$CPP" && test -d "$CPP"; then
-@@ -1580,5 +1708,5 @@
+   CPP=
+@@ -1673,14 +1733,14 @@
+   # On the NeXT, cc -E runs the code through the compiler's parser,
    # not just through cpp.
    cat > conftest.$ac_ext <<EOF
--#line 1583 "configure"
-+#line 1711 "configure"
+-#line 1677 "configure"
++#line 1737 "configure"
  #include "confdefs.h"
  #include <assert.h>
-@@ -1586,14 +1714,16 @@
+ Syntax Error
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:1589: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+-{ (eval echo configure:1683: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 -ac_err=`grep -v '^ *+' conftest.out`
-+{ (eval echo configure:1717: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:1743: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    :
  else
-   echo "$ac_err" >&5
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
+@@ -1690,14 +1750,31 @@
    rm -rf conftest*
    CPP="${CC-cc} -E -traditional-cpp"
    cat > conftest.$ac_ext <<EOF
--#line 1598 "configure"
-+#line 1728 "configure"
- #include "confdefs.h"
- #include <assert.h>
-@@ -1601,10 +1731,29 @@
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:1604: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
--ac_err=`grep -v '^ *+' conftest.out`
-+{ (eval echo configure:1734: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   :
- else
-   echo "$ac_err" >&5
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  CPP="${CC-cc} -nologo -E"
-+  cat > conftest.$ac_ext <<EOF
-+#line 1745 "configure"
+-#line 1694 "configure"
++#line 1754 "configure"
 +#include "confdefs.h"
 +#include <assert.h>
 +Syntax Error
 +EOF
 +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-+{ (eval echo configure:1751: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:1760: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 +if test -z "$ac_err"; then
 +  :
@@ -984,429 +749,346 @@ changes.
 +  echo "$ac_err" >&5
 +  echo "configure: failed program was:" >&5
 +  cat conftest.$ac_ext >&5
-   rm -rf conftest*
-   CPP=/lib/cpp
-@@ -1613,4 +1762,6 @@
++  rm -rf conftest*
++  CPP="${CC-cc} -nologo -E"
++  cat > conftest.$ac_ext <<EOF
++#line 1771 "configure"
+ #include "confdefs.h"
+ #include <assert.h>
+ Syntax Error
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:1700: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+-ac_err=`grep -v '^ *+' conftest.out`
++{ (eval echo configure:1777: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   :
+ else
+@@ -1710,6 +1787,8 @@
+ rm -f conftest*
  fi
  rm -f conftest*
 +fi
 +rm -f conftest*
    ac_cv_prog_CPP="$CPP"
  fi
-@@ -1623,17 +1774,18 @@
- for ac_hdr in libgen.h sys/timeb.h posix/time.h sys/select.h nlist.h
+   CPP="$ac_cv_prog_CPP"
+@@ -1722,18 +1801,18 @@
  do
--ac_safe=`echo "$ac_hdr" | tr './\055' '___'`
-+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-+echo "configure:1779: checking for $ac_hdr" >&5
+-echo "configure:1726: checking for $ac_hdr" >&5
++echo "configure:1805: checking for $ac_hdr" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
--#line 1632 "configure"
-+#line 1784 "configure"
+-#line 1731 "configure"
++#line 1810 "configure"
  #include "confdefs.h"
  #include <$ac_hdr>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:1637: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+-{ (eval echo configure:1736: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 -ac_err=`grep -v '^ *+' conftest.out`
-+{ (eval echo configure:1789: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:1815: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
-@@ -1641,4 +1793,6 @@
+   eval "ac_cv_header_$ac_safe=yes"
+@@ -1762,18 +1841,18 @@
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:1766: checking for $ac_hdr" >&5
++echo "configure:1845: checking for $ac_hdr" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
  else
-   echo "$ac_err" >&5
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
+   cat > conftest.$ac_ext <<EOF
+-#line 1771 "configure"
++#line 1850 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:1776: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+-ac_err=`grep -v '^ *+' conftest.out`
++{ (eval echo configure:1855: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
    rm -rf conftest*
-   eval "ac_cv_header_$ac_safe=no"
-@@ -1648,5 +1802,5 @@
- if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
--    ac_tr_hdr=HAVE_`echo $ac_hdr | tr 'abcdefghijklmnopqrstuvwxyz./\055' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ___'`
-+    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-   cat >> confdefs.h <<EOF
- #define $ac_tr_hdr 1
-@@ -1661,9 +1815,10 @@
+   eval "ac_cv_header_$ac_safe=yes"
+@@ -1801,12 +1880,12 @@
+ for ac_func in strerror
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-+echo "configure:1818: checking for $ac_func" >&5
+-echo "configure:1805: checking for $ac_func" >&5
++echo "configure:1884: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
--#line 1668 "configure"
-+#line 1823 "configure"
+-#line 1810 "configure"
++#line 1889 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
-@@ -1675,6 +1830,5 @@
- char $ac_func();
+     which can conflict with char $ac_func(); below.  */
+@@ -1829,7 +1908,7 @@
  
--int main() { return 0; }
--int t() {
-+int main() {
- 
- /* The GNU C library defines this for functions which it implements
-@@ -1689,14 +1843,16 @@
  ; return 0; }
  EOF
--if { (eval echo configure:1692: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
-+if { (eval echo configure:1846: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:1833: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:1912: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=no"
- fi
- rm -f conftest*
--
- fi
-+
- if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
-@@ -1714,9 +1870,10 @@
+@@ -1856,12 +1935,12 @@
+ for ac_func in dlopen gettimeofday ftime nlist select setitimer sigaction
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-+echo "configure:1873: checking for $ac_func" >&5
+-echo "configure:1860: checking for $ac_func" >&5
++echo "configure:1939: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
--#line 1721 "configure"
-+#line 1878 "configure"
+-#line 1865 "configure"
++#line 1944 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
-@@ -1728,6 +1885,5 @@
- char $ac_func();
- 
--int main() { return 0; }
--int t() {
-+int main() {
+     which can conflict with char $ac_func(); below.  */
+@@ -1884,7 +1963,7 @@
  
- /* The GNU C library defines this for functions which it implements
-@@ -1742,14 +1898,16 @@
  ; return 0; }
  EOF
--if { (eval echo configure:1745: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
-+if { (eval echo configure:1901: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:1888: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:1967: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=no"
- fi
- rm -f conftest*
--
- fi
-+
- if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
-@@ -1767,9 +1925,10 @@
+@@ -1911,12 +1990,12 @@
+ for ac_func in socket chroot
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-+echo "configure:1928: checking for $ac_func" >&5
+-echo "configure:1915: checking for $ac_func" >&5
++echo "configure:1994: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
--#line 1774 "configure"
-+#line 1933 "configure"
+-#line 1920 "configure"
++#line 1999 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
-@@ -1781,6 +1940,5 @@
- char $ac_func();
- 
--int main() { return 0; }
--int t() {
-+int main() {
+     which can conflict with char $ac_func(); below.  */
+@@ -1939,7 +2018,7 @@
  
- /* The GNU C library defines this for functions which it implements
-@@ -1795,14 +1953,16 @@
  ; return 0; }
  EOF
--if { (eval echo configure:1798: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
-+if { (eval echo configure:1956: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:1943: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:2022: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=no"
- fi
- rm -f conftest*
--
- fi
-+
- if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
-@@ -1820,4 +1980,5 @@
+@@ -1966,7 +2045,7 @@
+ 
  
    echo $ac_n "checking for RISC/OS POSIX library lossage""... $ac_c" 1>&6
-+echo "configure:1983: checking for RISC/OS POSIX library lossage" >&5
+-echo "configure:1970: checking for RISC/OS POSIX library lossage" >&5
++echo "configure:2049: checking for RISC/OS POSIX library lossage" >&5
    if eval "test \"`echo '$''{'s48_cv_posix_libc'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -1838,4 +1999,5 @@
+ else
+@@ -1985,7 +2064,7 @@
+ 
  
    echo $ac_n "checking whether we can use -O2""... $ac_c" 1>&6
-+echo "configure:2002: checking whether we can use -O2" >&5
+-echo "configure:1989: checking whether we can use -O2" >&5
++echo "configure:2068: checking whether we can use -O2" >&5
    if eval "test \"`echo '$''{'s48_cv_cflag_o2'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -1865,4 +2027,5 @@
+ else
+@@ -2013,7 +2092,7 @@
+ 
  
    echo $ac_n "checking for underscore before symbols""... $ac_c" 1>&6
-+echo "configure:2030: checking for underscore before symbols" >&5
+-echo "configure:2017: checking for underscore before symbols" >&5
++echo "configure:2096: checking for underscore before symbols" >&5
    if eval "test \"`echo '$''{'s48_cv_uscore'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -1890,4 +2053,5 @@
+ else
+@@ -2039,7 +2118,7 @@
+ 
      if test $ac_cv_func_dlopen = yes ; then
  	echo $ac_n "checking whether dlsym always adds an underscore for us""... $ac_c" 1>&6
-+echo "configure:2056: checking whether dlsym always adds an underscore for us" >&5
+-echo "configure:2043: checking whether dlsym always adds an underscore for us" >&5
++echo "configure:2122: checking whether dlsym always adds an underscore for us" >&5
  	if eval "test \"`echo '$''{'s48_cv_dlsym_adds_uscore'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -1896,6 +2060,6 @@
+ else
+@@ -2047,7 +2126,7 @@
      { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
  else
--cat > conftest.$ac_ext <<EOF
--#line 1900 "configure"
-+  cat > conftest.$ac_ext <<EOF
-+#line 2064 "configure"
+   cat > conftest.$ac_ext <<EOF
+-#line 2051 "configure"
++#line 2130 "configure"
  #include "confdefs.h"
  
-@@ -1908,6 +2072,6 @@
+ #include <dlfcn.h>
+@@ -2058,7 +2137,7 @@
+     if(ptr1 && !ptr2) exit(0); } exit(1); } 
  
  EOF
--{ (eval echo configure:1911: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
--if test -s conftest && (./conftest; exit) 2>/dev/null; then
-+if { (eval echo configure:2075: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+then
+-if { (eval echo configure:2062: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:2141: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
    s48_cv_dlsym_adds_uscore=yes
  	cat >> confdefs.h <<\EOF
-@@ -1916,10 +2080,14 @@
-  
- else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -fr conftest*
-   s48_cv_dlsym_adds_uscore=no
- fi
--fi
- rm -fr conftest*
- fi
- 
-+fi
-+
+@@ -2083,13 +2162,13 @@
  
-         echo "$ac_t""$s48_cv_dlsym_adds_uscore" 1>&6
-@@ -1929,4 +2097,5 @@
  
    echo $ac_n "checking for n_name""... $ac_c" 1>&6
-+echo "configure:2100: checking for n_name" >&5
+-echo "configure:2087: checking for n_name" >&5
++echo "configure:2166: checking for n_name" >&5
    if eval "test \"`echo '$''{'s48_cv_nlist'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -1934,22 +2103,22 @@
+ else
    
      cat > conftest.$ac_ext <<EOF
--#line 1937 "configure"
-+#line 2106 "configure"
+-#line 2093 "configure"
++#line 2172 "configure"
  #include "confdefs.h"
  #include <nlist.h>
--int main() { return 0; }
--int t() {
-+int main() {
- struct nlist name_list;
+ int main() {
+@@ -2097,7 +2176,7 @@
                      name_list.n_name = "foo";
  ; return 0; }
  EOF
--if { (eval echo configure:1946: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:2114: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+-if { (eval echo configure:2101: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:2180: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    s48_cv_nlist=yes
  else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-   rm -rf conftest*
-   s48_cv_nlist=no
- fi
- rm -f conftest*
--
- fi
+@@ -2119,20 +2198,20 @@
  
-@@ -1964,4 +2133,5 @@
  
    echo $ac_n "checking for _cnt""... $ac_c" 1>&6
-+echo "configure:2136: checking for _cnt" >&5
+-echo "configure:2123: checking for _cnt" >&5
++echo "configure:2202: checking for _cnt" >&5
    if eval "test \"`echo '$''{'s48_cv__cnt'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -1969,21 +2139,21 @@
+ else
    
      cat > conftest.$ac_ext <<EOF
--#line 1972 "configure"
-+#line 2142 "configure"
+-#line 2129 "configure"
++#line 2208 "configure"
  #include "confdefs.h"
  #include <stdio.h>
--int main() { return 0; }
--int t() {
-+int main() {
+ int main() {
  return stdin->_cnt;
  ; return 0; }
  EOF
--if { (eval echo configure:1980: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:2149: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+-if { (eval echo configure:2136: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:2215: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    s48_cv__cnt=yes
  else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-   rm -rf conftest*
-   s48_cv__cnt=no
- fi
- rm -f conftest*
--
- fi
+@@ -2155,20 +2234,20 @@
  
-@@ -1999,4 +2169,5 @@
  
    echo $ac_n "checking for tzname""... $ac_c" 1>&6
-+echo "configure:2172: checking for tzname" >&5
+-echo "configure:2159: checking for tzname" >&5
++echo "configure:2238: checking for tzname" >&5
    if eval "test \"`echo '$''{'scsh_cv_tzname'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -2004,21 +2175,21 @@
+ else
    
      cat > conftest.$ac_ext <<EOF
--#line 2007 "configure"
-+#line 2178 "configure"
+-#line 2165 "configure"
++#line 2244 "configure"
  #include "confdefs.h"
  #include <time.h>
--int main() { return 0; }
--int t() {
-+int main() {
+ int main() {
  return (int) tzname;
  ; return 0; }
  EOF
--if { (eval echo configure:2015: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:2185: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+-if { (eval echo configure:2172: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:2251: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    scsh_cv_tzname=yes
  else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-   rm -rf conftest*
-   scsh_cv_tzname=no
- fi
- rm -f conftest*
--
- fi
+@@ -2190,13 +2269,13 @@
  
-@@ -2033,4 +2204,5 @@
  
    echo $ac_n "checking for gmtoff""... $ac_c" 1>&6
-+echo "configure:2207: checking for gmtoff" >&5
+-echo "configure:2194: checking for gmtoff" >&5
++echo "configure:2273: checking for gmtoff" >&5
    if eval "test \"`echo '$''{'scsh_cv_gmtoff'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -2038,22 +2210,22 @@
+ else
    
      cat > conftest.$ac_ext <<EOF
--#line 2041 "configure"
-+#line 2213 "configure"
+-#line 2200 "configure"
++#line 2279 "configure"
  #include "confdefs.h"
  #include <time.h>
--int main() { return 0; }
--int t() {
-+int main() {
- struct tm time;
+ int main() {
+@@ -2204,7 +2283,7 @@
  		    return time.tm_gmtoff;
  ; return 0; }
  EOF
--if { (eval echo configure:2050: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:2221: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+-if { (eval echo configure:2208: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:2287: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    scsh_cv_gmtoff=yes
  else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-   rm -rf conftest*
-   scsh_cv_gmtoff=no
- fi
- rm -f conftest*
--
- fi
+@@ -2226,13 +2305,13 @@
  
-@@ -2068,4 +2240,5 @@
  
    echo $ac_n "checking for const sys_errlist""... $ac_c" 1>&6
-+echo "configure:2243: checking for const sys_errlist" >&5
+-echo "configure:2230: checking for const sys_errlist" >&5
++echo "configure:2309: checking for const sys_errlist" >&5
    if eval "test \"`echo '$''{'scsh_cv_const_sys_errlist'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -2073,22 +2246,22 @@
+ else
    
      cat > conftest.$ac_ext <<EOF
--#line 2076 "configure"
-+#line 2249 "configure"
+-#line 2236 "configure"
++#line 2315 "configure"
  #include "confdefs.h"
  #include <errno.h>
                      #include <unistd.h>
--int main() { return 0; }
--int t() {
-+int main() {
+@@ -2240,7 +2319,7 @@
  const extern char *sys_errlist[];
  ; return 0; }
  EOF
--if { (eval echo configure:2085: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:2257: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+-if { (eval echo configure:2244: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:2323: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    scsh_cv_const_sys_errlist=yes
  else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-   rm -rf conftest*
-   scsh_cv_const_sys_errlist=no
- fi
- rm -f conftest*
--
- fi
- 
-@@ -2132,9 +2305,23 @@
- #
- EOF
-+# The following way of writing the cache mishandles newlines in values,
-+# but we know of no workaround that is simple, portable, and efficient.
-+# So, don't put newlines in cache variables' values.
+@@ -2298,7 +2377,7 @@
  # Ultrix sh set writes to stderr and can't be redirected directly,
  # and sets the high bit in the cache file unless we assign to the vars.
  (set) 2>&1 |
--  sed -n "s/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=\${\1='\2'}/p" \
--  >> confcache
+-  case `(ac_space=' '; set) 2>&1` in
 +  case `(ac_space=' '; set | grep ac_space) 2>&1` in
-+  *ac_space=\ *)
-+    # `set' does not quote correctly, so add quotes (double-quote substitution
-+    # turns \\\\ into \\, and sed turns \\ into \).
-+    sed -n \
-+      -e "s/'/'\\\\''/g" \
-+      -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
-+    ;;
-+  *)
-+    # `set' quotes correctly as required by POSIX, so do not add quotes.
-+    sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
-+    ;;
-+  esac >> confcache
- if cmp -s $cache_file confcache; then
-   :
-@@ -2191,5 +2378,5 @@
+   *ac_space=\ *)
+     # `set' does not quote correctly, so add quotes (double-quote substitution
+     # turns \\\\ into \\, and sed turns \\ into \).
+@@ -2365,7 +2444,7 @@
+     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.10"
+-    echo "$CONFIG_STATUS generated by autoconf version 2.12"
 +    echo "$CONFIG_STATUS generated by autoconf version 2.13"
      exit 0 ;;
    -help | --help | --hel | --he | --h)
-@@ -2211,7 +2398,9 @@
+     echo "\$ac_cs_usage"; exit 0 ;;
+@@ -2385,9 +2464,11 @@
+  s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
  $ac_vpsub
  $extrasub
 +s%@SHELL@%$SHELL%g
@@ -1416,133 +1098,12 @@ changes.
 +s%@FFLAGS@%$FFLAGS%g
  s%@DEFS@%$DEFS%g
  s%@LDFLAGS@%$LDFLAGS%g
-@@ -2239,4 +2428,5 @@
+ s%@LIBS@%$LIBS%g
+@@ -2413,6 +2494,7 @@
+ s%@host_os@%$host_os%g
  s%@CC@%$CC%g
  s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
 +s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
  s%@INSTALL_DATA@%$INSTALL_DATA%g
  s%@RANLIB@%$RANLIB%g
-@@ -2251,4 +2441,40 @@
- CEOF
- EOF
-+
-+cat >> $CONFIG_STATUS <<\EOF
-+
-+# Split the substitutions into bite-sized pieces for seds with
-+# small command number limits, like on Digital OSF/1 and HP-UX.
-+ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
-+ac_file=1 # Number of current file.
-+ac_beg=1 # First line for current file.
-+ac_end=$ac_max_sed_cmds # Line after last line for current file.
-+ac_more_lines=:
-+ac_sed_cmds=""
-+while $ac_more_lines; do
-+  if test $ac_beg -gt 1; then
-+    sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file
-+  else
-+    sed "${ac_end}q" conftest.subs > conftest.s$ac_file
-+  fi
-+  if test ! -s conftest.s$ac_file; then
-+    ac_more_lines=false
-+    rm -f conftest.s$ac_file
-+  else
-+    if test -z "$ac_sed_cmds"; then
-+      ac_sed_cmds="sed -f conftest.s$ac_file"
-+    else
-+      ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file"
-+    fi
-+    ac_file=`expr $ac_file + 1`
-+    ac_beg=$ac_end
-+    ac_end=`expr $ac_end + $ac_max_sed_cmds`
-+  fi
-+done
-+if test -z "$ac_sed_cmds"; then
-+  ac_sed_cmds=cat
-+fi
-+EOF
-+
- cat >> $CONFIG_STATUS <<EOF
- 
-@@ -2257,12 +2483,12 @@
- cat >> $CONFIG_STATUS <<\EOF
- for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
--  # Support "outfile[:infile]", defaulting infile="outfile.in".
-+  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-   case "$ac_file" in
--  *:*) ac_file_in=`echo "$ac_file"|sed 's%.*:%%'`
-+  *:*) 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.
-+  # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories.
- 
-   # Remove last slash and all that follows it.  Not all systems have dirname.
-@@ -2292,4 +2518,5 @@
-   *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
-   esac
-+
-   echo creating "$ac_file"
-   rm -f "$ac_file"
-@@ -2300,4 +2527,6 @@
-   *) ac_comsub= ;;
-   esac
-+
-+  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
-   sed -e "$ac_comsub
- s%@configure_input@%$configure_input%g
-@@ -2305,7 +2534,7 @@
- s%@top_srcdir@%$top_srcdir%g
- s%@INSTALL@%$INSTALL%g
--" -f conftest.subs $ac_given_srcdir/$ac_file_in > $ac_file
-+" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file
- fi; done
--rm -f conftest.subs
-+rm -f conftest.s*
- 
- # These sed commands are passed to sed as "A NAME B NAME C VALUE D", where
-@@ -2328,9 +2557,15 @@
- ac_eD='%g'
- 
--CONFIG_HEADERS=${CONFIG_HEADERS-"sysdep.h"}
-+if test "${CONFIG_HEADERS+set}" != set; then
-+EOF
-+cat >> $CONFIG_STATUS <<EOF
-+  CONFIG_HEADERS="sysdep.h"
-+EOF
-+cat >> $CONFIG_STATUS <<\EOF
-+fi
- for ac_file in .. $CONFIG_HEADERS; do if test "x$ac_file" != x..; then
--  # Support "outfile[:infile]", defaulting infile="outfile.in".
-+  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-   case "$ac_file" in
--  *:*) ac_file_in=`echo "$ac_file"|sed 's%.*:%%'`
-+  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
-        ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-   *) ac_file_in="${ac_file}.in" ;;
-@@ -2340,5 +2575,6 @@
- 
-   rm -f conftest.frag conftest.in conftest.out
--  cp $ac_given_srcdir/$ac_file_in conftest.in
-+  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
-+  cat $ac_file_inputs > conftest.in
- 
- EOF
-@@ -2368,6 +2604,4 @@
- # Break up conftest.vals because some shells have a limit on
- # the size of here documents, and old seds have small limits too.
--# Maximum number of lines to put in a single here document.
--ac_max_here_lines=12
- 
- rm -f conftest.tail
-@@ -2411,5 +2645,9 @@
- fi; done
- 
-+EOF
-+cat >> $CONFIG_STATUS <<EOF
- 
-+EOF
-+cat >> $CONFIG_STATUS <<\EOF
- 
- exit 0
+ s%@CPP@%$CPP%g
diff --git a/shells/scsh/patches/patch-ak b/shells/scsh/patches/patch-ak
new file mode 100644
index 00000000000..6d36ca9f3f3
--- /dev/null
+++ b/shells/scsh/patches/patch-ak
@@ -0,0 +1,13 @@
+$NetBSD: patch-ak,v 1.1 2001/02/27 19:37:47 wiz Exp $
+
+--- scsh/lib/string-lib.scm.orig	Wed Sep 15 16:28:11 1999
++++ scsh/lib/string-lib.scm	Sun Oct  1 06:44:22 2000
+@@ -1139,7 +1139,7 @@
+ ;	((< i start) ans))))
+ 
+ (define (string->list s . maybe-start+end)
+-  (apply string-fold-right s cons '() maybe-start+end))
++  (apply string-fold-right cons '() s maybe-start+end))
+ 
+ 
+ 
diff --git a/shells/scsh/patches/patch-al b/shells/scsh/patches/patch-al
new file mode 100644
index 00000000000..52e89708690
--- /dev/null
+++ b/shells/scsh/patches/patch-al
@@ -0,0 +1,12 @@
+$NetBSD: patch-al,v 1.1 2001/02/27 19:37:47 wiz Exp $
+
+--- scsh/rx/packages.scm.orig	Sun Oct  1 07:12:16 2000
++++ scsh/rx/packages.scm	Sun Oct  1 07:12:33 2000
+@@ -174,6 +174,7 @@
+ 						   :boolean))
+ 			      (sre->regexp (proc (:value) :value))
+ 			      (regexp->sre (proc (:value) :value))
++			      nonl-chars
+ 			      )))
+ 
+ 
diff --git a/shells/scsh/patches/patch-am b/shells/scsh/patches/patch-am
new file mode 100644
index 00000000000..9b53c1810d1
--- /dev/null
+++ b/shells/scsh/patches/patch-am
@@ -0,0 +1,13 @@
+$NetBSD: patch-am,v 1.1 2001/02/27 19:37:47 wiz Exp $
+
+--- scsh/rdelim.scm.orig	Sun Oct  1 07:27:57 2000
++++ scsh/rdelim.scm	Sun Oct  1 07:28:50 2000
+@@ -192,7 +192,7 @@
+ 		     (values c (- i start)))
+ 
+ 		    ((>= i end)			; Filled the buffer.
+-		     (if gobble? (read-char port))
++		     ; [loses one character at end of full line buffer] (if gobble? (read-char port))
+ 		     (values #f (- i start)))
+ 			
+ 		    (else (string-set! buf i (read-char port))
diff --git a/shells/scsh/patches/patch-an b/shells/scsh/patches/patch-an
new file mode 100644
index 00000000000..489e7c8000c
--- /dev/null
+++ b/shells/scsh/patches/patch-an
@@ -0,0 +1,12 @@
+$NetBSD: patch-an,v 1.1 2001/02/27 19:37:47 wiz Exp $
+
+--- scsh/scsh-package.scm.orig	Sun Oct  1 22:00:10 2000
++++ scsh/scsh-package.scm	Sun Oct  1 22:01:34 2000
+@@ -178,6 +178,7 @@
+ 
+ 	re-level-0
+ 	rx-syntax
++	let-match-package
+ 
+ 	string-lib
+ 
diff --git a/shells/scsh/patches/patch-ao b/shells/scsh/patches/patch-ao
new file mode 100644
index 00000000000..a3779eb6bf0
--- /dev/null
+++ b/shells/scsh/patches/patch-ao
@@ -0,0 +1,9 @@
+$NetBSD: patch-ao,v 1.1 2001/02/27 19:37:48 wiz Exp $
+
+--- scsh/rdelim.c.orig	Thu Oct  5 15:45:04 2000
++++ scsh/rdelim.c	Thu Oct  5 15:46:20 2000
+@@ -1,3 +1,4 @@
++/* this comment added so that BSD make DTRT after we touch scsh/rdelim.scm */
+ /* This is an Scheme48/C interface file, 
+ ** automatically generated by cig.
+ */
diff --git a/shells/scsh/pkg/DESCR b/shells/scsh/pkg/DESCR
index 03cda1fcaa0..00926570f8e 100644
--- a/shells/scsh/pkg/DESCR
+++ b/shells/scsh/pkg/DESCR
@@ -9,15 +9,15 @@ rules.
 
 Scsh is also a full implementation of R4RS Scheme with some
 non-standard behavior (required for scripting). As a result, a wide
-varity of exiting Scheme code can be used.
+variety of existing Scheme code can be used.
 
 The underlying Scheme implementation is a virtual machine for compact
 byte code.
 
 The name of the installed program is "scsh", the manpage is scsh(1),
-other documentation is in (/usr/local/)lib/scsh/doc
+other documentation is in (/usr/pkg/)lib/scsh/doc
 
-To load slib, install slib into /usr/local/lib/slib and run 
+To load slib, install slib into (/usr/pkg/)lib/slib and run 
 (load "slib-init.scm") 
 in scsh. It requires no additional setup (paths or such).
 
diff --git a/shells/scsh/pkg/PLIST b/shells/scsh/pkg/PLIST
index c4c1c6534f7..b1f713891af 100644
--- a/shells/scsh/pkg/PLIST
+++ b/shells/scsh/pkg/PLIST
@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST,v 1.4 1998/05/09 00:14:24 hubertf Exp $
+@comment $NetBSD: PLIST,v 1.5 2001/02/27 19:37:48 wiz Exp $
 bin/scsh
-man/man1/scsh.1.gz
+include/scheme48.h
 lib/scsh/big/array.scm
 lib/scsh/big/big-util.scm
 lib/scsh/big/bigbit.scm
@@ -42,6 +42,7 @@ lib/scsh/doc/scsh-manual/network.tex
 lib/scsh/doc/scsh-manual/procnotation.tex
 lib/scsh/doc/scsh-manual/rdelim.tex
 lib/scsh/doc/scsh-manual/running.tex
+lib/scsh/doc/scsh-manual/sre.tex
 lib/scsh/doc/scsh-manual/strings.tex
 lib/scsh/doc/scsh-manual/syscalls.tex
 lib/scsh/doc/scsh-manual/test.tex
@@ -128,6 +129,42 @@ lib/scsh/opt/analyze.scm
 lib/scsh/opt/expand.scm
 lib/scsh/opt/inline.scm
 lib/scsh/opt/tst.scm
+lib/scsh/scsh/rx/cond-package.scm
+lib/scsh/scsh/rx/let-match.scm
+lib/scsh/scsh/rx/loadem.scm
+lib/scsh/scsh/rx/modules.scm
+lib/scsh/scsh/rx/oldfuns.scm
+lib/scsh/scsh/rx/packages-old.scm
+lib/scsh/scsh/rx/packages-old2.scm
+lib/scsh/scsh/rx/packages.scm
+lib/scsh/scsh/rx/parse.scm
+lib/scsh/scsh/rx/posixstr.scm
+lib/scsh/scsh/rx/re-fold.scm
+lib/scsh/scsh/rx/re-high.scm
+lib/scsh/scsh/rx/re-low.scm
+lib/scsh/scsh/rx/re-subst.scm
+lib/scsh/scsh/rx/re-syntax.scm
+lib/scsh/scsh/rx/re.scm
+lib/scsh/scsh/rx/regress.scm
+lib/scsh/scsh/rx/rx-lib.scm
+lib/scsh/scsh/rx/simp.scm
+lib/scsh/scsh/rx/spencer.scm
+lib/scsh/scsh/rx/test.scm
+lib/scsh/scsh/lib/ccp-pack.scm
+lib/scsh/scsh/lib/ccp.scm
+lib/scsh/scsh/lib/list-lib.scm
+lib/scsh/scsh/lib/list-pack.scm
+lib/scsh/scsh/lib/string-lib.scm
+lib/scsh/scsh/lib/string-pack.scm
+lib/scsh/scsh/machine/bufpol.scm
+lib/scsh/scsh/machine/errno.scm
+lib/scsh/scsh/machine/fdflags.scm
+lib/scsh/scsh/machine/netconst.scm
+lib/scsh/scsh/machine/packages.scm
+lib/scsh/scsh/machine/signals.scm
+lib/scsh/scsh/machine/time_dep.scm
+lib/scsh/scsh/machine/tty-consts.scm
+lib/scsh/scsh/machine/waitcodes.scm
 lib/scsh/scsh/awk.scm
 lib/scsh/scsh/char-set.scm
 lib/scsh/scsh/db.scm
@@ -153,10 +190,10 @@ lib/scsh/scsh/ndbm.scm
 lib/scsh/scsh/network.scm
 lib/scsh/scsh/pty.scm
 lib/scsh/scsh/newports.scm
+lib/scsh/scsh/old-static.scm
 lib/scsh/scsh/oldtop.scm
 lib/scsh/scsh/procobj.scm
 lib/scsh/scsh/rdelim.scm
-lib/scsh/scsh/re.scm
 lib/scsh/scsh/rw.scm
 lib/scsh/scsh/scsh-condition.scm
 lib/scsh/scsh/scsh-interfaces.scm
@@ -167,7 +204,9 @@ lib/scsh/scsh/scsh.scm
 lib/scsh/scsh/select.scm
 lib/scsh/scsh/sighandlers.scm
 lib/scsh/scsh/startup.scm
+lib/scsh/scsh/static-heap.scm
 lib/scsh/scsh/static.scm
+lib/scsh/scsh/static1.scm
 lib/scsh/scsh/stringcoll.scm
 lib/scsh/scsh/syntax-helpers.scm
 lib/scsh/scsh/syntax.scm
@@ -223,6 +262,7 @@ lib/scsh/emacs/cmuscheme48.el
 lib/scsh/emacs/cmushell.el
 lib/scsh/emacs/comint.el
 lib/scsh/emacs/jar-hacks.el
+man/man1/scsh.1
 @exec ln -fs %D/lib/scsh/doc %D/share/doc/scsh
 @unexec rm -f %D/share/doc/scsh
 @dirrm lib/scsh/emacs
@@ -234,6 +274,9 @@ lib/scsh/emacs/jar-hacks.el
 @dirrm lib/scsh/link
 @dirrm lib/scsh/misc
 @dirrm lib/scsh/opt
+@dirrm lib/scsh/scsh/rx
+@dirrm lib/scsh/scsh/lib
+@dirrm lib/scsh/scsh/machine
 @dirrm lib/scsh/scsh
 @dirrm lib/scsh/rts
 @dirrm lib/scsh/vm
author	wiz <wiz>	2001-02-27 19:37:46 +0000
committer	wiz <wiz>	2001-02-27 19:37:46 +0000
commit	e22f7dc9560a478e2543b442c5c824140b4f6eca (patch)
tree	a7b4c591ca3c5b3418faf41df3a74c83e15fc31b /shells/scsh
parent	1fa04b19217163f821e95cd32b05c0268044d2d2 (diff)
download	pkgsrc-e22f7dc9560a478e2543b442c5c824140b4f6eca.tar.gz