X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=hints%2Fultrix_4.sh;h=f418ea18ee387c747fcaa2427fc7741de90bd3be;hb=ccf874816b57b9b91848a81cf43371bf7b3f17c8;hp=f0369c0be7b64ded0679dc26fe8880c0b6476a54;hpb=fed7345c45910a20f6865d6a2f8978d09b352f41;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/hints/ultrix_4.sh b/hints/ultrix_4.sh
index f0369c0..f418ea1 100644
--- a/hints/ultrix_4.sh
+++ b/hints/ultrix_4.sh
@@ -4,13 +4,25 @@
 #
 # Use   Configure -Dcc=gcc   to use gcc.
 #
-# I don't know if -g is really needed.  (AD)
+# This used to use -g, but that pulls in -DDEBUGGING by default.
 case "$optimize" in
-'') optimize=-g ;;
+'')
+	# recent versions have a working compiler.
+	case "$osvers" in
+	*4.[45]*)	optimize='-O2' ;;
+	*)		optimize='none' ;;
+	esac
+	;;
 esac
 
+# Some users have reported Configure runs *much* faster if you 
+# replace all occurences of /bin/sh by /bin/sh5
+# Something like:
+#   sed 's!/bin/sh!/bin/sh5!g' Configure > Configure.sh5
+# Then run "sh5 Configure.sh5 [your options]"
+
 case "$myuname" in
-*risc*) cat <<EOF
+*risc*) cat <<EOF >&4
 Note that there is a bug in some versions of NFS on the DECStation that
 may cause utime() to work incorrectly.  If so, regression test io/fs
 may fail if run under NFS.  Ignore the failure.
@@ -22,14 +34,16 @@ case "$cc" in
 *gcc*) ;;
 *)
     case "$osvers" in
-    *4.1*)	ccflags="$ccflags -DLANGUAGE_C -Olimit 2900" ;;
-    *4.2*)	ccflags="$ccflags -DLANGUAGE_C -Olimit 2900"
+    *4.1*)	ccflags="$ccflags -DLANGUAGE_C -Olimit 3800" ;;
+    *4.2*)	ccflags="$ccflags -DLANGUAGE_C -Olimit 3800"
+		# Prototypes sometimes cause compilation errors in 4.2.
+		prototype=undef   
 		case "$myuname" in
 		*risc*)  d_volatile=undef ;;
 		esac
 		;;
-    *4.3*)	ccflags="$ccflags -std1 -DLANGUAGE_C -Olimit 2900" ;;
-    *)	ccflags="$ccflags -std -Olimit 2900" ;;
+    *4.3*)	ccflags="$ccflags -std1 -DLANGUAGE_C -Olimit 3800" ;;
+    *)	ccflags="$ccflags -std -Olimit 3800" ;;
     esac
     ;;
 esac
@@ -42,4 +56,15 @@ case "$osvers" in
 *)	ranlib='ranlib' ;;
 esac
 
+# Settings that don't depend on $osvers:
+
+util_cflags='ccflags="$ccflags -DLOCALE_ENVIRON_REQUIRED"'
 groupstype='int'
+# This will cause a WHOA THERE warning, but it's accurate.  The
+# configure test should be beefed up to try using the field when
+# it can't find any of the standardly-named fields.
+d_dirnamlen='define'
+
+# Ultrix can mmap only character devices, not regular files,
+# which is rather useless state of things for Perl.
+d_mmap='undef'