m4/sys_socket_h.m4: Don't AC_LIBOBJ(winsock).

diff --git a/ChangeLog b/ChangeLog
index 744cd1be4c20d1605dc1cb3fd1b8336d17050270..efba7d90bbfaffc02a4953bb5515560265c9c7a6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-10-08  Simon Josefsson  <simon@josefsson.org>
+
+       * m4/sys_socket_h.m4: Don't AC_LIBOBJ(winsock).  The file is
+       AC_LIBOBJ'ed by each gnulib module that needs it (e.g., socket,
+       listen).
+
 2008-10-08  Eric Blake  <ebb9@byu.net>
 
        GNUmakefile: add 'make version' target

diff --git a/m4/sys_socket_h.m4 b/m4/sys_socket_h.m4
index 9981abcba7e8c1e65717ce931760b68d3d38b807..1e38ee3a9ed5c31a6f1f3e5803fd15b37c8113a6 100644 (file)
--- a/m4/sys_socket_h.m4
+++ b/m4/sys_socket_h.m4
@@ -60,9 +60,6 @@ AC_DEFUN([gl_HEADER_SYS_SOCKET],
       fi
     fi
     gl_PREREQ_SYS_H_WINSOCK2
-    if test x$ac_cv_header_winsock2_h = xyes; then
-      AC_LIBOBJ(winsock)
-    fi
     AC_SUBST([HAVE_SYS_SOCKET_H])
     AC_SUBST([HAVE_WS2TCPIP_H])
   fi