X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=modules%2Fsys_socket;h=0c7b6dbb302a18d03c20f480baeb325f83f70d58;hb=2d6501c921265a1536ca044f45773e761b639706;hp=9c4959da0701d662905c6c0c62d413c509bf2bde;hpb=b258683f73569d6d7ca77431fa4f3506d0b3a21e;p=gnulib.git

diff --git a/modules/sys_socket b/modules/sys_socket
index 9c4959da0..0c7b6dbb3 100644
--- a/modules/sys_socket
+++ b/modules/sys_socket
@@ -2,33 +2,41 @@ Description:
 A <sys/socket.h> for systems lacking it.
 
 Files:
-lib/socket_.h
+lib/sys_socket.in.h
 m4/sys_socket_h.m4
+m4/sockpfaf.m4
 
 Depends-on:
+include_next
 
 configure.ac:
 gl_HEADER_SYS_SOCKET
+AC_PROG_MKDIR_P
 
 Makefile.am:
 BUILT_SOURCES += $(SYS_SOCKET_H)
-EXTRA_DIST += 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
-	test -d sys || mkdir sys
-	cp $(srcdir)/socket_.h $@-t
-	mv $@-t $@
+sys/socket.h: sys_socket.in.h
+	@MKDIR_P@ sys
+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
+	  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.in.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:
-LGPL
+LGPLv2+
 
 Maintainer:
 Simon Josefsson