[project @ 2003-08-19 15:41:19 by panne]

Nuked FPTOOLS_MSGHDR_MSG_ACCRIGHTS and FPTOOLS_MSGHDR_MSG_CONTROL
tests. Use autoconf's own macros for dealing with struct members.

diff --git a/aclocal.m4 b/aclocal.m4
index 2a418c1..62aab2c 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1103,34 +1103,3 @@ else
   $2="";
 fi;
 ])
-
-dnl
-dnl Check to see whether 'struct msghdr' contains msg_control
-dnl 
-AC_DEFUN(FPTOOLS_MSGHDR_MSG_CONTROL,
-[AC_CACHE_CHECK([for msg_control in struct msghdr], fptools_cv_struct_msghdr_msg_control,
-[AC_TRY_COMPILE([#include <sys/types.h>
-#include <sys/uio.h>
-#include <sys/socket.h>], [struct msghdr m; m.msg_control;],
-fptools_cv_struct_msghdr_msg_control=yes, fptools_cv_struct_msghdr_msg_control=no)])
-if test $fptools_cv_struct_msghdr_msg_control = yes; then
-  AC_DEFINE([HAVE_MSGHDR_MSG_CONTROL], [1], [Define if struct msghdr contains msg_control field.])
-fi
-AC_SUBST(HAVE_MSGHDR_MSG_CONTROL)dnl
-])
-
-dnl
-dnl Check to see whether 'struct msghdr' contains msg_accrights
-dnl 
-AC_DEFUN(FPTOOLS_MSGHDR_MSG_ACCRIGHTS,
-[AC_CACHE_CHECK([for msg_accrights in struct msghdr], fptools_cv_struct_msghdr_msg_accrights,
-[AC_TRY_COMPILE([#include <sys/types.h>
-#include <sys/uio.h>
-#include <sys/socket.h>], [struct msghdr m; m.msg_accrights;],
-fptools_cv_struct_msghdr_msg_accrights=yes, fptools_cv_struct_msghdr_msg_accrights=no)])
-if test $fptools_cv_struct_msghdr_msg_accrights = yes; then
-  AC_DEFINE([HAVE_MSGHDR_MSG_ACCRIGHTS], [1], [Define to 1 if struct msghdr contains msg_accrights field.])
-fi
-AC_SUBST(HAVE_MSGHDR_MSG_ACCRIGHTS)dnl
-])
-

diff --git a/configure.ac b/configure.ac
index 41a9260..053ee6c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -850,8 +850,16 @@ dnl ** do we have long longs?
 AC_CHECK_TYPES([long long])
 
 dnl ** check what fields struct msghdr contains
-FPTOOLS_MSGHDR_MSG_ACCRIGHTS
-FPTOOLS_MSGHDR_MSG_CONTROL
+AC_CHECK_HEADERS([sys/types.h sys/socket.h sys/uio.h])
+AC_CHECK_MEMBERS([struct msghdr.msg_control, struct msghdr.msg_accrights], [], [], [#if HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+#if HAVE_SYS_SOCKET_H
+# include <sys/socket.h>
+#endif
+#if HAVE_SYS_UIO_H
+# include <sys/uio.h>
+#endif])
 
 dnl ** what are the sizes of various types
 AC_CHECK_SIZEOF(char,               1)