From 5e9abf87163ad4aeaefef0b02961f8674b0a4879 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Mon, 9 Oct 2017 22:03:39 +0200 Subject: wcwidth: Don't use obsolete syntax of 'test'. Reported by Eric Blake. * m4/wcwidth.m4 (gl_FUNC_WCWIDTH): Don't optimize two 'test' invocations into one, as POSIX marks '-a' and '-o' as "obsolescent". --- ChangeLog | 7 +++++++ m4/wcwidth.m4 | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2adb915a0f..8d409706b8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2017-10-09 Bruno Haible + + wcwidth: Don't use obsolete syntax of 'test'. + Reported by Eric Blake. + * m4/wcwidth.m4 (gl_FUNC_WCWIDTH): Don't optimize two 'test' + invocations into one, as POSIX marks '-a' and '-o' as "obsolescent". + 2017-10-09 Bruno Haible getopt-posix: Fix build failure when using ac_cv_header_getopt_h=no. diff --git a/m4/wcwidth.m4 b/m4/wcwidth.m4 index b44a9ed0fd..1243606311 100644 --- a/m4/wcwidth.m4 +++ b/m4/wcwidth.m4 @@ -1,4 +1,4 @@ -# wcwidth.m4 serial 24 +# wcwidth.m4 serial 25 dnl Copyright (C) 2006-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -47,7 +47,7 @@ AC_DEFUN([gl_FUNC_WCWIDTH], ]) fi - if test $ac_cv_func_wcwidth = yes -o "$gl_cv_func_wcwidth_macro" = yes; then + if test $ac_cv_func_wcwidth = yes || test $gl_cv_func_wcwidth_macro = 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. -- cgit v1.2.1