X-Git-Url: https://erislabs.net/gitweb/?a=blobdiff_plain;f=modules%2Fwctype;h=b0fc26d09f3c068db328d0f3a51b7a395fd6a5e8;hb=427cbfd5b427150a71172efdd49db3cb0865cb42;hp=a6fd3467e9aedcf79e0db2816a49c250ec4f04f5;hpb=5be230d9158e5aa42852fe06ea00f8052eff2e39;p=gnulib.git

diff --git a/modules/wctype b/modules/wctype
index a6fd3467e..b0fc26d09 100644
--- a/modules/wctype
+++ b/modules/wctype
@@ -2,38 +2,48 @@ Description:
 A <wctype.h> that conforms better to C99.
 
 Files:
-lib/wctype_.h
-m4/wctype.m4
+lib/wctype.in.h
+m4/wctype_h.m4
 m4/wint_t.m4
 
 Depends-on:
-absolute-header
+include_next
+c++defs
+warn-on-use
 
 configure.ac:
 gl_WCTYPE_H
 
 Makefile.am:
-BUILT_SOURCES += $(WCTYPE_H)
+BUILT_SOURCES += wctype.h
 
 # We need the following in order to create <wctype.h> when the system
 # doesn't have one that works with the given compiler.
-wctype.h: wctype_.h
-	rm -f $@-t $@
+wctype.h: wctype.in.h $(CXXDEFS_H) $(WARN_ON_USE_H)
+	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  sed -e 's/@''HAVE_WCTYPE_H''@/$(HAVE_WCTYPE_H)/g' \
-	      -e 's|@''ABSOLUTE_WCTYPE_H''@|$(ABSOLUTE_WCTYPE_H)|g' \
-	      -e 's/@''HAVE_WCTYPE_CTMP_BUG''@/$(HAVE_WCTYPE_CTMP_BUG)/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_WCTYPE_H''@|$(NEXT_WCTYPE_H)|g' \
+	      -e 's/@''HAVE_ISWBLANK''@/$(HAVE_ISWBLANK)/g' \
+	      -e 's/@''HAVE_ISWCNTRL''@/$(HAVE_ISWCNTRL)/g' \
 	      -e 's/@''HAVE_WINT_T''@/$(HAVE_WINT_T)/g' \
-	      < $(srcdir)/wctype_.h; \
-	} > $@-t
+	      -e 's/@''REPLACE_ISWBLANK''@/$(REPLACE_ISWBLANK)/g' \
+	      -e 's/@''REPLACE_ISWCNTRL''@/$(REPLACE_ISWCNTRL)/g' \
+	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
+	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
+	      < $(srcdir)/wctype.in.h; \
+	} > $@-t && \
 	mv $@-t $@
 MOSTLYCLEANFILES += wctype.h wctype.h-t
 
 Include:
-#include <wctype.h>
+<wctype.h>
 
 License:
-LGPL
+LGPLv2+
 
 Maintainer:
 all