$NetBSD: patch-aa,v 1.4 2016/03/11 08:18:12 tnn Exp $

--- Configure.orig	1992-02-10 03:04:23.000000000 +0000
+++ Configure
@@ -28,10 +28,10 @@ PATH=$PATH:'/sys5.3/bin:/sys5.3/usr/bin 
 PATH=$PATH:'/bsd4.3/usr/bin:/usr/bsd'
 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
+#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," && \
@@ -321,6 +321,8 @@ rm -f .echotmp
 
 : now set up to do reads with possible shell escape and default assignment
 cat <<EOSC >myread
+echo "ERROR: Configure script tried to use interactive prompt" 1>&2
+exit 1
 case "\$fastread" in
 yes) ans=''; echo " " ;;
 *) ans='!';;
@@ -364,7 +366,7 @@ where this is allowed will be marked "(~
 EOH
 rp="[Type carriage return to continue]"
 echo $n "$rp $c"
-. myread
+#. myread
 cat <<EOH
 
 Much effort has been expended to ensure that this shell script will run on
@@ -386,7 +388,7 @@ SH files.  Configure will offer to let y
 EOH
 rp="[Type carriage return to continue]"
 echo $n "$rp $c"
-. myread
+#. myread
 
 : get old answers, if there is a config file out there
 if test -f ../config.sh; then
@@ -616,7 +618,8 @@ EOM
 echo " "
 rp="Any additional libraries? [$dflt]"
 $echo $n "$rp $c"
-. myread
+#. myread
+ans="-lm"
 case "$ans" in
 none) ans='';
 esac
@@ -720,7 +723,14 @@ fi
 echo " "
 set `echo $libc $libnames | tr ' ' '\012' | sort | uniq`
 $echo $n "Extracting names from $* for later perusal...$c"
-nm $* 2>/dev/null >libc.tmp
+case "${OPSYS}" in
+DragonFly)
+	nm -D $* 2>/dev/null >libc.tmp
+	;;
+*)
+	nm $* 2>/dev/null >libc.tmp
+	;;
+esac
 $grep printf libc.tmp > libc.ptf
 com="$sed -n -e 's/^.* [ADTS]  *_[_.]*//p' -e 's/^.* [ADTS] //p'"
 eval "$com <libc.ptf >libc.list"
@@ -823,7 +833,8 @@ if $contains '^times$' libc.list >/dev/n
 	echo " "
 	rp="What type is returned by times() on this sytem? [$dflt]"
 	$echo $n "$rp $c"
-	. myread
+	#. myread
+	ans="clock_t"
 	clocktype="$ans"
 else
     echo 'times() not found, hope that will do.'
@@ -872,7 +883,7 @@ $eunicefix filexp
 : determine where manual pages are on this system
 echo " "
 case "$sysman" in
-	'') sysman=`loc . /usr/man/man1 /usr/man/man1 /usr/man/mann /usr/man/manl /usr/man/local/man1 /usr/man/u_man/man1 /usr/share/man/man1 /usr/catman/u_man/man1 /usr/man/l_man/man1 /usr/local/man/u_man/man1 /usr/local/man/l_man/man1 /usr/man/man.L`
+	'') sysman=`loc . /usr/local/man/man1 /usr/man/man1 /usr/man/mann /usr/man/manl /usr/man/local/man1 /usr/man/u_man/man1 /usr/share/man/man1 /usr/catman/u_man/man1 /usr/man/l_man/man1 /usr/local/man/u_man/man1 /usr/local/man/l_man/man1 /usr/man/man.L`
     ;;
 esac
 if test -d "$sysman"; then
@@ -1007,7 +1018,8 @@ Venix systems may wish to put "none" and
 EOM
 rp="Which models are supported? [$dflt]"
 $echo $n "$rp $c"
-. myread
+#. myread
+ans=""
 models="$ans"
 
 case "$models" in
@@ -1147,7 +1159,8 @@ else
 	esac
 	rp="Use which C compiler? [$dflt]"
 	$echo $n "$rp $c"
-	. myread
+	#. myread
+	ans="cc"
 	cc="$ans"
 fi
 case "$cc" in
@@ -1171,7 +1184,8 @@ specify the word "none".
 EOH
 rp="What optimizer/debugger flag should be used? [$dflt]"
 $echo $n "$rp $c"
-. myread
+#. myread
+ans="$CFLAGS"
 optimize="$ans"
 case "$optimize" in
 'none') optimize=" ";;
@@ -1220,7 +1234,8 @@ the C compiler, but you should NOT inclu
 EOH
 rp="Any additional cc flags? [$dflt]"
 $echo $n "$rp $c"
-. myread
+#. myread
+ans="-I${PREFIX}/include"
 case "$ans" in
 none) ans='';
 esac
@@ -1258,7 +1273,8 @@ esac
 echo " "
 rp="Any additional ld flags (NOT including libraries)? [$dflt]"
 $echo $n "$rp $c"
-. myread
+#. myread
+ans="$LDFLAGS"
 case "$ans" in
 none) ans='';
 esac
@@ -1421,7 +1437,8 @@ if $contains '^index$' libc.list >/dev/n
 				echo "Your system has both index() and strchr().  Shall I use"
 				rp="index() rather than strchr()? [$dflt]"
 				$echo $n "$rp $c"
-				. myread
+				#. myread
+				ans=y
 				case "$ans" in
 					n*) d_index="$define" ;;
 					*)  d_index="$undef" ;;
@@ -1567,7 +1584,8 @@ EOT
 
 rp="What directory holds the Utah Raster Toolkit include files? [$dflt]"
 $echo $n "$rp $c"
-. myread
+#. myread
+ans="${PREFIX}/include"
 case "$ans" in
 'none')
     urtinc=''
@@ -1591,7 +1609,8 @@ case "$ans" in
     echo " "
     rp="Where is the Utah Raster Toolkit library? [$dflt]"
     $echo $n "$rp $c"
-    . myread
+    #. myread
+    ans="${PREFIX}/lib/librle.a"
     urtlib="$ans"
     urtinc="-I$urtinc"
     ;;
@@ -1629,7 +1648,8 @@ cont=true
 while $test "$cont"; do
 	rp="Use which function to generate random numbers? [$dflt]"
 	$echo $n "$rp $c"
-	. myread
+	#. myread
+	ans="drand48"
 	if $test "$ans" = "$dflt"; then
 		: null
 	else
@@ -1802,7 +1822,8 @@ esac
 dflt="$voidflags";
 rp="Your void support flags add up to what? [$dflt]"
 $echo $n "$rp $c"
-. myread
+#. myread
+ans=11
 voidflags="$ans"
 $rm -f try.* .out
 
@@ -1824,7 +1845,8 @@ while $test "$cont" ; do
     echo " "
     rp="Where do you want to put the public executables? (~name ok) [$dflt]"
     $echo $n "$rp $c"
-    . myread
+    #. myread
+    ans=${PREFIX}/bin
     bin="$ans"
     bin=`filexp $bin`
     if test -d $bin; then
@@ -1833,7 +1855,8 @@ while $test "$cont" ; do
 	dflt=n
 	rp="Directory $bin doesn't exist.  Use that name anyway? [$dflt]"
 	$echo $n "$rp $c"
-	. myread
+	#. myread
+	ans=y
 	dflt=''
 	case "$ans" in
 	y*) cont='';;
@@ -1968,7 +1991,8 @@ while $test "$cont" ; do
 	echo " "
 rp="Name of program to make makefile dependencies? [$dflt]"
 $echo $n "$rp $c"
-. myread
+#. myread
+ans=/usr/bin/mkdep
 mkdep="$ans"
 mkdep=`filexp $mkdep`
 if test -f "$mkdep"; then
@@ -1988,12 +2012,12 @@ $rm -f dep.c dep.h dep.o dep.out
 : see if ar generates random libraries by itself
 echo " "
 echo "Checking how to generate random libraries on your machine..."
-ar rc ran.a /dev/null
-if ar ts ran.a >/dev/null 2>&1; then
-	echo "ar appears to generate random libraries itself."
-	orderlib=false
-	ranlib=":"
-else
+#ar rc ran.a /dev/null
+#if ar ts ran.a >/dev/null 2>&1; then
+#	echo "ar appears to generate random libraries itself."
+#	orderlib=false
+#	ranlib=":"
+#else
 	if test -f /usr/bin/ranlib; then
 		ranlib=/usr/bin/ranlib
 	elif test -f /bin/ranlib; then
@@ -2009,7 +2033,7 @@ else
 		orderlib=true
 		ranlib=":"
 	fi
-fi
+#fi
 
 : determine compiler compiler
 case "$bison" in
@@ -2024,7 +2048,8 @@ cont=true
     echo " "
 rp="Which compiler compiler (yacc or bison -y) will you use? [$dflt]"
 $echo $n "$rp $c"
-. myread
+#. myread
+ans=yacc
 case "$ans" in
 '') ans="$dflt";;
 *bis*) ans="bison -y";;
@@ -2153,7 +2178,8 @@ fastread=''
 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
+#. UU/myread
+ans=""
 case "$ans" in
 '') ;;
 *) : in case they cannot read
@@ -2205,7 +2231,8 @@ It can take a while, so you might not wa
 EOM
     rp="Run make depend now? [$dflt]"
     $echo $n "$rp $c"
-    . UU/myread
+    #. UU/myread
+    ans=y
     case "$ans" in
     y*) make depend
 	echo "Now you must run a make."