From: Bruno Haible Date: Sat, 25 Jan 2020 09:13:56 +0000 (+0100) Subject: hard-locale tests: Make it easy to reuse the musl test. X-Git-Tag: v1.0~4328 X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=55cf4e2076fe42abbc111e750fbfc56302dae373;p=gnulib.git hard-locale tests: Make it easy to reuse the musl test. * m4/musl.m4: New file, extracted from modules/hard-locale-tests. * modules/hard-locale-tests (Files): Add it. (configure.ac): Invoke gl_MUSL_LIBC. --- diff --git a/ChangeLog b/ChangeLog index 3b4d32dc63..88285ee188 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2020-01-25 Bruno Haible + + hard-locale tests: Make it easy to reuse the musl test. + * m4/musl.m4: New file, extracted from modules/hard-locale-tests. + * modules/hard-locale-tests (Files): Add it. + (configure.ac): Invoke gl_MUSL_LIBC. + 2020-01-24 Paul Eggert regex: port to Gawk on nonstandard platforms diff --git a/m4/musl.m4 b/m4/musl.m4 new file mode 100644 index 0000000000..252054c99b --- /dev/null +++ b/m4/musl.m4 @@ -0,0 +1,18 @@ +# musl.m4 serial 1 +dnl Copyright (C) 2019-2020 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +# Test for musl libc, despite the musl libc authors don't like it +# +# . +# From Bruno Haible. + +AC_DEFUN_ONCE([gl_MUSL_LIBC], +[ + AC_REQUIRE([AC_CANONICAL_HOST]) + case "$host_os" in + *-musl*) AC_DEFINE([MUSL_LIBC], [1], [Define to 1 on musl libc.]) ;; + esac +]) diff --git a/modules/hard-locale-tests b/modules/hard-locale-tests index ac7fcb2a67..7ed85754e5 100644 --- a/modules/hard-locale-tests +++ b/modules/hard-locale-tests @@ -1,14 +1,12 @@ Files: tests/test-hard-locale.c tests/locale.c +m4/musl.m4 Depends-on: configure.ac: -AC_REQUIRE([AC_CANONICAL_HOST]) -case "$host_os" in - *-musl*) AC_DEFINE([MUSL_LIBC], [1], [Define to 1 on musl libc.]) ;; -esac +gl_MUSL_LIBC dnl Distinguish OpenBSD >= 6.2 from OpenBSD < 6.2. AC_CHECK_FUNCS_ONCE([duplocale])