From b971f6e4f6780f32fa16abecd87989a37436a193 Mon Sep 17 00:00:00 2001
From: Perl 5 Porters <perl5-porters@africa.nicoh.com>
Date: Sat, 22 Feb 1997 02:41:53 +1200
Subject: [inseparable changes from match from perl5.003_28 to perl-5.003_90]

 BUILD PROCESS

Subject: Re: ccdlflags don't quite work
Date: Mon, 24 Feb 1997 16:07:07 -0500 (EST)
From: Andy Dougherty <doughera@fractal.phys.lafayette.edu>
Files: Configure
Msg-ID: <Pine.SOL.3.95q.970224160630.5700E-100000@fractal.lafayette.e

    (applied based on p5p patch as commit bc75e68b7b49a5ac07dc839aec7ca05eba51175f)

Subject: Use $ccflags, $ldflags, $libs when determining $randbits
From: Chip Salzenberg <chip@perl.com>
Files: Configure

Subject: 'installperl -v' doesn't do enough
Date: Mon, 24 Feb 1997 08:42:59 -0500
From: Spider Boardman <spider@Orb.Nashua.NH.US>
Files: installperl
Msg-ID: <199702241342.IAA25945@Orb.Nashua.NH.US>

    (applied based on p5p patch as commit 7287d43f85a3731984c0e0ef1f20e1515b4140f2)

Subject: installperl breaks running system (for a while)
Date: Mon, 24 Feb 1997 09:12:11 -0500
From: Spider Boardman <spider@Orb.Nashua.NH.US>
Files: installperl
Msg-ID: <199702241412.JAA11829@Orb.Nashua.NH.US>

    (applied based on p5p patch as commit ec2a3d87ba26a9586ad981051a949403027c147a)

 CORE PORTABILITY

Subject: Digital UNIX and 3_28
Date: Sun, 23 Feb 1997 16:27:19 +0200 (EET)
From: Jarkko Hietaniemi <jhi@iki.fi>
Files: Configure MANIFEST ext/NDBM_File/hints/dec_osf.pl ext/ODBM_File/hints/dec_osf.pl hints/dec_osf.sh
Msg-ID: <199702231427.QAA13807@alpha.hut.fi>

    (applied based on p5p patch as commit 58c0852f6968d0b4520a03e22a56226185ab78c6)

Subject: AmigaOS patches to 5.003_28
Date: Sat, 22 Feb 1997 18:08:02 +0100
From: "Norbert Pueschel" <pueschel@imsdd.meb.uni-bonn.de>
Files: README.amiga hints/amigaos.sh t/io/fs.t t/lib/anydbm.t t/lib/db-btree.t t/lib/db-hash.t t/lib/db-recno.t t/lib/gdbm.t t/lib/ndbm.t t/lib/odbm.t t/lib/sdbm.t t/op/magic.t t/op/stat.t
Msg-ID: <77724759@Armageddon.meb.uni-bonn.de>

    (applied based on p5p patch as commit b8e6d11c134e93a7795379ceb62b7f950607c667)

 TESTS

Subject: Don't use <*> where readdir() will do
From: Chip Salzenberg <chip@perl.com>
Files: t/op/stat.t

Subject: Allow for $^X to be 'miniperl'
Date: Sun, 23 Feb 1997 16:22:45 +0100
From: Dominic Dunlop <domo@slipper.ip.lu>
Files: t/op/magic.t

    private-msgid: <v03020903af360f31aced@[194.51.248.65]>
---
 Configure | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

(limited to 'Configure')

diff --git a/Configure b/Configure
index 72c1a39d22..a6e202c983 100755
--- a/Configure
+++ b/Configure
@@ -4718,7 +4718,7 @@ if "$useshrplib"; then
 	freebsd)
 		xxx="-Wl,-R$shrpdir"
 		;;
-	linux|irix*)
+	linux|irix*|dec_osf)
 		xxx="-Wl,-rpath,$shrpdir"
 		;;
 	*)
@@ -4727,14 +4727,20 @@ if "$useshrplib"; then
 	esac
 	case "$xxx" in
 	'') ;;
-	*)	ccdlflags="$ccdlflags $xxx"
-		cat <<EOM >&4
+	*)	
+		# Only add $xxx if it isn't already in ccdlflags.
+		case " $ccdlflags " in
+		*" $xxx "*)	;;
+		*)	ccdlflags="$ccdlflags $xxx"
+			cat <<EOM >&4
 
 Adding $xxx to the flags
 passed to $ld so that the perl executable will find the 
 installed shared $libperl.
 
 EOM
+			;;
+		esac
 		;;
 	esac
 fi
@@ -8569,7 +8575,7 @@ main()
 	printf("%d\n",i);
 }
 EOCP
-	if $cc try.c -o try >/dev/null 2>&1 ; then
+	if $cc $ccflags $ldflags -o try try.c $libs >/dev/null 2>&1 ; then
 		dflt=`try`
 	else
 		dflt='?'
@@ -8583,7 +8589,7 @@ esac
 rp='How many bits does your rand() function produce?'
 . ./myread
 randbits="$ans"
-$rm -f try.c try
+$rm -f try.c try.o try
 
 : see if ar generates random libraries by itself
 echo " "
-- 
cgit v1.2.1