X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=modules%2Fwchar;h=6f685824b3ff6f9471444b3550952cfada931cec;hb=a179a84eaad67c3690f924f4a0d6852d13b073d1;hp=8312e96bc258155114b527150634d4542a929ca5;hpb=51a3188e1de710b4514c9f93d47245ad12948ecc;p=gnulib.git

diff --git a/modules/wchar b/modules/wchar
index 8312e96bc..6f685824b 100644
--- a/modules/wchar
+++ b/modules/wchar
@@ -2,11 +2,12 @@ Description:
 A <wchar.h> that works around platform issues.
 
 Files:
-lib/wchar_.h
+lib/wchar.in.h
 m4/wchar.m4
 
 Depends-on:
-absolute-header
+include_next
+link-warning
 
 configure.ac:
 gl_WCHAR_H
@@ -16,11 +17,17 @@ BUILT_SOURCES += $(WCHAR_H)
 
 # We need the following in order to create <wchar.h> when the system
 # version does not work standalone.
-wchar.h: wchar_.h
+wchar.h: wchar.in.h
 	rm -f $@-t $@
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-	  sed -e 's|@''ABSOLUTE_WCHAR_H''@|$(ABSOLUTE_WCHAR_H)|g' \
-	    < $(srcdir)/wchar_.h; \
+	  sed -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \
+	      -e 's|@''NEXT_WCHAR_H''@|$(NEXT_WCHAR_H)|g' \
+	      -e 's/@''HAVE_WCHAR_H''@/$(HAVE_WCHAR_H)/g' \
+	      -e 's|@''GNULIB_WCWIDTH''@|$(GNULIB_WCWIDTH)|g' \
+	      -e 's|@''HAVE_DECL_WCWIDTH''@|$(HAVE_DECL_WCWIDTH)|g' \
+	      -e 's|@''REPLACE_WCWIDTH''@|$(REPLACE_WCWIDTH)|g' \
+	      -e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \
+	    < $(srcdir)/wchar.in.h; \
 	} > $@-t
 	mv $@-t $@
 MOSTLYCLEANFILES += wchar.h wchar.h-t
@@ -29,7 +36,7 @@ Include:
 #include <wchar.h>
 
 License:
-LGPL
+LGPLv2+
 
 Maintainer:
 all