* wcwidth.m4 (gl_FUNC_WCWIDTH): Simplify by using AC_CHECK_DECLS.

diff --git a/m4/ChangeLog b/m4/ChangeLog
index d25a4fa3d8c61522b205a61ea74e48b9b3a25a56..2a9931b002e5e42ed7e9d77434075dff91ca9142 100644 (file)
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,7 @@
+2006-07-02  Eric Blake  <ebb9@byu.net>
+
+       * wcwidth.m4 (gl_FUNC_WCWIDTH): Simplify by using AC_CHECK_DECLS.
+
 2006-07-02  Paul Eggert  <eggert@cs.ucla.edu>
 
        * stdint.m4 (gl_STDINT_H): Use more-mnemonic identifiers for

diff --git a/m4/wcwidth.m4 b/m4/wcwidth.m4
index 19bcce6d63c9fff3eec85e6c66c02cf4ae9b9aff..09cf55a0ef76bf92124b2b8f5ee025ab0e8b12b1 100644 (file)
--- a/m4/wcwidth.m4
+++ b/m4/wcwidth.m4
@@ -1,4 +1,4 @@
-# wcwidth.m4 serial 2
+# wcwidth.m4 serial 3
 dnl Copyright (C) 2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -15,8 +15,7 @@ AC_DEFUN([gl_FUNC_WCWIDTH],
   AC_CHECK_HEADERS_ONCE([wchar.h wctype.h])
   AC_CHECK_FUNCS_ONCE([iswprint wcwidth])
 
-  AC_CACHE_CHECK([whether wcwidth is declared], [ac_cv_have_decl_wcwidth],
-    [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
+  AC_CHECK_DECLS([wcwidth], [], [], [
 /* AIX 3.2.5 declares wcwidth in <string.h>. */
 #if HAVE_STRING_H
 # include <string.h>
@@ -24,17 +23,4 @@ AC_DEFUN([gl_FUNC_WCWIDTH],
 #if HAVE_WCHAR_H
 # include <wchar.h>
 #endif
-], [
-#ifndef wcwidth
-  char *p = (char *) wcwidth;
-#endif
-])], [ac_cv_have_decl_wcwidth=yes], [ac_cv_have_decl_wcwidth=no])])
-  if test $ac_cv_have_decl_wcwidth = yes; then
-    ac_val=1
-  else
-    ac_val=0
-  fi
-  AC_DEFINE_UNQUOTED([HAVE_DECL_WCWIDTH], [$ac_val],
-    [Define to 1 if you have the declaration of wcwidth(), and to 0
-     otherwise.])
-]) 
+])])