--- Configure.orig	2005-08-18 13:49:24.000000000 +0100
+++ Configure	2013-01-18 16:14:29.794050455 +0000
@@ -18,11 +18,6 @@
 PATH=".:/bin:/usr/bin:/usr/local/bin:/usr/ucb:/usr/local:/usr/lbin:/etc:/usr/new:/usr/new/bin:/usr/nbin:$PATH"
 export PATH || (echo "OOPS, this isn't sh.  Desperation time.  I will feed myself to sh."; sh $0; kill $$)
 
-if test ! -t 0; then
-    echo "Say 'sh Configure', not 'sh <Configure'"
-    exit 1
-fi
-
 (alias) >/dev/null 2>&1 && \
     echo "(I see you are using the Korn shell.  Some ksh's blow up on Configure," && \
     echo "especially on exotic machines.  If yours does, try the Bourne shell instead.)"
@@ -491,7 +486,6 @@
     c='\c'
 fi
 echo $n "Type carriage return to continue.  Your cursor should be here-->$c"
-read ans
 rm -f .echotmp
 
 : now set up to do reads with possible shell escape and default assignment
@@ -2058,6 +2052,7 @@
     libc=/usr/lib/libc.a
 else
 set /usr/ccs/lib/libc.so
+test -f $1 || set /usr/lib/libc.a
 test -f $1 || set /usr/lib/libc.so
 test -f $1 || set /usr/lib/libc.so.[0-9]*
 test -f $1 || set /lib/libsys_s.a
@@ -2111,7 +2106,7 @@
 set `echo $libc $libnames | tr ' ' '\012' | sort | uniq`
 $echo $n "Extracting names from $* for later perusal...$c"
 nm $nm_opts $* 2>/dev/null >libc.tmp
-$sed -n -e 's/^.* [ATDSU]  *[_.]*//p' -e 's/^.* [ATDSU] //p' <libc.tmp >libc.list
+$sed -n -e 's/^.* [ATDSUW]  *[_.]*//p' -e 's/^.* [ATDSUW] //p' <libc.tmp >libc.list
 if $contains '^printf$' libc.list >/dev/null 2>&1; then
     echo done
 elif $sed -n -e 's/^__*//' -e 's/^\([a-zA-Z_0-9$]*\).*xtern.*/\1/p' \
@@ -2499,7 +2494,10 @@
 #
 : see if crypt exists
 echo " "
-if $contains '^crypt$' libc.list >/dev/null 2>&1; then
+if $test "$cryptlib" = -lcrypt; then
+    echo 'crypt() found.'
+    d_crypt="$define"
+elif $contains '^crypt$' libc.list >/dev/null 2>&1; then
     echo 'crypt() found.'
     d_crypt="$define"
     cryptlib=''
@@ -5499,7 +5497,6 @@
 echo "If you didn't make any mistakes, then just type a carriage return here."
 rp="If you need to edit config.sh, do it as a shell escape here:"
 $echo $n "$rp $c"
-. UU/myread
 case "$ans" in
 '') ;;
 *) : in case they cannot read