X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=modules%2Fwctype;h=b212e35cb93638c74dfe11de6df122546d12e9e5;hb=c94cedef255488e271ef59212a9899d9d22c1fae;hp=ce6ed156bde64b6b047d9f5daaf2585331a00d71;hpb=47a8dd64accd4e522331866a73bb79adc2d6ca78;p=gnulib.git

diff --git a/modules/wctype b/modules/wctype
index ce6ed156b..b212e35cb 100644
--- a/modules/wctype
+++ b/modules/wctype
@@ -3,37 +3,42 @@ A <wctype.h> that conforms better to C99.
 
 Files:
 lib/wctype.in.h
-m4/wctype.m4
+m4/wctype_h.m4
 m4/wint_t.m4
 
 Depends-on:
 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.in.h
+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|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|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' \
 	      -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:
 LGPLv2+