diff options
| author | Bruno Haible <bruno@clisp.org> | 2023-01-22 13:05:19 +0100 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2023-01-22 15:56:55 +0100 |
| commit | 134320a310c64fc3b497618cabc2749bd98735fb (patch) | |
| tree | 671c8f4a700d068901000cad498b53d0193ddadb /m4/sethostname.m4 | |
| parent | 9746be9cd8ccaebc0e1052c19da8d5644766caad (diff) | |
| download | gnulib-134320a310c64fc3b497618cabc2749bd98735fb.tar.gz | |
Resolve conflicts for functions introduced in Android API level 23.
* lib/unistd.in.h (sethostname): Consider REPLACE_SETHOSTNAME. Disable
_GL_CXXALIASWARN invocation on non-glibc systems.
* m4/unistd_h.m4 (gl_UNISTD_H_DEFAULTS): Initialize REPLACE_SETHOSTNAME.
* modules/unistd (Makefile.am): Substitute REPLACE_SETHOSTNAME.
* m4/sethostname.m4 (gl_FUNC_SETHOSTNAME): Conditionally set
REPLACE_SETHOSTNAME.
* modules/sethostname (Depends-on, configure.ac): Consider
REPLACE_SETHOSTNAME.
Diffstat (limited to 'm4/sethostname.m4')
| -rw-r--r-- | m4/sethostname.m4 | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/m4/sethostname.m4 b/m4/sethostname.m4 index 8f3cd18c6c..c3dea59464 100644 --- a/m4/sethostname.m4 +++ b/m4/sethostname.m4 @@ -1,4 +1,4 @@ -# sethostname.m4 serial 2 +# sethostname.m4 serial 3 dnl Copyright (C) 2011-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_FUNC_SETHOSTNAME], gl_CHECK_FUNCS_ANDROID([sethostname], [[#include <unistd.h>]]) if test $ac_cv_func_sethostname = no; then HAVE_SETHOSTNAME=0 + case "$gl_cv_onwards_func_sethostname" in + future*) REPLACE_SETHOSTNAME=1 ;; + esac fi AC_CHECK_DECLS([sethostname]) |