X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Configure;h=0071a7c7c1b3d0fa277a09893ffd7f76bc37f57e;hb=2ddcc7aa6c936ba8e7a9703319dfd8959bb54574;hp=0dbe17c8fe86b6e02fa81abca4c6b6598734d68a;hpb=6a1b87e5041a5273b1c9d83ca925b79765943e03;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/Configure b/Configure
index 0dbe17c..0071a7c 100755
--- a/Configure
+++ b/Configure
@@ -85,6 +85,12 @@ done
 PATH=.$p_$PATH
 export PATH
 
+: This should not matter in scripts, but apparently it does, sometimes
+case "$CDPATH" in
+'')	;;
+*)	CDPATH='' ;;
+esac
+
 : Sanity checks
 if test ! -t 0; then
 	echo "Say 'sh $me', not 'sh <$me'"
@@ -112,6 +118,7 @@ EOM
 especially on older exotic systems.  If yours does, try the Bourne 
 shell instead.)
 EOM
+		unset ENV
         fi
     fi
 else
@@ -1357,7 +1364,7 @@ If you are in a hurry, you may run 'Configure -d'.  This will bypass nearly all
 the questions and use the computed defaults (or the previous answers if there
 was already a config.sh file). Type 'Configure -h' for a list of options.
 You may also start interactively and then answer '& -d' at any prompt to turn
-on the non-interactive behaviour for the remaining of the execution.
+on the non-interactive behavior for the remainder of the execution.
 
 EOH
 	. ./myread
@@ -2524,9 +2531,10 @@ archlibexp="$ansexp"
 if $afs; then
 	$cat <<EOM
 
-Since you are running AFS, I need to distinguish the directory in which
-private files reside from the directory in which they are installed (and from
-which they are presumably copied to the former directory by occult means).
+Since you are running AFS, I need to distinguish the directory in
+which architecture-dependent library files reside from the directory
+in which they are installed (and from which they are presumably copied
+to the former directory by occult means).
 
 EOM
 	case "$installarchlib" in
@@ -2825,9 +2833,10 @@ sitelibexp="$ansexp"
 if $afs; then
 	$cat <<EOM
 
-Since you are running AFS, I need to distinguish the directory in which
-private files reside from the directory in which they are installed (and from
-which they are presumably copied to the former directory by occult means).
+Since you are running AFS, I need to distinguish the directory in
+which site-specific files reside from the directory in which they are
+installed (and from which they are presumably copied to the former
+directory by occult means).
 
 EOM
 	case "$installsitelib" in
@@ -2835,7 +2844,7 @@ EOM
 	*) dflt="$installsitelib";;
 	esac
 	fn=de~
-	rp='Where will private files be installed?'
+	rp='Where will site-specific files be installed?'
 	. ./getfile
 	installsitelib="$ans"
 else
@@ -2868,9 +2877,10 @@ sitearchexp="$ansexp"
 if $afs; then
 	$cat <<EOM
 
-Since you are running AFS, I need to distinguish the directory in which
-private files reside from the directory in which they are installed (and from
-which they are presumably copied to the former directory by occult means).
+Since you are running AFS, I need to distinguish the directory in
+which site-specific architecture-dependent library files reside from
+the directory in which they are installed (and from which they are
+presumably copied to the former directory by occult means).
 
 EOM
 	case "$installsitearch" in
@@ -2878,7 +2888,7 @@ EOM
 	*) dflt="$installsitearch";;
 	esac
 	fn=de~
-	rp='Where will private files be installed?'
+	rp='Where will site-specific architecture-dependent files be installed?'
 	. ./getfile
 	installsitearch="$ans"
 else
@@ -2991,8 +3001,8 @@ main() {
 #endif
 }
 EOP
-	cc -o pdp11 pdp11.c >/dev/null 2>&1
-	if ./pdp11 2>/dev/null; then
+	(cc -o pdp11 pdp11.c) >/dev/null 2>&1
+	if $test -f pdp11 && ./pdp11 2>/dev/null; then
 		dflt='unsplit split'
 	else
 		tans=`./loc . X /lib/small /lib/large /usr/lib/small /usr/lib/large /lib/medium /usr/lib/medium /lib/huge`
@@ -3694,7 +3704,7 @@ EOM
 		-*) ftry="$flag";;
 		*) ftry="$previous $flag";;
 		esac
-		if $cppstdin -DLFRULB=bar $ftry $cppminus <cpp.c \
+		if $cppstdin -DLFRULB=bar $cppflags $ftry $cppminus <cpp.c \
 			>cpp1.out 2>/dev/null && \
 			$cpprun -DLFRULB=bar $ftry $cpplast <cpp.c \
 			>cpp2.out 2>/dev/null && \
@@ -4726,6 +4736,9 @@ xxx=''
 tmp_shrpenv=''
 if "$useshrplib"; then
     case "$osname" in 
+	aix)
+		# We'll set it in Makefile.SH...
+		;;
 	solaris|netbsd)
 		xxx="-R $shrpdir"
 		;;
@@ -4735,6 +4748,9 @@ if "$useshrplib"; then
 	linux|irix*|dec_osf)
 		xxx="-Wl,-rpath,$shrpdir"
 		;;
+	next)
+		# next doesn't like the default...
+		;;
 	*)
 		tmp_shrpenv="env LD_RUN_PATH=$shrpdir"
 		;;
@@ -8273,7 +8289,7 @@ EOCP
 	if $cc $optimize $ccflags $ldflags -o try try.c $libs && ./try; then
 		echo 'Looks OK.  (Perl supports up to version 1.86).' >&4
 	else
-		echo "I can't use your Berkeley DB.  I'll disable it." >&4
+		echo "I can't use Berkeley DB with your <db.h>.  I'll disable Berkeley DB." >&4
 		i_db=$undef
 		case " $libs " in
 		*"-ldb "*)