warn-on-use: use instead of link-warning

[pspp] / modules / wchar

diff --git a/modules/wchar b/modules/wchar
index f6d02ec7651692d6203efcc7cd4ce4aa177f694e..cfd1dd02dce88c180116aed562c54058c6e3e87e 100644 (file)
--- a/modules/wchar
+++ b/modules/wchar
@@ -7,19 +7,20 @@ m4/wchar.m4
 m4/wint_t.m4
 
 Depends-on:
+arg-nonnull
 include_next
-link-warning
 stddef
+warn-on-use
 
 configure.ac:
 gl_WCHAR_H
 
 Makefile.am:
-BUILT_SOURCES += $(WCHAR_H)
+BUILT_SOURCES += wchar.h
 
 # We need the following in order to create <wchar.h> when the system
 # version does not work standalone.
-wchar.h: wchar.in.h
+wchar.h: wchar.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' \
@@ -61,7 +62,8 @@ wchar.h: wchar.in.h
              -e 's|@''REPLACE_WCSRTOMBS''@|$(REPLACE_WCSRTOMBS)|g' \
              -e 's|@''REPLACE_WCSNRTOMBS''@|$(REPLACE_WCSNRTOMBS)|g' \
              -e 's|@''REPLACE_WCWIDTH''@|$(REPLACE_WCWIDTH)|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)/wchar.in.h; \
        } > $@-t && \
        mv $@-t $@