X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=modules%2Fsys_socket;h=0ea6c1af889b83e43bca617058f25567ba1da98b;hb=73f2a1c055c8dfa46d1a4db04a841d952e11c6a0;hp=a1785aaa9b129b74bf5da17f629a443b0abb74b4;hpb=7a6017eea65b334aec6941b6850bdf4084f53e4d;p=gnulib.git

diff --git a/modules/sys_socket b/modules/sys_socket
index a1785aaa9..0ea6c1af8 100644
--- a/modules/sys_socket
+++ b/modules/sys_socket
@@ -2,11 +2,12 @@ Description:
 A <sys/socket.h> for systems lacking it.
 
 Files:
-lib/socket_.h
+lib/sys_socket_.h
 m4/sys_socket_h.m4
 m4/sockpfaf.m4
 
 Depends-on:
+include_next
 
 configure.ac:
 gl_HEADER_SYS_SOCKET
@@ -17,17 +18,21 @@ BUILT_SOURCES += $(SYS_SOCKET_H)
 
 # We need the following in order to create <sys/socket.h> when the system
 # doesn't have one that works with the given compiler.
-sys/socket.h: socket_.h
+sys/socket.h: sys_socket_.h
 	@MKDIR_P@ sys
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-	  cat $(srcdir)/socket_.h; \
+	  sed -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \
+	      -e 's|@''NEXT_SYS_SOCKET_H''@|$(NEXT_SYS_SOCKET_H)|g' \
+	      -e 's|@''HAVE_SYS_SOCKET_H''@|$(HAVE_SYS_SOCKET_H)|g' \
+	      -e 's|@''HAVE_WINSOCK2_H''@|$(HAVE_WINSOCK2_H)|g' \
+	      -e 's|@''HAVE_WS2TCPIP_H''@|$(HAVE_WS2TCPIP_H)|g' \
+	      < $(srcdir)/sys_socket_.h; \
 	} > $@-t
 	mv -f $@-t $@
 MOSTLYCLEANFILES += sys/socket.h sys/socket.h-t
 MOSTLYCLEANDIRS += sys
 
 Include:
-#include <sys/types.h>
 #include <sys/socket.h>
 
 License: