integrate cfgperl changes into mainline

p4raw-id: //depot/perl@2403

9 files changed, 56 insertions, 28 deletions

diff --git a/Configure b/Configure
index 45e156a573..db88d843d4 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 Sun Nov 22 19:12:18 EET 1998 [metaconfig 3.0 PL70]
+# Generated on Sun Nov 29 18:15:39 EET 1998 [metaconfig 3.0 PL70]
 # (with additional metaconfig patches by jhi@iki.fi)
 
 cat >/tmp/c1$$ <<EOF
@@ -580,6 +580,7 @@ i_netdb=''
 i_neterrno=''
 i_niin=''
 i_sysin=''
+i_poll=''
 d_pwage=''
 d_pwchange=''
 d_pwclass=''
@@ -6843,6 +6844,7 @@ set socketpair d_sockpair
 eval $inlibc
 
 
+echo " "
 echo "Checking the availability of certain socket constants..." >& 4
 for ENUM in MSG_CTRUNC MSG_DONTROUTE MSG_OOB MSG_PEEK MSG_PROXY SCM_RIGHTS; do
 	enum=`$echo $ENUM|./tr '[A-Z]' '[a-z]'`
@@ -11648,6 +11650,10 @@ esac
 set i_neterrno
 eval $setvar
 
+: see if this is a poll.h system
+set poll.h i_poll
+eval $inhdr
+
 : get C preprocessor symbols handy
 echo " "
 $echo $n "Hmm... $c"
@@ -12692,6 +12698,7 @@ i_ndbm='$i_ndbm'
 i_netdb='$i_netdb'
 i_neterrno='$i_neterrno'
 i_niin='$i_niin'
+i_poll='$i_poll'
 i_pwd='$i_pwd'
 i_rpcsvcdbm='$i_rpcsvcdbm'
 i_sfio='$i_sfio'
diff --git a/Porting/Glossary b/Porting/Glossary
index 8159c04aea..1aa4f35110 100644
--- a/Porting/Glossary
+++ b/Porting/Glossary
@@ -4,6 +4,11 @@ programs (e.g. I_UNISTD) are already described in config_h.SH.  [`configpm'
 generates pod documentation for Config.pm from this file--please try to keep
 the formatting regular.]
 
+Mcc (Loc.U):
+	This variable is be used internally by Configure to determine the
+	full pathname (if any) of the Mcc program.  After Configure runs,
+	the value is reset to a plain "Mcc" and is not useful.
+
 _a (Unix.U):
 	This variable defines the extension used for ordinary libraries.
 	For unix, it is '.a'.  The '.' is included.  Other possible
@@ -252,6 +257,15 @@ csh (Loc.U):
 	full pathname (if any) of the csh program.  After Configure runs,
 	the value is reset to a plain "csh" and is not useful.
 
+d_Gconvert (d_gconvert.U):
+	This variable holds what Gconvert is defined as to convert
+	floating point numbers into strings. It could be 'gconvert'
+	or a more complex macro emulating gconvert with gcvt() or sprintf.
+	Possible values are:
+		d_Gconvert='gconvert((x),(n),(t),(b))'
+		d_Gconvert='gcvt((x),(n),(b))'
+		d_Gconvert='sprintf((b),"%.*g",(n),(x))'
+
 d_access (d_access.U):
 	This variable conditionally defines HAS_ACCESS if the access() system
 	call is available to check for access permissions using real IDs.
@@ -567,15 +581,6 @@ d_ftruncate64 (io64.U):
 	This variable conditionally defines the HAS_FTRUNCATE64 symbol, which
 	indicates to the C program that the ftruncate64() routine is available.
 
-d_Gconvert (d_gconvert.U):
-	This variable holds what Gconvert is defined as to convert
-	floating point numbers into strings. It could be 'gconvert'
-	or a more complex macro emulating gconvert with gcvt() or sprintf.
-	Possible values are:
-		d_Gconvert='gconvert((x),(n),(t),(b))'
-		d_Gconvert='gcvt((x),(n),(b))'
-		d_Gconvert='sprintf((b),"%.*g",(n),(x))'
-
 d_getgrent (d_getgrent.U):
 	This variable conditionally defines the HAS_GETGRENT symbol, which
 	indicates to the C program that the getgrent() routine is available
@@ -1743,6 +1748,10 @@ i_niin (i_niin.U):
 	to the C program that it should include <netinet/in.h>. Otherwise,
 	you may try <sys/in.h>.
 
+i_poll (i_poll.U):
+	This variable conditionally defines the I_POLL symbol, and indicates
+	whether a C program should include <poll.h>.
+
 i_pwd (i_pwd.U):
 	This variable conditionally defines I_PWD, which indicates
 	to the C program that it should include <pwd.h>.
@@ -2167,11 +2176,6 @@ man3ext (man3dir.U):
 	have: one of 'n', 'l', or '3'.  The Makefile must supply the '.'.
 	See man3dir.
 
-Mcc (Loc.U):
-	This variable is be used internally by Configure to determine the
-	full pathname (if any) of the Mcc program.  After Configure runs,
-	the value is reset to a plain "Mcc" and is not useful.
-
 medium (models.U):
 	This variable contains a flag which will tell the C compiler and loader
 	to produce a program running with a medium memory model.  If the
diff --git a/Porting/config.sh b/Porting/config.sh
index dda3c3a704..6caa22d476 100644
--- a/Porting/config.sh
+++ b/Porting/config.sh
@@ -8,7 +8,7 @@
 
 # Package name      : perl5
 # Source directory  : .
-# Configuration time: Sun Nov 22 19:19:34 EET 1998
+# Configuration time: Sun Nov 29 18:17:40 EET 1998
 # Configured by     : jhi
 # Target system     : osf1 alpha.hut.fi v4.0 878 alpha 
 
@@ -54,7 +54,7 @@ ccdlflags=' '
 ccflags='-pthread -std -D__LANGUAGE_C__'
 cf_by='jhi'
 cf_email='yourname@yourhost.yourplace.com'
-cf_time='Sun Nov 22 19:19:34 EET 1998'
+cf_time='Sun Nov 29 18:17:40 EET 1998'
 chgrp=''
 chmod=''
 chown=''
@@ -354,7 +354,7 @@ dlext='so'
 dlsrc='dl_dlopen.xs'
 doublesize='8'
 drand01='drand48()'
-dynamic_ext='B DB_File Data/Dumper Fcntl IO IPC/SysV NDBM_File ODBM_File Opcode POSIX SDBM_File Socket Thread attrs re'
+dynamic_ext='B DB_File Data/Dumper Devel/Peek Fcntl IO IPC/SysV NDBM_File ODBM_File Opcode POSIX SDBM_File Socket Thread attrs re'
 eagain='EAGAIN'
 ebcdic='undef'
 echo='echo'
@@ -363,7 +363,7 @@ emacs=''
 eunicefix=':'
 exe_ext=''
 expr='expr'
-extensions='B DB_File Data/Dumper Fcntl IO IPC/SysV NDBM_File ODBM_File Opcode POSIX SDBM_File Socket Thread attrs re Errno'
+extensions='B DB_File Data/Dumper Devel/Peek Fcntl IO IPC/SysV NDBM_File ODBM_File Opcode POSIX SDBM_File Socket Thread attrs re Errno'
 find=''
 firstmakefile='makefile'
 flex=''
@@ -405,6 +405,7 @@ i_ndbm='define'
 i_netdb='define'
 i_neterrno='undef'
 i_niin='define'
+i_poll='define'
 i_pwd='define'
 i_rpcsvcdbm='undef'
 i_sfio='undef'
@@ -454,7 +455,7 @@ installscript='/opt/perl/bin'
 installsitearch='/opt/perl/lib/site_perl/5.00553/alpha-dec_osf-thread'
 installsitelib='/opt/perl/lib/site_perl/5.00553'
 intsize='4'
-known_extensions='B DB_File Data/Dumper Fcntl GDBM_File IO IPC/SysV NDBM_File ODBM_File Opcode POSIX SDBM_File Socket Thread attrs re'
+known_extensions='B DB_File Data/Dumper Devel/Peek Fcntl GDBM_File IO IPC/SysV NDBM_File ODBM_File Opcode POSIX SDBM_File Socket Thread attrs re'
 ksh=''
 large=''
 ld='ld'
diff --git a/Porting/config_H b/Porting/config_H
index 9fa28d831f..5420ae8248 100644
--- a/Porting/config_H
+++ b/Porting/config_H
@@ -17,7 +17,7 @@
 /*
  * Package name      : perl5
  * Source directory  : .
- * Configuration time: Sun Nov 22 19:19:34 EET 1998
+ * Configuration time: Sun Nov 29 18:17:40 EET 1998
  * Configured by     : jhi
  * Target system     : osf1 alpha.hut.fi v4.0 878 alpha 
  */
@@ -2110,6 +2110,12 @@
 /*#define   I_INTTYPES                / **/
 /*#define     HAS_INT64_T               / **/
 
+/* I_POLL:
+ *	This symbol, if defined, indicates that <poll.h> exists and
+ *	should be included.
+ */
+#define	I_POLL		/**/
+
 /* HAS_FSTAT64:
  *	This symbol, if defined, indicates that the fstat64 routine is
  *	available to stat files (fds) larger than 2 gigabytes.
diff --git a/config_h.SH b/config_h.SH
index b70bf26628..1a01c9f4c8 100644
--- a/config_h.SH
+++ b/config_h.SH
@@ -2124,6 +2124,12 @@ sed <<!GROK!THIS! >config.h -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un-
 #$i_inttypes   I_INTTYPES                /**/
 #$d_int64t     HAS_INT64_T               /**/
 
+/* I_POLL:
+ *	This symbol, if defined, indicates that <poll.h> exists and
+ *	should be included.
+ */
+#$i_poll	I_POLL		/**/
+
 /* HAS_FSTAT64:
  *	This symbol, if defined, indicates that the fstat64 routine is
  *	available to stat files (fds) larger than 2 gigabytes.
diff --git a/pod/perlfunc.pod b/pod/perlfunc.pod
index d91cb04428..557d418546 100644
--- a/pod/perlfunc.pod
+++ b/pod/perlfunc.pod
@@ -1902,8 +1902,11 @@ Enter BLOCKs conditionally.  The first EXPR to return true
 causes the corresponding BLOCK to be entered, or, in the case
 of C<else>, the fall-through default BLOCK.
 
-Take notice: Perl wants BLOCKS, expressions (like e.g. in C, C++, or
-Pascal) won't do.
+Note 1: Perl wants BLOCKS, expressions won't do (like they do
+e.g. in C, C++, Java, Pascal).
+
+Note 2: It's C<elsif>, not C<elseif>.  You can have as many
+C<elsif>s as you want.
 
 See L<perlsyn> for more details.  See also C<unless>.
 
diff --git a/t/op/grent.t b/t/op/grent.t
index cfd0fadf01..d054ccc2b9 100755
--- a/t/op/grent.t
+++ b/t/op/grent.t
@@ -9,9 +9,9 @@ BEGIN {
 
     $where = $GR;
 
-    if (-x "/usr/bin/nidump") {
+    if (-x "/usr/bin/nidump") { # nidump is not just NeXT/OpenStep
 	if (open(GR, "nidump group . |")) {
-	    $where = "NetInfo";
+	    $where = "NetInfo group";
 	} else {
 	    print "1..0\n";
 	    exit 0;
diff --git a/t/op/pwent.t b/t/op/pwent.t
index 4316b17028..d562ec3fc4 100755
--- a/t/op/pwent.t
+++ b/t/op/pwent.t
@@ -9,9 +9,9 @@ BEGIN {
 
     $where = $PW;
 
-    if (-x "/usr/bin/nidump") {
+    if (-x "/usr/bin/nidump") { # nidump is not just NeXT/OpenStep
 	if (open(PW, "nidump passwd . |")) {
-	    $where = "NetInfo";
+	    $where = "NetInfo passwd";
 	} else {
 	    print "1..0\n";
 	    exit 0;
diff --git a/util.c b/util.c
index 3be6a91243..1c5ea59f26 100644
--- a/util.c
+++ b/util.c
@@ -15,7 +15,8 @@
 #include "EXTERN.h"
 #include "perl.h"
 
-#if !defined(NSIG) || defined(M_UNIX) || defined(M_XENIX)
+/* XXX Configure test needed */
+#if !defined(NSIG) || defined(M_UNIX) || defined(M_XENIX) || defined(__NetBSD__)
 #include <signal.h>
 #endif