X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=modules%2Fsys_socket;h=3a6cd455a013d603cd6fe0fb73fd9c7ecb5f42ed;hb=a3a70ebafd7f2fdc069d43e8a26fc246dd7fe5bb;hp=7700769dbd148b365a21e12bf74efb09fadd2a52;hpb=e8886c908325158b4e127ac82fbc4fb8918aad85;p=gnulib.git

diff --git a/modules/sys_socket b/modules/sys_socket
index 7700769db..3a6cd455a 100644
--- a/modules/sys_socket
+++ b/modules/sys_socket
@@ -2,32 +2,37 @@ 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:
+absolute-header
 
 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
+sys/socket.h: sys_socket_.h
+	@MKDIR_P@ sys
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-	  cat $(srcdir)/socket_.h; \
+	  sed -e 's|@''ABSOLUTE_SYS_SOCKET_H''@|$(ABSOLUTE_SYS_SOCKET_H)|g' \
+	      -e 's/@''HAVE_INCLUDE_NEXT''@/$(HAVE_INCLUDE_NEXT)/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: