From: Gurusamy Sarathy <gsar@cpan.org>
Date: Wed, 22 Mar 2000 16:29:37 +0000 (+0000)
Subject: RM600-svr4 tweaks (from Frank Ridderbusch
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=514114c10e96cbf0be8c89b8bb59a99001534fec;p=p5sagit%2Fp5-mst-13.2.git

RM600-svr4 tweaks (from Frank Ridderbusch
<frank.ridderbusch@pdb.siemens.de>)

p4raw-id: //depot/perl@5878
---

diff --git a/ext/POSIX/Makefile.PL b/ext/POSIX/Makefile.PL
index 15256cf..55c5c1f 100644
--- a/ext/POSIX/Makefile.PL
+++ b/ext/POSIX/Makefile.PL
@@ -1,7 +1,17 @@
 use ExtUtils::MakeMaker;
+use Config;
+my @libs;
+if ($^O ne 'MSWin32') {
+    if ($Config{archname} =~ /RM\d\d\d-svr4/) {
+	@libs = ('LIBS' => ["-lm -lc -lposix -lcposix"]);
+    }
+    else {
+	@libs = ('LIBS' => ["-lm -lposix -lcposix"]);
+    }
+}
 WriteMakefile(
     NAME	=> 'POSIX',
-    ($^O eq 'MSWin32' ? () : (LIBS => ["-lm -lposix -lcposix"])),
+    @libs,
     MAN3PODS 	=> {}, 	# Pods will be built by installman.
     XSPROTOARG => '-noprototypes', 		# XXX remove later?
     VERSION_FROM => 'POSIX.pm', 
diff --git a/lib/ExtUtils/Liblist.pm b/lib/ExtUtils/Liblist.pm
index 47ce3dc..6029557 100644
--- a/lib/ExtUtils/Liblist.pm
+++ b/lib/ExtUtils/Liblist.pm
@@ -109,6 +109,7 @@ sub _unix_os2_ext {
 	    } elsif (-f ($fullname="$thispth/lib$thislib.$so")
 		 && (($Config{'dlsrc'} ne "dl_dld.xs") || ($thislib eq "m"))){
 	    } elsif (-f ($fullname="$thispth/lib${thislib}_s$Config_libext")
+                 && (! $Config{'archname'} =~ /RM\d\d\d-svr4/)
 		 && ($thislib .= "_s") ){ # we must explicitly use _s version
 	    } elsif (-f ($fullname="$thispth/lib$thislib$Config_libext")){
 	    } elsif (-f ($fullname="$thispth/$thislib$Config_libext")){