From: Bruno Haible Date: Wed, 25 Dec 2024 14:14:32 +0000 (+0100) Subject: stdlib: Improve change from 2024-12-23. X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f9204fa1f75308e0f64f4bcf55104df26afb22f9;p=thirdparty%2Fgnulib.git stdlib: Improve change from 2024-12-23. * m4/stdlib_h.m4 (gl_STDLIB_H): Improve indentation. --- diff --git a/ChangeLog b/ChangeLog index 4e93cf372f..e609ecf440 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2024-12-25 Bruno Haible + + stdlib: Improve change from 2024-12-23. + * m4/stdlib_h.m4 (gl_STDLIB_H): Improve indentation. + 2024-12-24 Bruno Haible access, euidaccess tests: Avoid test failure in Cygwin 3.5.5. diff --git a/m4/stdlib_h.m4 b/m4/stdlib_h.m4 index f1192e3d25..ba56a9480b 100644 --- a/m4/stdlib_h.m4 +++ b/m4/stdlib_h.m4 @@ -1,5 +1,5 @@ # stdlib_h.m4 -# serial 83 +# serial 84 dnl Copyright (C) 2007-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, @@ -42,19 +42,20 @@ AC_DEFUN_ONCE([gl_STDLIB_H], AC_CACHE_CHECK([whether MB_CUR_MAX is correct], [gl_cv_macro_MB_CUR_MAX_good], [AC_LINK_IFELSE( - [AC_LANG_PROGRAM([[#include - ]], - [[return !!MB_CUR_MAX;]])], - [dnl Initial guess, used when cross-compiling or when no suitable locale - dnl is present. - # Guess no on Solaris and Haiku, yes otherwise. - AS_CASE([$host_os], - [solaris* | haiku*], - [gl_cv_macro_MB_CUR_MAX_good="guessing no"], - [gl_cv_macro_MB_CUR_MAX_good="guessing yes"]) - if test "$LOCALE_EN_UTF8" != none; then - AC_RUN_IFELSE( - [AC_LANG_SOURCE([[ + [AC_LANG_PROGRAM([[#include + ]], + [[return !!MB_CUR_MAX;]]) + ], + [dnl Initial guess, used when cross-compiling or when no suitable locale + dnl is present. + # Guess no on Solaris and Haiku, yes otherwise. + AS_CASE([$host_os], + [solaris* | haiku*], + [gl_cv_macro_MB_CUR_MAX_good="guessing no"], + [gl_cv_macro_MB_CUR_MAX_good="guessing yes"]) + if test "$LOCALE_EN_UTF8" != none; then + AC_RUN_IFELSE( + [AC_LANG_SOURCE([[ #include #include int main () @@ -67,12 +68,12 @@ int main () } return result; }]])], - [gl_cv_macro_MB_CUR_MAX_good=yes], - [gl_cv_macro_MB_CUR_MAX_good=no], - [:]) - fi - ], - [gl_cv_macro_MB_CUR_MAX_good="link failed - so no"]) + [gl_cv_macro_MB_CUR_MAX_good=yes], + [gl_cv_macro_MB_CUR_MAX_good=no], + [:]) + fi + ], + [gl_cv_macro_MB_CUR_MAX_good="link failed - so no"]) ]) AS_CASE([$gl_cv_macro_MB_CUR_MAX_good], [*yes],