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

[pspp] / m4 / wcwidth.m4

diff --git a/m4/wcwidth.m4 b/m4/wcwidth.m4
index ddf86f8d730b207ae0802dd8d9f098f3bac36581..b6cedc2430dd8d93c44847f95293575242915c06 100644 (file)
--- a/m4/wcwidth.m4
+++ b/m4/wcwidth.m4
@@ -1,4 +1,4 @@
-# wcwidth.m4 serial 9
+# wcwidth.m4 serial 10
 dnl Copyright (C) 2006, 2007 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -6,10 +6,11 @@ dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_FUNC_WCWIDTH],
 [
+  AC_REQUIRE([gl_WCHAR_H_DEFAULTS])
+
   dnl Persuade glibc <wchar.h> to declare wcwidth().
   AC_REQUIRE([AC_GNU_SOURCE])
 
-  AC_REQUIRE([AC_C_INLINE])
   AC_REQUIRE([gt_TYPE_WCHAR_T])
   AC_REQUIRE([gt_TYPE_WINT_T])
 
@@ -28,8 +29,18 @@ AC_DEFUN([gl_FUNC_WCWIDTH],
 #include <time.h>
 #include <wchar.h>
 ])
+  if test $ac_cv_have_decl_wcwidth != yes; then
+    HAVE_DECL_WCWIDTH=0
+  fi
 
   if test $ac_cv_func_wcwidth = no; then
+    REPLACE_WCWIDTH=1
+  fi
+  if test $REPLACE_WCWIDTH = 1; then
     AC_LIBOBJ([wcwidth])
   fi
+
+  if test $REPLACE_WCWIDTH = 1 || test $HAVE_DECL_WCWIDTH = 0; then
+    WCHAR_H=wchar.h
+  fi
 ])