diff options
| author | Bruno Haible <bruno@clisp.org> | 2023-01-22 14:21:48 +0100 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2023-01-22 15:57:15 +0100 |
| commit | a1e2c8310d3694d3a80201ea63371e33a58d2d2a (patch) | |
| tree | 377b85abd464ff9649810aa12412ab9e10711372 /m4/getdomainname.m4 | |
| parent | 2b7729265f7e38e1087cd9f51099cce5e862147d (diff) | |
| download | gnulib-a1e2c8310d3694d3a80201ea63371e33a58d2d2a.tar.gz | |
Resolve conflicts for functions introduced in Android API level 26.
* m4/getdomainname.m4 (gl_FUNC_GETDOMAINNAME): Test for getdomainname
using gl_CHECK_FUNCS_ANDROID instead of AC_CHECK_FUNCS. Conditionally
set REPLACE_GETSUBOPT.
Diffstat (limited to 'm4/getdomainname.m4')
| -rw-r--r-- | m4/getdomainname.m4 | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/m4/getdomainname.m4 b/m4/getdomainname.m4 index 8b118bafe7..54bc5a66e2 100644 --- a/m4/getdomainname.m4 +++ b/m4/getdomainname.m4 @@ -1,4 +1,4 @@ -# getdomainname.m4 serial 12 +# getdomainname.m4 serial 13 dnl Copyright (C) 2002-2003, 2008-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, @@ -19,7 +19,8 @@ AC_DEFUN([gl_FUNC_GETDOMAINNAME], dnl <https://web.archive.org/web/20100121182558/http://www.sun.com/software/solaris/programs/abi/appcert_faq.xml#q18>. dnl We need to avoid a collision with this function. dnl - Otherwise it is in libc. - AC_CHECK_FUNCS([getdomainname], , [ + gl_CHECK_FUNCS_ANDROID([getdomainname], [[#include <unistd.h>]]) + if test $ac_cv_func_getdomainname = no; then AC_CACHE_CHECK([for getdomainname in -lnsl], [gl_cv_func_getdomainname_in_libnsl], [gl_cv_func_getdomainname_in_libnsl=no @@ -38,7 +39,7 @@ AC_DEFUN([gl_FUNC_GETDOMAINNAME], [gl_cv_func_getdomainname_in_libnsl=yes]) LIBS="$gl_save_LIBS" ]) - ]) + fi dnl What about the declaration? dnl - It's int getdomainname(char *, size_t) on glibc, NetBSD, OpenBSD. @@ -85,10 +86,13 @@ AC_DEFUN([gl_FUNC_GETDOMAINNAME], HAVE_DECL_GETDOMAINNAME=0 fi - dnl TODO Android, cf. gl_CHECK_FUNCS_ANDROID. if { test $ac_cv_func_getdomainname = yes \ && test $gl_cv_decl_getdomainname_argtype2 != size_t; \ } \ + || case "$gl_cv_onwards_func_getdomainname" in \ + future*) true ;; \ + *) false ;; \ + esac \ || test "$gl_cv_func_getdomainname_in_libnsl" = yes; then REPLACE_GETDOMAINNAME=1 fi |