diff options
| author | Bruno Haible <bruno@clisp.org> | 2023-01-22 14:33:37 +0100 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2023-01-22 15:57:20 +0100 |
| commit | 64ad3c7d1d74fb34ab6ae92b8ab0fdd9cdd3bfbc (patch) | |
| tree | 08b87c7f98d2f3d383baf5b387d5948f7f6a5c3b /m4 | |
| parent | 39eda5d0b1b3d1df691102b311868ef4ce69d221 (diff) | |
| download | gnulib-64ad3c7d1d74fb34ab6ae92b8ab0fdd9cdd3bfbc.tar.gz | |
Resolve conflicts for functions introduced in Android API level 28.
* m4/glob.m4 (gl_GLOB): Conditionally set REPLACE_GLOB.
* lib/glob.in.h (glob): Disable _GL_CXXALIASWARN invocation on non-glibc
systems.
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/glob.m4 | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/m4/glob.m4 b/m4/glob.m4 index 9365f3362d..62be6a3397 100644 --- a/m4/glob.m4 +++ b/m4/glob.m4 @@ -1,4 +1,4 @@ -# glob.m4 serial 29 +# glob.m4 serial 30 dnl Copyright (C) 2005-2007, 2009-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -16,6 +16,9 @@ AC_DEFUN([gl_GLOB], gl_CHECK_FUNCS_ANDROID([glob], [[#include <glob.h>]]) if test $ac_cv_func_glob = no; then HAVE_GLOB=0 + case "$gl_cv_onwards_func_glob" in + future*) REPLACE_GLOB=1 ;; + esac else AC_CACHE_CHECK([for GNU glob interface version 1 or 2], |