From: Bruno Haible Date: Fri, 2 Aug 2024 08:57:47 +0000 (+0200) Subject: Allow use of --avoid=extensions-aix. X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=48738f52579386257ee33501331bf3e1b2fc307d;p=gnulib.git Allow use of --avoid=extensions-aix. * m4/errno_h.m4 (gl_HEADER_ERRNO_H): Don't require gl_USE_AIX_EXTENSIONS explicitly. * m4/malloc.m4 (gl_FUNC_MALLOC_GNU): Likewise. * m4/calloc.m4 (gl_FUNC_CALLOC_GNU): Likewise. * m4/realloc.m4 (gl_FUNC_REALLOC_GNU): Likewise. * m4/scandir.m4 (gl_FUNC_SCANDIR): Likewise. --- diff --git a/ChangeLog b/ChangeLog index 55060e330a..2f1340a06a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2024-08-02 Bruno Haible + + Allow use of --avoid=extensions-aix. + * m4/errno_h.m4 (gl_HEADER_ERRNO_H): Don't require gl_USE_AIX_EXTENSIONS + explicitly. + * m4/malloc.m4 (gl_FUNC_MALLOC_GNU): Likewise. + * m4/calloc.m4 (gl_FUNC_CALLOC_GNU): Likewise. + * m4/realloc.m4 (gl_FUNC_REALLOC_GNU): Likewise. + * m4/scandir.m4 (gl_FUNC_SCANDIR): Likewise. + 2024-08-01 Bruno Haible math: Fix INFINITY and NAN on FreeBSD and AIX. diff --git a/m4/calloc.m4 b/m4/calloc.m4 index 6d9a808dbf..c69ce414a0 100644 --- a/m4/calloc.m4 +++ b/m4/calloc.m4 @@ -1,5 +1,5 @@ # calloc.m4 -# serial 33 +# serial 34 dnl Copyright (C) 2004-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -59,8 +59,9 @@ AC_DEFUN([gl_FUNC_CALLOC_GNU], AC_REQUIRE([gl_STDLIB_H_DEFAULTS]) AC_REQUIRE([gl_FUNC_CALLOC_POSIX]) - dnl This helps if !(__VEC__ || __AIXVEC), and shouldn't hurt otherwise. - AC_REQUIRE([gl_USE_AIX_EXTENSIONS]) + dnl Through the dependency on module extensions-aix, _LINUX_SOURCE_COMPAT + dnl gets defined already before this macro gets invoked. This helps + dnl if !(__VEC__ || __AIXVEC), and doesn't hurt otherwise. REPLACE_CALLOC_FOR_CALLOC_GNU="$REPLACE_CALLOC_FOR_CALLOC_POSIX" if test $REPLACE_CALLOC_FOR_CALLOC_GNU = 0; then diff --git a/m4/errno_h.m4 b/m4/errno_h.m4 index 9738a49f19..18bfd7b1c1 100644 --- a/m4/errno_h.m4 +++ b/m4/errno_h.m4 @@ -1,5 +1,5 @@ # errno_h.m4 -# serial 16 +# serial 17 dnl Copyright (C) 2004, 2006, 2008-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -11,8 +11,9 @@ AC_DEFUN_ONCE([gl_HEADER_ERRNO_H], [ AC_REQUIRE([AC_PROG_CC]) - dnl Persuade AIX 7.3 errno.h to make EEXIST != ENOTEMPTY. - AC_REQUIRE([gl_USE_AIX_EXTENSIONS]) + dnl Through the dependency on module extensions-aix, _LINUX_SOURCE_COMPAT + dnl gets defined already before this macro gets invoked. This persuades + dnl AIX 7.3 errno.h to assign ENOTEMPTY a value different than EEXIST. AC_CACHE_CHECK([for complete errno.h], [gl_cv_header_errno_h_complete], [ AC_EGREP_CPP([booboo],[ diff --git a/m4/malloc.m4 b/m4/malloc.m4 index 4a71b060b9..ee6df5c3fb 100644 --- a/m4/malloc.m4 +++ b/m4/malloc.m4 @@ -1,5 +1,5 @@ # malloc.m4 -# serial 33 +# serial 34 dnl Copyright (C) 2007, 2009-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -46,8 +46,9 @@ AC_DEFUN([gl_FUNC_MALLOC_GNU], AC_REQUIRE([gl_STDLIB_H_DEFAULTS]) AC_REQUIRE([gl_FUNC_MALLOC_POSIX]) - dnl This helps if !(__VEC__ || __AIXVEC), and shouldn't hurt otherwise. - AC_REQUIRE([gl_USE_AIX_EXTENSIONS]) + dnl Through the dependency on module extensions-aix, _LINUX_SOURCE_COMPAT + dnl gets defined already before this macro gets invoked. This helps + dnl if !(__VEC__ || __AIXVEC), and doesn't hurt otherwise. REPLACE_MALLOC_FOR_MALLOC_GNU="$REPLACE_MALLOC_FOR_MALLOC_POSIX" if test $REPLACE_MALLOC_FOR_MALLOC_GNU = 0; then diff --git a/m4/realloc.m4 b/m4/realloc.m4 index b3ec43a8a7..cc91102836 100644 --- a/m4/realloc.m4 +++ b/m4/realloc.m4 @@ -1,5 +1,5 @@ # realloc.m4 -# serial 31 +# serial 32 dnl Copyright (C) 2007, 2009-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -46,8 +46,9 @@ AC_DEFUN([gl_FUNC_REALLOC_GNU], AC_REQUIRE([gl_STDLIB_H_DEFAULTS]) AC_REQUIRE([gl_FUNC_REALLOC_POSIX]) - dnl This helps if !(__VEC__ || __AIXVEC), and shouldn't hurt otherwise. - AC_REQUIRE([gl_USE_AIX_EXTENSIONS]) + dnl Through the dependency on module extensions-aix, _LINUX_SOURCE_COMPAT + dnl gets defined already before this macro gets invoked. This helps + dnl if !(__VEC__ || __AIXVEC), and doesn't hurt otherwise. if test $REPLACE_REALLOC_FOR_REALLOC_GNU = 0; then _AC_FUNC_REALLOC_IF([], [REPLACE_REALLOC_FOR_REALLOC_GNU=1]) diff --git a/m4/scandir.m4 b/m4/scandir.m4 index c8673fc880..27b8af860d 100644 --- a/m4/scandir.m4 +++ b/m4/scandir.m4 @@ -1,5 +1,5 @@ # scandir.m4 -# serial 4 +# serial 5 dnl Copyright (C) 2009-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -12,8 +12,6 @@ AC_DEFUN([gl_FUNC_SCANDIR], dnl Persuade glibc and Solaris to declare scandir(). AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) - AC_REQUIRE([gl_USE_AIX_EXTENSIONS]) - AC_CHECK_FUNCS([scandir]) if test $ac_cv_func_scandir = no; then HAVE_SCANDIR=0