diff options
| author | Bruno Haible <bruno@clisp.org> | 2017-10-09 22:03:39 +0200 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2017-10-09 22:03:39 +0200 |
| commit | 5e9abf87163ad4aeaefef0b02961f8674b0a4879 (patch) | |
| tree | f6bce11ddfbd7dc0c6f55ac5c015288fb6a1b3c3 | |
| parent | 180a0d70d117a9da652fa1aa17fff9537b082c2c (diff) | |
| download | gnulib-5e9abf87163ad4aeaefef0b02961f8674b0a4879.tar.gz | |
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".
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | m4/wcwidth.m4 | 4 |
2 files changed, 9 insertions, 2 deletions
@@ -1,5 +1,12 @@ 2017-10-09 Bruno Haible <bruno@clisp.org> + 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 <bruno@clisp.org> + getopt-posix: Fix build failure when using ac_cv_header_getopt_h=no. Reported by Christian Ehrhardt <christian.ehrhardt@canonical.com> and Daniel P. Berrange <berrange@redhat.com>. 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. |