summaryrefslogtreecommitdiff
path: root/Configure
diff options
context:
space:
mode:
authorAndy Dougherty <doughera@lafcol.lafayette.edu>1995-02-21 01:14:24 +0000
committerAndy Dougherty <doughera@lafcol.lafayette.edu>1995-02-21 01:14:24 +0000
commit40000a8c37c35cc00114329ca0add46bca36a0ec (patch)
tree900a06b8157172e6f7a69446e5e2d10eb27fada7 /Configure
parentfed7345c45910a20f6865d6a2f8978d09b352f41 (diff)
downloadperl-40000a8c37c35cc00114329ca0add46bca36a0ec.tar.gz
perl5.000 patch.0l: MakeMaker 4.085 and upgrade Configure to dist3 PL 51.
Here's what's new: Configure Generated by metaconfig PL 51. Correctly set ./mips on a MIPS system. Improved (we hope) handling of $archname. MANIFEST MANIFEST.new Made .SH files out of h2xs and makeaperl so that they get the correct path-to-perl at the top. Makefile.SH Propagate $(perllib) to extensions. U/dist3_051.patches Two patches to apply on top of metaconfig PL 51. I've sent them off for inclusion in the next metaconfig update. config_h.SH config.H Regenerated. Only the order of elements has changed. ext/DB_File/Makefile.PL ext/GDBM_File/Makefile.PL ext/NDBM_File/Makefile.PL Add -L/usr/local/lib to LIBS variable. ext/POSIX/POSIX.xs Place #ifdef around FD_CLOEXEC (needed for Apollo). ext/SDBM_File/sdbm/Makefile.PL Simplified, thanks to MakeMaker enhancements. ext/util/make_ext Pass through $(perllib) argument for cflags. h2xs.SH Changed from h2xs to h2xs.SH. Now finds correct path to perl. hints/next_3_2.sh Updated for hppa. hints/solaris_2.sh Remove potentially problematic -lmalloc from $libswanted. hints/unicos.sh Look in /usr/include/rpcsvc for dbm.h. installperl Install h2xs. lib/Cwd.pm Use 'my' variable to avoid clobbering $_. lib/ExtUtils/MakeMaker.pm Upgraded from 4.06 to 4.085. Lots of documentation improvements. EXE_FILES to refer to an array of executable files to install. Reduce chatter during build process. Don't count a useful -L/path option as a successful search for a particular library. Cleanup handling of aix external symbols. Create/update perllocal.pod to indicate what we've done. makeaperl.SH Changed from makeaperl to makeaperl.SH. Now finds correct path to perl. x2p/util.c Delete unused setenv() and envix() functions. x2p/util.h Delete unused setenv() and envix() prototypes. vms/config.vms Define I_SYS_STAT and I_SYS_TYPES.
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