From b733f1fa6e863b6407907d8aabddb0665b880dd9 Mon Sep 17 00:00:00 2001
From: Pavel Roskin <proski@gnu.org>
Date: Wed, 29 Oct 2003 17:18:15 +0000
Subject: [PATCH] * acinclude.m4 (AC_STRUCT_LINGER): Remove, use
 AC_CHECK_MEMBERS instead.

---
 ChangeLog    |  3 +++
 acinclude.m4 | 36 ++++--------------------------------
 2 files changed, 7 insertions(+), 32 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index bfebb4030..ac6462be4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2003-10-29  Pavel Roskin  <proski@gnu.org>
 
+	* acinclude.m4 (AC_STRUCT_LINGER): Remove, use AC_CHECK_MEMBERS
+	instead.
+
 	* configure.in: Define SLANG_POSIX_SIGNALS if all 4 required
 	functions are present.  Remove references to extraconf.h.
 	* extraconf.h: Eliminate.
diff --git a/acinclude.m4 b/acinclude.m4
index 276601b89..c82bed043 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -137,7 +137,10 @@ AC_DEFUN([MC_WITH_VFS],[
     AC_SEARCH_LIBS(socket, [xnet bsd socket inet], [have_socket=yes])
     if test x$have_socket = xyes; then
       AC_SEARCH_LIBS(gethostbyname, [bsd socket inet netinet])
-      AC_STRUCT_LINGER
+      AC_CHECK_MEMBERS([struct linger.l_linger], , , [
+#include <sys/types.h>
+#include <sys/socket.h>
+		       ])
       AC_CHECK_FUNCS(pmap_set, , [
 	 AC_CHECK_LIB(rpc, pmap_set, [
 	   LIBS="-lrpc $LIBS"
@@ -255,37 +258,6 @@ AC_DEFUN([MC_VFS_CHECKS],[
 
 
 
-dnl
-dnl Check for struct linger
-dnl
-AC_DEFUN([AC_STRUCT_LINGER], [
-av_struct_linger=no
-AC_MSG_CHECKING([struct linger is available])
-AC_TRY_RUN([
-#include <sys/types.h>
-#include <sys/socket.h>
-
-struct linger li;
-
-int main ()
-{
-    li.l_onoff = 1;
-    li.l_linger = 120;
-    return 0;
-}
-],[
-AC_DEFINE(HAVE_STRUCT_LINGER, 1,
-	  [Define if `struct linger' is available])
-av_struct_linger=yes
-],[
-av_struct_linger=no
-],[
-av_struct_linger=no
-])
-AC_MSG_RESULT([$av_struct_linger])
-])
-
-
 dnl
 dnl Filesystem information detection
 dnl