X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=hints%2Fultrix_4.sh;h=d8d2063b22d6321cfa36a77313f53307f5c2d4bf;hb=7bac28a0157dcaf170649e8928f053f76dda4253;hp=3f96a668e1c70a0670202e810b3f3282e0b413ad;hpb=8e07c86ebc651fe92eb7e3b25f801f57cfb8dd6f;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/hints/ultrix_4.sh b/hints/ultrix_4.sh
index 3f96a66..d8d2063 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,16 +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 3200" ;;
+    *4.2*)	ccflags="$ccflags -DLANGUAGE_C -Olimit 3200"
 		# 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 3200" ;;
+    *)	ccflags="$ccflags -std -Olimit 3200" ;;
     esac
     ;;
 esac
@@ -44,4 +56,11 @@ 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'