summaryrefslogtreecommitdiff
path: root/gnulib-m4/wcwidth.m4
diff options
context:
space:
mode:
authorStephen Kitt <skitt@debian.org>2016-05-27 10:11:04 +0200
committerManuel A. Fernandez Montecelo <manuel.montezelo@gmail.com>2016-05-27 14:28:33 +0100
commit752fd7247bc223bcea35bd89cf56d1c08ead9ba6 (patch)
treeb4a428f847a963738faaf24c8eff070fdb03a3a5 /gnulib-m4/wcwidth.m4
parent9f7d4fa477ff2a51d7c932b13d57ac22dc033105 (diff)
parenta9a31b1de5776a3b08a82101a4fa711294f0dd1d (diff)
Imported Debian patch 0.9.6+really0.9.3-0.1debian/0.9.6+really0.9.3-0.1
Diffstat (limited to 'gnulib-m4/wcwidth.m4')
-rw-r--r--gnulib-m4/wcwidth.m447
1 files changed, 20 insertions, 27 deletions
diff --git a/gnulib-m4/wcwidth.m4 b/gnulib-m4/wcwidth.m4
index b11dc8db..acceba54 100644
--- a/gnulib-m4/wcwidth.m4
+++ b/gnulib-m4/wcwidth.m4
@@ -1,5 +1,5 @@
-# wcwidth.m4 serial 23
-dnl Copyright (C) 2006-2015 Free Software Foundation, Inc.
+# wcwidth.m4 serial 16
+dnl Copyright (C) 2006-2010 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
@@ -18,7 +18,7 @@ AC_DEFUN([gl_FUNC_WCWIDTH],
AC_CHECK_HEADERS_ONCE([wchar.h])
AC_CHECK_FUNCS_ONCE([wcwidth])
- AC_CHECK_DECLS([wcwidth], [], [], [[
+ AC_CHECK_DECLS([wcwidth], [], [], [
/* AIX 3.2.5 declares wcwidth in <string.h>. */
#include <string.h>
/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
@@ -29,22 +29,19 @@ AC_DEFUN([gl_FUNC_WCWIDTH],
#include <stdio.h>
#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 = yes; then
- HAVE_WCWIDTH=1
- dnl On Mac OS X 10.3, wcwidth(0x0301) (COMBINING ACUTE ACCENT) returns 1.
- dnl On OpenBSD 5.0, wcwidth(0x05B0) (HEBREW POINT SHEVA) returns 1.
+ dnl On MacOS X 10.3, wcwidth(0x0301) (COMBINING ACUTE ACCENT) returns 1.
dnl On OSF/1 5.1, wcwidth(0x200B) (ZERO WIDTH SPACE) returns 1.
dnl This leads to bugs in 'ls' (coreutils).
AC_CACHE_CHECK([whether wcwidth works reasonably in UTF-8 locales],
[gl_cv_func_wcwidth_works],
[
- AC_RUN_IFELSE(
- [AC_LANG_SOURCE([[
+ AC_TRY_RUN([
#include <locale.h>
/* AIX 3.2.5 declares wcwidth in <string.h>. */
#include <string.h>
@@ -65,26 +62,17 @@ int wcwidth (int);
#endif
int main ()
{
- int result = 0;
if (setlocale (LC_ALL, "fr_FR.UTF-8") != NULL)
- {
- if (wcwidth (0x0301) > 0)
- result |= 1;
- if (wcwidth (0x05B0) > 0)
- result |= 2;
- if (wcwidth (0x200B) > 0)
- result |= 4;
- }
- return result;
-}]])],
- [gl_cv_func_wcwidth_works=yes],
- [gl_cv_func_wcwidth_works=no],
+ if (wcwidth (0x0301) > 0 || wcwidth (0x200B) > 0)
+ return 1;
+ return 0;
+}], [gl_cv_func_wcwidth_works=yes], [gl_cv_func_wcwidth_works=no],
[
changequote(,)dnl
case "$host_os" in
- # Guess yes on glibc and AIX 7 systems.
- *-gnu* | aix[7-9]*) gl_cv_func_wcwidth_works="guessing yes";;
- *) gl_cv_func_wcwidth_works="guessing no";;
+ # Guess yes on glibc systems.
+ *-gnu*) gl_cv_func_wcwidth_works="guessing yes";;
+ *) gl_cv_func_wcwidth_works="guessing no";;
esac
changequote([,])dnl
])
@@ -93,8 +81,13 @@ changequote([,])dnl
*yes) ;;
*no) REPLACE_WCWIDTH=1 ;;
esac
- else
- HAVE_WCWIDTH=0
+ fi
+ if test $ac_cv_func_wcwidth != yes || test $REPLACE_WCWIDTH = 1; then
+ AC_LIBOBJ([wcwidth])
+ fi
+ if test $ac_cv_func_wcwidth != yes || test $REPLACE_WCWIDTH = 1 \
+ || test $HAVE_DECL_WCWIDTH = 0; then
+ gl_REPLACE_WCHAR_H
fi
dnl We don't substitute HAVE_WCWIDTH. We assume that if the system does not
dnl have the wcwidth function, then it does not declare it.