X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=modules%2Fwchar;h=da1c2b35eb14eb4fe2075470ae001b8b3b05a112;hb=16b34ac99b135d6cd6c8c2cf1e277ee3b867d9ac;hp=d6dbfd5ef7bb50f8fd88f84a506c830130827afe;hpb=237d7dcd6b8b57f44731b28ab2e6e9a797a551a6;p=gnulib.git

diff --git a/modules/wchar b/modules/wchar
index d6dbfd5ef..da1c2b35e 100644
--- a/modules/wchar
+++ b/modules/wchar
@@ -3,23 +3,25 @@ A <wchar.h> that works around platform issues.
 
 Files:
 lib/wchar.in.h
-m4/wchar.m4
+m4/wchar_h.m4
 m4/wint_t.m4
 
 Depends-on:
+arg-nonnull
+c++defs
 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 $(LINK_WARNING_H)
+wchar.h: wchar.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
@@ -61,7 +63,9 @@ wchar.h: wchar.in.h $(LINK_WARNING_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 '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_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 $@