X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=hints%2Fdec_osf.sh;h=8ef151e93f2fd4ab4232e19e3925a006ee454df4;hb=522b859adcc800ddbbe593fba580633bb305644f;hp=87d3933e489c34f3cb801ebdf76fbe90c456b026;hpb=c93bd003f3b814a3f41e3ecac7b4aaf1167310fc;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/hints/dec_osf.sh b/hints/dec_osf.sh
index 87d3933..8ef151e 100644
--- a/hints/dec_osf.sh
+++ b/hints/dec_osf.sh
@@ -69,13 +69,16 @@ esac
 	# reset
 	_DEC_cc_style=
 case "$isgcc" in
-gcc)	_gcc_version=`$cc --version 2>&1 | tr . ' '`
-	set $_gcc_version
-	if test "$1" -lt 2 -o \( "$1" -eq 2 -a \( "$2" -lt 95 -o \( "$2" -eq 95 -a "$3" -lt 2 \) \) \); then
+gcc)	if [ "X$gccversion" = "X" ]; then
+	    # Done too late in Configure if hinted
+	    gccversion=`$cc --version | sed 's/.*(GCC) *//'`
+	fi
+	set $gccversion
+	if test "$1" -lt 2 -o \( "$1" -eq 2 -a \( "$2" -lt 95 -o \( "$2" -eq 95 -a "$3" -lt 3 \) \) \); then
 	    cat >&4 <<EOF
 
-*** Your cc seems to be gcc and its version ($_gcc_version) seems to be
-*** less than 2.95.2.  This is not a good idea since old versions of gcc
+*** Your cc seems to be gcc and its version ($gccversion) seems to be
+*** less than 2.95.3.  This is not a good idea since old versions of gcc
 *** are known to produce buggy code when compiling Perl (and no doubt for
 *** other programs, too).
 ***
@@ -283,6 +286,12 @@ $define|true|[yY]*)
 		usemymalloc='n'
 		;;
 	esac
+	# These symbols are renamed in <time.h> so
+	# that the Configure hasproto doesn't see them.
+	d_asctime_r_proto="$define"
+	d_ctime_r_proto="$define"
+	d_gmtime_r_proto="$define"
+	d_localtime_r_proto="$define"
 	;;
 esac
 EOCBU
@@ -304,6 +313,41 @@ Cannot continue, aborting.
 EOF
 		exit 1
 		;;
+	*)
+		# Test whether libc's been fixed yet.
+		cat >try.c <<\TRY
+#include <stdio.h>
+int main(int argc, char **argv)
+{
+	unsigned long uvmax = ~0UL;
+	long double ld = uvmax + 0.0L;
+	char buf1[30], buf2[30];
+
+	(void) sprintf(buf1, "%lu", uvmax);
+	(void) sprintf(buf2, "%.0Lf", ld);
+	return strcmp(buf1, buf2) != 0;
+}
+TRY
+		# Don't bother trying to work with Configure's idea of
+		# cc and the various flags.  This might not work as-is
+		# with gcc -- but we're testing libc, not the compiler.
+		if cc -o try -std try.c && ./try
+		then
+			: ok
+		else
+			cat <<\UGLY >&4
+!
+Warning!  Your libc has not yet been patched so that its "%Lf" format for
+printing long doubles shows all the significant digits.  You will get errors
+in the t/op/numconvert test because of this.  (The data is still good
+internally, and the "%e" format of printf() or sprintf() in perl will still
+produce valid results.)  See README.tru64 for additional details.
+
+Continuing anyway.
+!
+UGLY
+		fi
+		$rm -f try try.c
 	esac
 	;;
 esac
@@ -313,31 +357,21 @@ case "`/usr/sbin/sizer -v`" in
 *[1-4].0*) d_modfl=undef ;; # must wait till 5.0
 esac
 
-case "$loclibpth" in
-'')	;;
-*)
-	needusrshlib=''
-	for p in $loclibpth
-	do
-	    if test -n "`ls $p/libdb.so* 2>/dev/null`"; then
-		needusrshlib=yes
-	    fi
+# Keep that leading tab.
+	old_LD_LIBRARY_PATH=$LD_LIBRARY_PATH
+for p in $loclibpth
+do
+	if test -d $p; then
 	    echo "Appending $p to LD_LIBRARY_PATH." >& 4
 	    case "$LD_LIBRARY_PATH" in
 	    '') LD_LIBRARY_PATH=$p                  ;;
 	    *)  LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$p ;;
 	    esac
-	done
-	echo "LD_LIBRARY_PATH is now $LD_LIBRARY_PATH." >& 4
-	# This is evil but I can't think of a nice workaround:
-	# the /usr/shlib/libdb.so needs to be seen first,
-	# or running Configure will fail.
-	if test -n "$needusrshlib"; then
-	    echo "Prepending /usr/shlib to loclibpth." >& 4
-	    loclibpth="/usr/shlib $loclibpth"
-	    echo "loclibpth is now $loclibpth." >& 4
-	fi
-	;;
+	fi	
+done
+case "$LD_LIBRARY_PATH" in
+"$old_LD_LIBRARY_PATH") ;;
+*) echo "LD_LIBRARY_PATH is now $LD_LIBRARY_PATH." >& 4 ;;
 esac
 
 #