X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=modules%2Fsys_select;h=4f4d6d9bb358882e540045280d2889a067fe9bd6;hb=91fd3b18b755b77c4bb3f7556ddedb055c16c834;hp=2f6bdaecac07ce57c9be6d2dc0d8d2c5d3f63082;hpb=47a8dd64accd4e522331866a73bb79adc2d6ca78;p=gnulib.git

diff --git a/modules/sys_select b/modules/sys_select
index 2f6bdaeca..4f4d6d9bb 100644
--- a/modules/sys_select
+++ b/modules/sys_select
@@ -7,21 +7,22 @@ m4/sys_select_h.m4
 
 Depends-on:
 include_next
-link-warning
+c++defs
 sys_socket
 sys_time
+warn-on-use
 
 configure.ac:
 gl_HEADER_SYS_SELECT
 AC_PROG_MKDIR_P
 
 Makefile.am:
-BUILT_SOURCES += $(SYS_SELECT_H)
+BUILT_SOURCES += sys/select.h
 
 # We need the following in order to create <sys/select.h> when the system
 # doesn't have one that works with the given compiler.
-sys/select.h: sys_select.in.h
-	$(AM_V_at)@MKDIR_P@ sys
+sys/select.h: sys_select.in.h $(CXXDEFS_H) $(WARN_ON_USE_H)
+	$(AM_V_at)$(MKDIR_P) sys
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
@@ -31,7 +32,8 @@ sys/select.h: sys_select.in.h
 	      -e 's|@''GNULIB_SELECT''@|$(GNULIB_SELECT)|g' \
 	      -e 's|@''HAVE_WINSOCK2_H''@|$(HAVE_WINSOCK2_H)|g' \
 	      -e 's|@''REPLACE_SELECT''@|$(REPLACE_SELECT)|g' \
-	      -e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \
+	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
+	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
 	      < $(srcdir)/sys_select.in.h; \
 	} > $@-t && \
 	mv $@-t $@
@@ -39,7 +41,7 @@ MOSTLYCLEANFILES += sys/select.h sys/select.h-t
 MOSTLYCLEANDIRS += sys
 
 Include:
-#include <sys/select.h>
+<sys/select.h>
 
 License:
 LGPLv2+