Remove the wcwidth.h file. Move wcwidth's declaration to wchar_.h.

[pspp] / modules / wchar

diff --git a/modules/wchar b/modules/wchar
index 7cb8db3920a188e8d0647937cf678574a18bb56c..a24f877ffc2429792fb9e225c438f443c17be5a5 100644 (file)
--- a/modules/wchar
+++ b/modules/wchar
@@ -7,6 +7,7 @@ m4/wchar.m4
 
 Depends-on:
 include_next
+link-warning
 
 configure.ac:
 gl_WCHAR_H
@@ -22,6 +23,10 @@ wchar.h: 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_.h; \
        } > $@-t
        mv $@-t $@