From 8aaff11b82298106fa5ce0ff3d22351d43dd468f Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Sun, 2 Jul 2006 22:15:50 +0000 Subject: [PATCH] * wcwidth.m4 (gl_FUNC_WCWIDTH): Simplify by using AC_CHECK_DECLS. --- m4/ChangeLog | 4 ++++ m4/wcwidth.m4 | 20 +++----------------- 2 files changed, 7 insertions(+), 17 deletions(-) diff --git a/m4/ChangeLog b/m4/ChangeLog index d25a4fa3d8..2a9931b002 100644 --- a/m4/ChangeLog +++ b/m4/ChangeLog @@ -1,3 +1,7 @@ +2006-07-02 Eric Blake + + * wcwidth.m4 (gl_FUNC_WCWIDTH): Simplify by using AC_CHECK_DECLS. + 2006-07-02 Paul Eggert * stdint.m4 (gl_STDINT_H): Use more-mnemonic identifiers for diff --git a/m4/wcwidth.m4 b/m4/wcwidth.m4 index 19bcce6d63..09cf55a0ef 100644 --- 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 . */ #if HAVE_STRING_H # include @@ -24,17 +23,4 @@ AC_DEFUN([gl_FUNC_WCWIDTH], #if HAVE_WCHAR_H # include #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.]) -]) +])]) -- 2.30.2