X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fsockets.m4;h=cbe754f8d539a9b96e33c68a0275619cae4ca26d;hb=b92e7dde88f196a4bd73da8f868b7284e587db68;hp=c7bd6646a6ea4a7059ced424215b5fd6be0d3075;hpb=39ec168251884f121bbd9387279d0ad8a8192968;p=gnulib.git

diff --git a/m4/sockets.m4 b/m4/sockets.m4
index c7bd6646a..cbe754f8d 100644
--- a/m4/sockets.m4
+++ b/m4/sockets.m4
@@ -1,61 +1,13 @@
-# sockets.m4 serial 2
-dnl Copyright (C) 2008 Free Software Foundation, Inc.
+# sockets.m4 serial 7
+dnl Copyright (C) 2008-2011 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_SOCKETS],
 [
-  gl_PREREQ_SYS_H_WINSOCK2 dnl for HAVE_WINSOCK2_H
-  LIBSOCKET=
-  if test $HAVE_WINSOCK2_H = 1; then
-    dnl Native Windows API (not Cygwin).
-    AC_CACHE_CHECK([if we need to call WSAStartup in winsock2.h and -lws2_32],
-                   [gl_cv_func_wsastartup], [
-      gl_save_LIBS="$LIBS"
-      LIBS="$LIBS -lws2_32"
-      AC_TRY_LINK([
-#ifdef HAVE_WINSOCK2_H
-# include <winsock2.h>
-#endif], [
-        WORD wVersionRequested = MAKEWORD(1, 1);
-        WSADATA wsaData;
-        int err = WSAStartup(wVersionRequested, &wsaData);
-        WSACleanup ();],
-        gl_cv_func_wsastartup=yes, gl_cv_func_wsastartup=no)
-      LIBS="$gl_save_LIBS"
-    ])
-    if test "$gl_cv_func_wsastartup" = "yes"; then
-      AC_DEFINE([WINDOWS_SOCKETS], 1, [Define if WSAStartup is needed.])
-      LIBSOCKET='-lws2_32'
-    fi
-  else
-    dnl Unix API.
-    dnl Solaris has most socket functions in libsocket.
-    AC_CACHE_CHECK([whether setsockopt requires -lsocket], [gl_cv_lib_socket], [
-      gl_cv_lib_socket=no
-      AC_TRY_LINK([extern
-#ifdef __cplusplus
-"C"
-#endif
-char setsockopt();], [setsockopt();],
-        [],
-        [gl_save_LIBS="$LIBS"
-         LIBS="$LIBS -lsocket"
-         AC_TRY_LINK([extern
-#ifdef __cplusplus
-"C"
-#endif
-char setsockopt();], [setsockopt();],
-           [gl_cv_lib_socket=yes])
-         LIBS="$gl_save_LIBS"
-        ])
-    ])
-    if test $gl_cv_lib_socket = yes; then
-      LIBSOCKET='-lsocket'
-    fi
-  fi
-  AC_SUBST([LIBSOCKET])
+  AC_REQUIRE([AC_C_INLINE])
+  AC_REQUIRE([gl_SOCKETLIB])
   gl_PREREQ_SOCKETS
 ])