X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fstrings;h=37ab99960c234db3c1b55f6f47a19faa3cc226f0;hb=b4e5a5f11bd67ce5435b5ecf43b7fb6a81ba62a0;hp=beddb2082ae68b13b599304e911646bfaca6b0c4;hpb=a8c5982a27c78c9da038f1520c43a948e4d50e48;p=gnulib.git

diff --git a/modules/strings b/modules/strings
index beddb2082..37ab99960 100644
--- a/modules/strings
+++ b/modules/strings
@@ -6,8 +6,9 @@ lib/strings.in.h
 m4/strings_h.m4
 
 Depends-on:
+arg-nonnull
 include_next
-link-warning
+warn-on-use
 
 configure.ac:
 gl_HEADER_STRINGS_H
@@ -17,21 +18,23 @@ BUILT_SOURCES += strings.h
 
 # We need the following in order to create <strings.h> when the system
 # doesn't have one that works with the given compiler.
-strings.h: strings.in.h
-	rm -f $@-t $@
+strings.h: strings.in.h $(WARN_ON_USE_H) $(ARG_NONNULL_H)
+	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-	  sed -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \
+	  sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
 	      -e 's|@''NEXT_STRINGS_H''@|$(NEXT_STRINGS_H)|g' \
 	      -e 's|@''HAVE_STRCASECMP''@|$(HAVE_STRCASECMP)|g' \
 	      -e 's|@''HAVE_DECL_STRNCASECMP''@|$(HAVE_DECL_STRNCASECMP)|g' \
-	      -e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \
+	      -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
+	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
 	      < $(srcdir)/strings.in.h; \
-	} > $@-t
+	} > $@-t && \
 	mv $@-t $@
 MOSTLYCLEANFILES += strings.h strings.h-t
 
 Include:
-#include <strings.h>
+<strings.h>
 
 License:
 LGPLv2+