X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=modules%2Fctype;h=ec000dc80148177f07a85a2e30efe21b0f088ab7;hb=1a9afb04e6f2fb36d17b3837942165cd1a0c50ac;hp=8847f2cc1d1f272a4b72c69efac061583d32031a;hpb=87c5f6fccee477f7e2c67ea4c95e51a3afd83a41;p=gnulib.git

diff --git a/modules/ctype b/modules/ctype
index 8847f2cc1..ec000dc80 100644
--- a/modules/ctype
+++ b/modules/ctype
@@ -7,7 +7,8 @@ m4/ctype.m4
 
 Depends-on:
 include_next
-link-warning
+snippet/c++defs
+snippet/warn-on-use
 
 configure.ac:
 gl_CTYPE_H
@@ -17,15 +18,18 @@ BUILT_SOURCES += ctype.h
 
 # We need the following in order to create <ctype.h> when the system
 # doesn't have one that works with the given compiler.
-ctype.h: ctype.in.h $(LINK_WARNING_H)
+ctype.h: ctype.in.h $(top_builddir)/config.status $(CXXDEFS_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' \
+	  sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|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_CTYPE_H''@|$(NEXT_CTYPE_H)|g' \
 	      -e 's/@''GNULIB_ISBLANK''@/$(GNULIB_ISBLANK)/g' \
 	      -e 's/@''HAVE_ISBLANK''@/$(HAVE_ISBLANK)/g' \
-	      -e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \
+	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
+	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
 	      < $(srcdir)/ctype.in.h; \
 	} > $@-t && \
 	mv $@-t $@