summaryrefslogtreecommitdiff
path: root/Configure
diff options
context:
space:
mode:
Diffstat (limited to 'Configure')
-rwxr-xr-xConfigure82
1 files changed, 52 insertions, 30 deletions
diff --git a/Configure b/Configure
index 13e4ba59fa..2b3796db67 100755
--- a/Configure
+++ b/Configure
@@ -20,7 +20,7 @@
# $Id: Head.U,v 3.0.1.6 1994/10/29 15:54:19 ram Exp $
#
-# Generated on Sat Feb 11 11:56:23 EST 1995 [metaconfig 3.0 PL50]
+# Generated on Tue Feb 21 11:46:04 EST 1995 [metaconfig 3.0 PL51]
cat >/tmp/c1$$ <<EOF
ARGGGHHHH!!!!!
@@ -200,9 +200,10 @@ afs=''
alignbytes=''
archlib=''
archlibexp=''
-archname=''
d_archlib=''
installarchlib=''
+archname=''
+myarchname=''
baserev=''
bin=''
binexp=''
@@ -801,7 +802,7 @@ while test $# -gt 0; do
esac
shift
;;
- -V) echo "$me generated by metaconfig 3.0 PL50." >&2
+ -V) echo "$me generated by metaconfig 3.0 PL51." >&2
exit 0;;
--) break;;
-*) echo "$me: unknown option $1" >&2; shift; error=true;;
@@ -1133,9 +1134,9 @@ EOH
Much effort has been expended to ensure that this shell script will run on any
Unix system. If despite that it blows up on yours, your best bet is to edit
-Configure and run it again. Also, let me (lwall@netlabs.com)
-know how I blew it. If you can't run Configure for some reason, you'll have to
-generate a config.sh file by hand.
+Configure and run it again. If you can't run Configure for some reason,
+you'll have to generate a config.sh file by hand. Whatever problems you
+have, let me (lwall@netlabs.com) know how I blew it.
This installation script affects things in two ways:
@@ -2326,11 +2327,12 @@ while test "$type"; do
fi
;;
Locate)
- if test -d "$value"; then
+ if test -d "$ansexp"; then
echo "(Looking for $loc_file in directory $value.)"
value="$value/$loc_file"
+ ansexp="$ansexp/$loc_file"
fi
- if test -f "$value"; then
+ if test -f "$ansexp"; then
type=''
fi
case "$nopath_ok" in
@@ -2400,12 +2402,13 @@ EOCP
fi
$rm -f usr.c usr.out
echo "and you're compiling with the $mips_type compiler and libraries."
+ echo "exit 0" >mips
else
echo "Doesn't look like a MIPS system."
echo "exit 1" >mips
- chmod +x mips
- $eunicefix mips
fi
+chmod +x mips
+$eunicefix mips
echo " "
case "$usrinc" in
'') ;;
@@ -3409,6 +3412,36 @@ $rm -f access*
set alarm d_alarm
eval $inlibc
+: determine the architecture name
+echo " "
+if xxx=`./loc arch blurfl $pth`; $test -f "$xxx"; then
+ tarch=`arch`"-$osname"
+elif xxx=`./loc uname blurfl $pth`; $test -f "$xxx" ; then
+ if uname -m > tmparch 2>&1 ; then
+ tarch=`$cat tmparch`"-$osname"
+ else
+ tarch="$osname"
+ fi
+ $rm -f tmparch
+else
+ tarch="$osname"
+fi
+case "$myarchname" in
+''|"$tarch") ;;
+*)
+ echo "(Your architecture name used to be $myarchname.)"
+ archname=''
+ ;;
+esac
+case "$archname" in
+'') dflt="$tarch";;
+*) dflt="$archname";;
+esac
+rp='What is your architecture name'
+. ./myread
+archname="$ans"
+myarchname="$tarch"
+
: is AFS running?
echo " "
if test -d /afs; then
@@ -3526,22 +3559,6 @@ prefixup='case "$prefixexp" in
esac'
: determine where public architecture dependent libraries go
-case "$archname" in
-'')
- if xxx=`./loc arch blurfl $pth`; test -f "$xxx"; then
- tarchname=`arch`
- archname="${tarchname}-$osname"
- elif xxx=`./loc uname blurfl $pth`; test -f "$xxx" ; then
- if uname -m > tmparch 2>&1 ; then
- tarchname=`cat tmparch`
- archname="${tarchname}-$osname"
- fi
- $rm -f tmparch
- else
- archname="$osname"
- fi
- ;;
-esac
set archlib archlib
eval $prefixit
case "$archlib" in
@@ -5582,7 +5599,7 @@ if $test -d /usr/etc/yp || $test -d /etc/yp; then
. ./myread
case "$ans" in
y*) hostcat='nidump hosts .';;
- *) hostcat='cat /etc/hosts';;
+ *) ;;
esac
fi
case "$hostcat" in
@@ -7921,6 +7938,7 @@ models='$models'
modetype='$modetype'
more='$more'
mv='$mv'
+myarchname='$myarchname'
mydomain='$mydomain'
myhostname='$myhostname'
myuname='$myuname'
@@ -8045,11 +8063,15 @@ exit)
cont)
;;
'')
- echo " "
dflt=''
nostick=true
-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:"
+ $cat <<EOM
+
+If you'd like to make any changes to the config.sh file before I begin
+to configure things, do it as a shell escape now (e.g. !vi config.sh).
+
+EOM
+ rp="Press return or use a shell escape to edit config.sh:"
. UU/myread
nostick=''
case "$ans" in