Linux hints: Allow build w/o suidperl, prefer tcsh to csh

2 files changed, 46 insertions, 11 deletions

diff --git a/Configure b/Configure
index a813f968e5..db1f20c0c5 100755
--- a/Configure
+++ b/Configure
@@ -794,7 +794,7 @@ case "$sh" in
 '')	cat <<EOM >&2
 $me:  Fatal Error:  I can't find a Bourne Shell anywhere.  
 Usually it's in /bin/sh.  How did you even get this far?
-Please contact me (Chip Salzenberg) at chip@atlantic.net and 
+Please contact me (Chip Salzenberg) at chip@perl.com and 
 we'll try to straigten this all out.
 EOM
 	exit 1
@@ -1166,7 +1166,7 @@ THIS PACKAGE SEEMS TO BE INCOMPLETE.
 You have the option of continuing the configuration process, despite the
 distinct possibility that your kit is damaged, by typing 'y'es.  If you
 do, don't blame me if something goes wrong.  I advise you to type 'n'o
-and contact the author (chip@atlantic.net).
+and contact the author (chip@perl.com).
 
 EOM
 		echo $n "Continue? [n] $c" >&4
@@ -1367,7 +1367,7 @@ 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.  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 (chip@atlantic.net) know how I blew it.
+have, let me (chip@perl.com) know how I blew it.
 
 This installation script affects things in two ways:
 
@@ -1657,7 +1657,7 @@ EOM
 	cd hints; ls -C *.sh | $sed 's/\.sh/   /g' >&4
 	dflt=''
 	: Half the following guesses are probably wrong... If you have better
-	: tests or hints, please send them to chip@atlantic.net
+	: tests or hints, please send them to chip@perl.com
 	: The metaconfig authors would also appreciate a copy...
 	$test -f /irix && osname=irix
 	$test -f /xenix && osname=sco_xenix
@@ -4695,8 +4695,8 @@ case "$shrpdir" in
 *)	$cat >&4 <<EOM
 WARNING:  Use of the shrpdir variable for the installation location of
 the shared $libperl is not supported.  It was never documented and
-will not work in this version.  Let me (chip@atlantic.net)
-know of any problems this may cause.
+will not work in this version.  Let me (chip@perl.com) know of any
+problems this may cause.
 
 EOM
 	case "$shrpdir" in
@@ -6094,7 +6094,7 @@ eval $setvar
 
 : get csh whereabouts
 case "$csh" in
-'csh') val="$undef" ;;
+*csh) val="$undef" ;;
 *) val="$define" ;;
 esac
 set d_csh
diff --git a/hints/linux.sh b/hints/linux.sh
index 86b0241c99..99ab9c869c 100644
--- a/hints/linux.sh
+++ b/hints/linux.sh
@@ -17,7 +17,13 @@
 
 # No version of Linux supports setuid scripts.
 d_suidsafe='undef'
-d_dosuid='define'
+#don't force people to install SUID if they don't want to (have said  
+#-Dd_dosuid=undef explicitly on command line) - MIKEDLR
+if [ ! "A$d_dosuid" = "Aundef" ] #do I need to be paranoid here?
+then
+    d_dosuid='define'
+fi
+
 
 # perl goes into the /usr tree.  See the Filesystem Standard
 # available via anonymous FTP at tsx-11.mit.edu in
@@ -138,8 +144,8 @@ fi
 rm -f try.c a.out
 
 if /bin/bash -c exit; then
-  echo
-  echo You appear to have a working bash. Good.
+  echo ''
+  echo 'You appear to have a working bash.  Good.'
 else
   cat << 'EOM' >&4
 
@@ -152,4 +158,33 @@ EOM
 
 fi
 
-
+# On SPARClinux,
+# The following csh consistently coredumped in the test directory
+# "/home/mikedlr/perl5.003_94/t", though not most other directories.
+
+#Name        : csh                    Distribution: Red Hat Linux (Rembrandt)
+#Version     : 5.2.6                        Vendor: Red Hat Software
+#Release     : 3                        Build Date: Fri May 24 19:42:14 1996
+#Install date: Thu Jul 11 16:20:14 1996 Build Host: itchy.redhat.com
+#Group       : Shells                   Source RPM: csh-5.2.6-3.src.rpm
+#Size        : 184417
+#Description : BSD c-shell
+
+# For this reason I suggest using the much bug-fixed tcsh for globbing
+# where available.
+
+if [  ! "`csh -c 'echo $version' 2>/dev/null`"  ] 
+then
+	echo 'Real csh found (might break); looking for tcsh ...'
+	if which tcsh >/dev/null 2>&1
+	then
+		echo 'Found tcsh; will use it for globbing.'
+		csh='tcsh'
+		d_csh='tcsh'
+		full_csh=`which tcsh` # we know this will work now.
+	else
+		echo "Couldn't find tcsh.  BEWARE BROKEN GLOBBING."
+	fi
+else
+	echo 'Your csh is really tcsh.  Good.'
+fi