From: Jarkko Hietaniemi <jhi@iki.fi>
Date: Wed, 4 Nov 1998 08:50:40 +0000 (+0000)
Subject: Configure update.
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=e58e581d72ea61ad3f4d1def4e51acef391679fc;p=p5sagit%2Fp5-mst-13.2.git

Configure update.
Sequent DYNIX/ptx updates: osvers=$4 (instead of $3) of uname -a,

	From: Andy Dougherty <doughera@lafcol.lafayette.edu>
	To: Martin Bligh <mbligh@sequent.com>
	Cc: Jarkko Hietaniemi <jhi@iki.fi>
	Subject: Re: Perl 5's configure on DYNIX/ptx
	Message-Id: <Pine.SUN.3.96.981103090824.5533B-100000@newton.phys>
	Date: Tue, 3 Nov 1998 09:35:26 -0500 (EST)

find sockets also from libsocket, not just libnet.
OS390: $compile_ok instead of $compile for <inttypes.h>,

	From: pvhp@forte.com (Peter Prymmer)
	To: Thomas.Dorner@start.de, jhi@iki.fi, neale@VMA.TABNSW.COM.AU
	Subject: _53 not OK on os390 but looking better than ever
	Date: Tue, 3 Nov 98 17:33:22 PST
	Message-Id: <9811040133.AA09450@forte.com>

p4raw-id: //depot/cfgperl@2190
---

diff --git a/Configure b/Configure
index d6e9555..bb80e64 100755
--- a/Configure
+++ b/Configure
@@ -20,7 +20,7 @@
 
 # $Id: Head.U,v 3.0.1.9 1997/02/28 15:02:09 ram Exp $
 #
-# Generated on Mon Nov  2 13:57:54 EET 1998 [metaconfig 3.0 PL70]
+# Generated on Wed Nov  4 10:29:46 EET 1998 [metaconfig 3.0 PL70]
 # (with additional metaconfig patches by jhi@iki.fi)
 
 cat >/tmp/c1$$ <<EOF
@@ -2082,7 +2082,7 @@ EOM
 			osvers="$3"
 			;;
 		dynixptx*) osname=dynixptx
-			osvers="$3"
+			osvers=`echo "$4"|sed 's/^v//'`
 			;;
 		freebsd) osname=freebsd 
 			osvers="$3" ;;
@@ -7837,7 +7837,7 @@ $cat >try.c <<EOCP
 extern int foo;
 EOCP
 set try
-if eval $compile; then
+if eval $compile_ok; then
 	val="$define"
 else
 	val="$undef"
@@ -9193,26 +9193,31 @@ else
 		d_oldsock="$undef"
 	else
 		echo "You don't have Berkeley networking in libc$_a..." >&4
-		if test -f /usr/lib/libnet$_a; then
-			( ($nm $nm_opt /usr/lib/libnet$_a | eval $nm_extract) ||  \
-			$ar t /usr/lib/libnet$_a) 2>/dev/null >> libc.list
-			if $contains socket libc.list >/dev/null 2>&1; then
-			echo "...but the Wollongong group seems to have hacked it in." >&4
-				socketlib="-lnet"
-				sockethdr="-I/usr/netinclude"
-				d_socket="$define"
-				if $contains setsockopt libc.list >/dev/null 2>&1; then
-					d_oldsock="$undef"
-				else
-					echo "...using the old 4.1c interface, rather than 4.2" >&4
-					d_oldsock="$define"
+		for net in net socket
+		do
+			if test -f /usr/lib/lib$net$_a; then
+				( ($nm $nm_opt /usr/lib/lib$net$_a | eval $nm_extract) ||  \
+				$ar t /usr/lib/lib$net$_a) 2>/dev/null >> libc.list
+				if $contains socket libc.list >/dev/null 2>&1; then
+					d_socket="$define"
+					case "$net" in
+					net)
+						echo "...but the Wollongong group seems to have hacked it in." >&4
+						socketlib="-lnet"
+						sockethdr="-I/usr/netinclude"
+						;;
+					esac
+					if $contains setsockopt libc.list >/dev/null 2>&1; then
+						d_oldsock="$undef"
+					else
+						echo "...using the old 4.1c interface, rather than 4.2" >&4
+						d_oldsock="$define"
+					fi
+					break
 				fi
-			else
-				echo "or even in libnet$_a, which is peculiar." >&4
-				d_socket="$undef"
-				d_oldsock="$undef"
 			fi
-		else
+		done
+		if test "X$d_socket" != "X$define"; then
 			echo "or anywhere else I see." >&4
 			d_socket="$undef"
 			d_oldsock="$undef"