X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=modules%2Finttypes;h=f85939c8f28b8502383bff2ecdf6ba5784a587a4;hb=7dd6551404efff84abc69c3795dbe125cd13ebbd;hp=743add467398577f52ec53426473c9669faec5d1;hpb=d1a73882fc992d3184bec3a4ccd57b52d95a7458;p=gnulib.git

diff --git a/modules/inttypes b/modules/inttypes
index 743add467..f85939c8f 100644
--- a/modules/inttypes
+++ b/modules/inttypes
@@ -7,11 +7,11 @@ m4/inttypes-pri.m4
 m4/inttypes.m4
 
 Depends-on:
-include_next
-link-warning
 arg-nonnull
+include_next
 multiarch
 stdint
+warn-on-use
 
 configure.ac:
 gl_INTTYPES_H
@@ -21,12 +21,13 @@ BUILT_SOURCES += inttypes.h
 
 # We need the following in order to create <inttypes.h> when the system
 # doesn't have one that works with the given compiler.
-inttypes.h: inttypes.in.h $(LINK_WARNING_H) $(ARG_NONNULL_H)
+inttypes.h: inttypes.in.h $(top_builddir)/config.status $(WARN_ON_USE_H) $(ARG_NONNULL_H)
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  sed -e 's/@''HAVE_INTTYPES_H''@/$(HAVE_INTTYPES_H)/g' \
 	      -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_INTTYPES_H''@|$(NEXT_INTTYPES_H)|g' \
 	      -e 's/@''PRI_MACROS_BROKEN''@/$(PRI_MACROS_BROKEN)/g' \
 	      -e 's/@''APPLE_UNIVERSAL_BUILD''@/$(APPLE_UNIVERSAL_BUILD)/g' \
@@ -45,8 +46,8 @@ inttypes.h: inttypes.in.h $(LINK_WARNING_H) $(ARG_NONNULL_H)
 	      -e 's/@''INT64_MAX_EQ_LONG_MAX''@/$(INT64_MAX_EQ_LONG_MAX)/g' \
 	      -e 's/@''UINT32_MAX_LT_UINTMAX_MAX''@/$(UINT32_MAX_LT_UINTMAX_MAX)/g' \
 	      -e 's/@''UINT64_MAX_EQ_ULONG_MAX''@/$(UINT64_MAX_EQ_ULONG_MAX)/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)/inttypes.in.h; \
 	} > $@-t && \
 	mv $@-t $@
@@ -56,7 +57,7 @@ Include:
 <inttypes.h>
 
 License:
-LGPL
+LGPLv2+
 
 Maintainer:
 all