X-Git-Url: https://erislabs.net/gitweb/?a=blobdiff_plain;f=modules%2Ficonv-h;h=46399cd2a0de9b9620cc3bea58b48dbaac32621e;hb=427cbfd5b427150a71172efdd49db3cb0865cb42;hp=0a3d0766d5653a8bedb3688cb1eb403e919b1c8b;hpb=b290c4a195270610ffc2dff2a05c77aca836aaa9;p=gnulib.git

diff --git a/modules/iconv-h b/modules/iconv-h
index 0a3d0766d..46399cd2a 100644
--- a/modules/iconv-h
+++ b/modules/iconv-h
@@ -7,7 +7,9 @@ m4/iconv_h.m4
 
 Depends-on:
 include_next
+c++defs
 arg-nonnull
+warn-on-use
 
 configure.ac:
 gl_ICONV_H
@@ -17,17 +19,20 @@ BUILT_SOURCES += $(ICONV_H)
 
 # We need the following in order to create <iconv.h> when the system
 # doesn't have one that works with the given compiler.
-iconv.h: iconv.in.h $(ARG_NONNULL_H)
+iconv.h: iconv.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' \
 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
+	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
 	      -e 's|@''NEXT_ICONV_H''@|$(NEXT_ICONV_H)|g' \
 	      -e 's|@''ICONV_CONST''@|$(ICONV_CONST)|g' \
 	      -e 's|@''REPLACE_ICONV''@|$(REPLACE_ICONV)|g' \
 	      -e 's|@''REPLACE_ICONV_OPEN''@|$(REPLACE_ICONV_OPEN)|g' \
 	      -e 's|@''REPLACE_ICONV_UTF''@|$(REPLACE_ICONV_UTF)|g' \
+	      -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)/iconv.in.h; \
 	} > $@-t && \
 	mv $@-t $@