X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=modules%2Finttypes;h=2352a3c28694ebbe522a82fa1e833b9f445af55c;hb=1c091b642ef5dfebb141d72e1289d5f20d5387b5;hp=2deaeea7e69a48c92990fc4df47c58ee3678386d;hpb=6981342b0b0c4a0eb772156b1768341900465f2f;p=gnulib.git

diff --git a/modules/inttypes b/modules/inttypes
index 2deaeea7e..2352a3c28 100644
--- a/modules/inttypes
+++ b/modules/inttypes
@@ -3,11 +3,12 @@ An <inttypes.h> that nearly conforms to C99.
 
 Files:
 lib/inttypes_.h
-m4/absolute-header.m4
 m4/inttypes-pri.m4
 m4/inttypes.m4
 
 Depends-on:
+absolute-header
+link-warning
 stdint
 
 configure.ac:
@@ -15,7 +16,6 @@ gl_INTTYPES_H
 
 Makefile.am:
 BUILT_SOURCES += $(INTTYPES_H)
-EXTRA_DIST += 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.
@@ -26,11 +26,17 @@ inttypes.h: inttypes_.h
 	      -e 's|@''ABSOLUTE_INTTYPES_H''@|$(ABSOLUTE_INTTYPES_H)|g' \
 	      -e 's/@''PRI_MACROS_BROKEN''@/$(PRI_MACROS_BROKEN)/g' \
 	      -e 's/@''HAVE_LONG_LONG_INT''@/$(HAVE_LONG_LONG_INT)/g' \
+	      -e 's/@''HAVE_UNSIGNED_LONG_LONG_INT''@/$(HAVE_UNSIGNED_LONG_LONG_INT)/g' \
 	      -e 's/@''PRIPTR_PREFIX''@/$(PRIPTR_PREFIX)/g' \
+	      -e 's/@''GNULIB_IMAXABS''@/$(GNULIB_IMAXABS)/g' \
+	      -e 's/@''GNULIB_IMAXDIV''@/$(GNULIB_IMAXDIV)/g' \
+	      -e 's/@''GNULIB_STRTOIMAX''@/$(GNULIB_STRTOIMAX)/g' \
+	      -e 's/@''GNULIB_STRTOUMAX''@/$(GNULIB_STRTOUMAX)/g' \
 	      -e 's/@''HAVE_DECL_IMAXABS''@/$(HAVE_DECL_IMAXABS)/g' \
 	      -e 's/@''HAVE_DECL_IMAXDIV''@/$(HAVE_DECL_IMAXDIV)/g' \
 	      -e 's/@''HAVE_DECL_STRTOIMAX''@/$(HAVE_DECL_STRTOIMAX)/g' \
 	      -e 's/@''HAVE_DECL_STRTOUMAX''@/$(HAVE_DECL_STRTOUMAX)/g' \
+	      -e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \
 	      < $(srcdir)/inttypes_.h; \
 	} > $@-t
 	mv $@-t $@