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

[pspp] / modules / wchar

diff --git a/modules/wchar b/modules/wchar
index 93ebd4f7e1d790697fad84f9935759c0cabc1756..a24f877ffc2429792fb9e225c438f443c17be5a5 100644 (file)
--- a/modules/wchar
+++ b/modules/wchar
@@ -6,7 +6,8 @@ lib/wchar_.h
 m4/wchar.m4
 
 Depends-on:
-absolute-header
+include_next
+link-warning
 
 configure.ac:
 gl_WCHAR_H
@@ -19,9 +20,13 @@ BUILT_SOURCES += $(WCHAR_H)
 wchar.h: wchar_.h
        rm -f $@-t $@
        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-         sed -e 's|@''ABSOLUTE_WCHAR_H''@|$(ABSOLUTE_WCHAR_H)|g' \
-             -e 's/@''HAVE_INCLUDE_NEXT''@/$(HAVE_INCLUDE_NEXT)/g' \
+         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 $@