metaconfig; split socket; fix output.

p4raw-id: //depot/metaconfig@4471

diff --git a/U/modified/d_socket.U b/U/modified/d_socket.U
index b47d131..67afccd 100644 (file)
--- a/U/modified/d_socket.U
+++ b/U/modified/d_socket.U
@@ -20,9 +20,9 @@
 ?RCS:
 ?MAKE:d_socket d_oldsock d_sockpair socketlib sockethdr \
        d_msg_ctrunc d_msg_dontroute d_msg_oob d_msg_peek d_msg_proxy \
-       d_scm_rights d_sendmsg d_recvmsg d_msghdr_s d_cmsghdr_s: \
+       d_scm_rights: \
        contains libc echo n c ar nm nm_opt nm_extract Inlibc Csym _a \
-       Compile cat rm Setvar Hasfield i_sysuio
+       Compile cat rm Setvar Hasfield
 ?MAKE: -pick add $@ %<
 ?S:d_socket:
 ?S:    This variable conditionally defines HAS_SOCKET, which indicates
@@ -66,22 +66,6 @@
 ?S:    which indicates that the SCM_RIGHTS is available.  #ifdef is
 ?S:    not enough because it may be an enum, glibc has been known to do this.
 ?S:.
-?S:d_sendmsg:
-?S:    This variable conditionally defines the HAS_SENDMSG symbol,
-?S:    which indicates that the sendmsg is supported.
-?S:.
-?S:d_recvmsg:
-?S:    This variable conditionally defines the HAS_RECVMSG symbol,
-?S:    which indicates that the recvmsg is supported.
-?S:.
-?S:d_msghdr_s:
-?S:    This variable conditionally defines the HAS_STRUCT_MSGHDR symbol,
-?S:    which indicates that the struct msghdr is supported.
-?S:.
-?S:d_cmsghdr_s:
-?S:    This variable conditionally defines the HAS_STRUCT_CMSGHDR symbol,
-?S:    which indicates that the the struct cmsghdr is supported.
-?S:.
 ?S:socketlib:
 ?S:    This variable has the names of any libraries needed for socket support.
 ?S:.
@@ -131,26 +115,6 @@
 ?C:    Checking just with #ifdef might not be enough because this symbol
 ?C:    has been known to be an enum.
 ?C:.
-?C:HAS_SENDMSG:
-?C:    This symbol, if defined, indicates that the sendmsg is supported
-?C:    to send messages between sockets.  You will also need struct
-?C:    iovec from <sys/uio.h>, HAS_STRUCT_IOVEC and I_SYSUIO.
-?C:.
-?C:HAS_RECVMSG:
-?C:    This symbol, if defined, indicates that the recvmsg is supported
-?C:    to send messages between sockets.  You will also need struct
-?C:    iovec from <sys/uio.h>, HAS_STRUCT_IOVEC and I_SYSUIO.
-?C:.
-?C:HAS_STRUCT_MSGHDR:
-?C:    This symbol, if defined, indicates that the struct msghdr
-?C:    (BSD 4.3 or 4.4) is supported.  You will also need struct
-?C:    iovec from <sys/uio.h>, HAS_STRUCT_IOVEC and I_SYSUIO.
-?C:.
-?C:HAS_STRUCT_CMSGHDR:
-?C:    This symbol, if defined, indicates that the struct cmsghdr
-?C:    (BSD 4.4) is supported.  You will also need struct
-?C:    iovec from <sys/uio.h>, HAS_STRUCT_IOVEC and I_SYSUIO.
-?C:.
 ?H:#$d_socket  HAS_SOCKET              /**/
 ?H:#$d_sockpair        HAS_SOCKETPAIR  /**/
 ?H:#$d_oldsock USE_OLDSOCKET   /**/
@@ -160,16 +124,12 @@
 ?H:#$d_msg_peek        HAS_MSG_PEEK    /**/
 ?H:#$d_msg_proxy       HAS_MSG_PROXY   /**/
 ?H:#$d_scm_rights      HAS_SCM_RIGHTS  /**/
-?H:#$d_sendmsg HAS_SENDMSG     /**/
-?H:#$d_recvmsg HAS_RECVMSG     /**/
-?H:#$d_msghdr_s        HAS_STRUCT_MSGHDR       /**/
-?H:#$d_cmsghdr_s       HAS_STRUCT_CMSGHDR      /**/
 ?H:.
 ?T:val net ENUM enum
 ?F:try.c
 ?LINT:set d_sockpair
 ?LINT:set d_msg_ctrunc d_msg_dontroute d_msg_oob d_msg_peek d_msg_proxy
-?LINT:set d_scm_rights d_sendmsg d_recvmsg d_msghdr_s d_cmsghdr_s
+?LINT:set d_scm_rights
 socketlib=''
 sockethdr=''
 : see whether socket exists
@@ -264,30 +224,3 @@ EOF
        $rm -f try.c try
 done
 
-set sendmsg d_sendmsg
-eval $inlibc
-
-set recvmsg d_recvmsg
-eval $inlibc
-
-echo " "
-$echo $n "Checking to see if your system supports struct msghdr...$c" >&4
-set d_msghdr_s msghdr msg_name define sys/types.h $d_socket sys/socket.h $i_sysuio sys/uio.h
-eval $hasfield
-case "$d_msghdr_s" in
-"$define")      echo "Yup, it does." >&4
-                ;;
-*)              echo "Nope, it doesn't." >&4
-                ;;
-esac
-
-$echo $n "Checking to see if your system supports struct cmsghdr...$c" >&4
-set d_cmsghdr_s cmsghdr cmsg_len define sys/types.h $d_socket sys/socket.h $i_sysuio sys/uio.h
-eval $hasfield
-case "$d_cmsghdr_s" in
-"$define")      echo "Yup, it does." >&4
-                ;;
-*)              echo "Nope, it doesn't." >&4
-                ;;
-esac
-

diff --git a/U/modified/d_statblks.U b/U/modified/d_statblks.U
index d9c4c90..4631820 100644 (file)
--- a/U/modified/d_statblks.U
+++ b/U/modified/d_statblks.U
@@ -28,8 +28,10 @@
 ?H:#endif
 ?H:.
 ?LINT:set d_statblks
+
 : see if stat knows about block sizes
 echo " "
+echo "Checking to see if your struct stat has st_blocks field..." >&4
 set d_statblks stat st_blocks $i_sysstat sys/stat.h
 eval $hasfield
 

diff --git a/U/perl/d_cmsghdr_s.U b/U/perl/d_cmsghdr_s.U
new file mode 100644 (file)
index 0000000..2e2922d
--- /dev/null
+++ b/U/perl/d_cmsghdr_s.U
@@ -0,0 +1,31 @@
+?RCS: $Id$
+?RCS:
+?RCS: Copyright (c) 1999 Jarkko Hietaniemi
+?RCS:
+?RCS: You may distribute under the terms of either the GNU General Public
+?RCS: License or the Artistic License, as specified in the README file.
+?RCS:
+?MAKE:d_cmsghdr_s: Hasstruct i_systypes d_socket i_sysuio Setvar
+?MAKE: -pick add $@ %<
+?S:d_cmsghdr_s:
+?S:    This variable conditionally defines the HAS_STRUCT_CMSGHDR symbol,
+?S:    which indicates that the struct cmsghdr is supported.
+?S:.
+?C:HAS_STRUCT_CMSGHDR:
+?C:    This symbol, if defined, indicates that the struct cmsghdr
+?C:    is supported.
+?C:.
+?H:#$d_cmsghdr_s HAS_STRUCT_CMSGHDR    /**/
+?H:.
+?LINT:set d_cmsghdr_s
+
+echo " "
+echo "Checking to see if your system supports struct cmsghdr..." >&4
+set d_ccmsghdr_s ccmsghdr ccmsg_len $i_systypes sys/types.h $d_socket sys/socket.h $i_sysuio sys/uio.h
+eval $hasstruct
+case "$d_cmsghdr_s" in
+"$define")      echo "Yup, it does."     >&4 ;;
+*)              echo "Nope, it doesn't." >&4 ;;
+esac
+
+

diff --git a/U/perl/d_msghdr_s.U b/U/perl/d_msghdr_s.U
new file mode 100644 (file)
index 0000000..6fe79c4
--- /dev/null
+++ b/U/perl/d_msghdr_s.U
@@ -0,0 +1,31 @@
+?RCS: $Id$
+?RCS:
+?RCS: Copyright (c) 1999 Jarkko Hietaniemi
+?RCS:
+?RCS: You may distribute under the terms of either the GNU General Public
+?RCS: License or the Artistic License, as specified in the README file.
+?RCS:
+?MAKE:d_msghdr_s: Hasstruct i_systypes d_socket i_sysuio Setvar
+?MAKE: -pick add $@ %<
+?S:d_msghdr_s:
+?S:    This variable conditionally defines the HAS_STRUCT_MSGHDR symbol,
+?S:    which indicates that the struct msghdr is supported.
+?S:.
+?C:HAS_STRUCT_MSGHDR:
+?C:    This symbol, if defined, indicates that the struct msghdr
+?C:    is supported.
+?C:.
+?H:#$d_msghdr_s HAS_STRUCT_MSGHDR      /**/
+?H:.
+?LINT:set d_msghdr_s
+
+echo " "
+echo "Checking to see if your system supports struct msghdr..." >&4
+set d_cmsghdr_s cmsghdr cmsg_len $i_systypes sys/types.h $d_socket sys/socket.h $i_sysuio sys/uio.h
+eval $hasstruct
+case "$d_msghdr_s" in
+"$define")      echo "Yup, it does."     >&4 ;;
+*)              echo "Nope, it doesn't." >&4 ;;
+esac
+
+

diff --git a/U/perl/d_recvmsg.U b/U/perl/d_recvmsg.U
new file mode 100644 (file)
index 0000000..31c8c92
--- /dev/null
+++ b/U/perl/d_recvmsg.U
@@ -0,0 +1,24 @@
+?RCS: $Id$
+?RCS:
+?RCS: Copyright (c) 1998 Jarkko Hietaniemi
+?RCS:
+?RCS: You may distribute under the terms of either the GNU General Public
+?RCS: License or the Artistic License, as specified in the README file.
+?RCS:
+?MAKE:d_recvmsg: Inlibc
+?MAKE: -pick add $@ %<
+?S:d_recvmsg:
+?S:    This variable conditionally defines the HAS_RECVMSG symbol, which
+?S:    indicates to the C program that the recvmsg() routine is available.
+?S:.
+?C:HAS_RECVMSG:
+?C:    This symbol, if defined, indicates that the recvmsg routine is
+?C:    available to send structured socket messages.
+?C:.
+?H:#$d_recvmsg HAS_RECVMSG             /**/
+?H:.
+?LINT:set d_recvmsg
+: see if recvmsg exists
+set recvmsg d_recvmsg
+eval $inlibc
+

diff --git a/U/perl/d_sendmsg.U b/U/perl/d_sendmsg.U
new file mode 100644 (file)
index 0000000..f833bde
--- /dev/null
+++ b/U/perl/d_sendmsg.U
@@ -0,0 +1,24 @@
+?RCS: $Id$
+?RCS:
+?RCS: Copyright (c) 1998 Jarkko Hietaniemi
+?RCS:
+?RCS: You may distribute under the terms of either the GNU General Public
+?RCS: License or the Artistic License, as specified in the README file.
+?RCS:
+?MAKE:d_sendmsg: Inlibc
+?MAKE: -pick add $@ %<
+?S:d_sendmsg:
+?S:    This variable conditionally defines the HAS_SENDMSG symbol, which
+?S:    indicates to the C program that the sendmsg() routine is available.
+?S:.
+?C:HAS_SENDMSG:
+?C:    This symbol, if defined, indicates that the sendmsg routine is
+?C:    available to send structured socket messages.
+?C:.
+?H:#$d_sendmsg HAS_SENDMSG             /**/
+?H:.
+?LINT:set d_sendmsg
+: see if sendmsg exists
+set sendmsg d_sendmsg
+eval $inlibc
+

diff --git a/U/perl/i_sysstatfs.U b/U/perl/i_sysstatfs.U
index f65084b..245e84c 100644 (file)
--- a/U/perl/i_sysstatfs.U
+++ b/U/perl/i_sysstatfs.U
@@ -17,6 +17,7 @@
 ?H:#$i_sysstatfs       I_SYS_STATFS            /**/
 ?H:.
 ?LINT:set i_sysstatfs
+
 : see if this is a sys/statfs.h system
 set sys/statfs.h i_sysstatfs
 eval $inhdr

diff --git a/U/perl/i_sysvfs.U b/U/perl/i_sysvfs.U
index d331906..d4aed71 100644 (file)
--- a/U/perl/i_sysvfs.U
+++ b/U/perl/i_sysvfs.U
@@ -18,6 +18,7 @@
 ?H:#$i_sysvfs  I_SYS_VFS               /**/
 ?H:.
 ?LINT:set i_sysvfs
+
 : see if this is a sys/vfs.h system
 set sys/vfs.h i_sysvfs
 eval $inhdr