X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=modules%2Fctype;h=277c1e4a96cfb9d6c5da4aacdfd1b5cc577ef8cc;hb=2d4d1028210d8eff40ab7559717a990000cb3d38;hp=e89681400e13d0546ff77e5a32c960beacbdcf2a;hpb=e0bf16819c83c3ef1d11bf373f5f90a1f09c534c;p=gnulib.git

diff --git a/modules/ctype b/modules/ctype
index e89681400..277c1e4a9 100644
--- a/modules/ctype
+++ b/modules/ctype
@@ -7,25 +7,29 @@ m4/ctype.m4
 
 Depends-on:
 include_next
-link-warning
+c++defs
+warn-on-use
 
 configure.ac:
 gl_CTYPE_H
 
 Makefile.am:
-BUILT_SOURCES += $(CTYPE_H)
+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 $@