integrate cfgperl contents into mainline

p4raw-id: //depot/perl@3043

3 files changed, 25 insertions, 19 deletions

diff --git a/Configure b/Configure
index 6f2f171d18..37e4d895ef 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 Feb 22 11:28:58 EET 1999 [metaconfig 3.0 PL70]
+# Generated on Thu Feb 25 22:44:22 EET 1999 [metaconfig 3.0 PL70]
 # (with additional metaconfig patches by perlbug@perl.com)
 
 cat >/tmp/c1$$ <<EOF
@@ -932,7 +932,8 @@ useopcode=true
 : List of libraries we want.
 : If anyone needs -lnet, put it in a hint file.
 libswanted='sfio socket inet nsl nm ndbm gdbm dbm db malloc dl'
-libswanted="$libswanted dld ld sun m c cposix posix ndir dir crypt"
+libswanted="$libswanted dld ld sun m rt c cposix posix"
+libswanted="$libswanted ndir dir crypt"
 libswanted="$libswanted ucb bsd BSD PW x"
 : We probably want to search /usr/shlib before most other libraries.
 : This is only used by the lib/ExtUtils/MakeMaker.pm routine extliblist.
@@ -4541,10 +4542,6 @@ else
 	installbin="$binexp"
 fi
 
-case "$crosscompile" in
-''|[nN]*) crosscompile="$undef" ;;
-esac
-
 : determine whether to install perl also as /usr/bin/perl
 
 echo " "
@@ -5725,13 +5722,6 @@ case "$man3dir" in
 	;;
 esac
 
-case "$osname" in
-next) multiarch="$define" ;;
-esac
-case "$multiarch" in
-''|[nN]*) multiarch="$undef" ;;
-esac
-
 : see if we have to deal with yellow pages, now NIS.
 if $test -d /usr/etc/yp || $test -d /etc/yp; then
 	if $test -f /usr/etc/nibindd; then
@@ -10294,11 +10284,24 @@ Log='$Log'
 RCSfile='$RCSfile'
 Revision='$Revision'
 
+case "$crosscompile" in
+''|[nN]*) crosscompile="$undef" ;;
+esac
+
+case "$osname" in
+next) multiarch="$define" ;;
+esac
+case "$multiarch" in
+''|[nN]*) multiarch="$undef" ;;
+esac
+
 : check for alignment requirements
 echo " "
 case "$crosscompile$multiarch" in
 *$define*)
-You seem to be cross-compiling, skipping the memory alignment check.
+	$cat <<EOM
+You seem to be either cross-compiling or doing a multiarchitecture build,
+skipping the memory alignment check.
 
 EOM
 	case "$alignbytes" in
@@ -10342,9 +10345,11 @@ echo " "
 case "$crosscompile$multiarch" in
 *$define*)
 	$cat <<EOM
-You seem to be cross-compiling, I'm skipping the byteorder check.
+You seem to be either cross-compiling or doing a multiarchitecture build,
+skipping the byteorder check.
 
 EOM
+	byteorder=''
 	;;
 *)
 	case "$byteorder" in
diff --git a/config_h.SH b/config_h.SH
index d28e91f03b..d16cdaab4a 100644
--- a/config_h.SH
+++ b/config_h.SH
@@ -1076,7 +1076,7 @@ sed <<!GROK!THIS! >config.h -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un-
  *	double. Usual values are 2, 4 and 8. The default is eight,
  *	for safety.
  */
-#if defined(CROSSCOMPILE) || defined(MULTIARCH)
+#if defined(CROSSCOMPILE) || defined(MULTIARCH) || defined(NeXT) || defined(__NeXT__)
 #  define MEM_ALIGNBYTES 8
 #else
 #define MEM_ALIGNBYTES $alignbytes
@@ -1098,7 +1098,7 @@ sed <<!GROK!THIS! >config.h -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un-
  *	so the default case (for NeXT) is big endian to catch them. 
  *	This might matter for NeXT 3.0.
  */
-#if defined(CROSSCOMPILE) || defined(MULTIARCH)
+#if defined(CROSSCOMPILE) || defined(MULTIARCH) || defined(NeXT) || defined(__NeXT__)
 #  ifdef __LITTLE_ENDIAN__
 #    if LONGSIZE == 4
 #      define BYTEORDER 0x1234
diff --git a/pod/perldelta.pod b/pod/perldelta.pod
index d73efcff0b..7ea7da69e3 100644
--- a/pod/perldelta.pod
+++ b/pod/perldelta.pod
@@ -1,6 +1,6 @@
 =head1 NAME
 
-perldelta - what's new for perl5.006 (as of 5.005_54)
+perldelta - what's new for perl5.006 (as of 5.005_56)
 
 =head1 DESCRIPTION
 
@@ -216,7 +216,8 @@ Siemens BS2000 is now supported under the POSIX Shell.
 
 =item *
 
-The Mach CThreads (NEXTSTEP, OPENSTEP) are now supported by the Thread extension.
+The Mach CThreads (NEXTSTEP, OPENSTEP) are now supported by the Thread
+extension.
 
 =item *