From bae00563655683adc5b14256dc2b85c2e8674605 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Wed, 1 Jan 2020 16:42:49 +0100 Subject: [PATCH] hard-locale tests: Fix a conflict with the C++ tests. * modules/hard-locale-tests (Makefile.am): Build a program named 'current-locale', not 'locale'. --- ChangeLog | 6 ++++++ modules/hard-locale-tests | 5 ++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index ac61fdf115..0bde2392a8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2020-01-01 Bruno Haible + + hard-locale tests: Fix a conflict with the C++ tests. + * modules/hard-locale-tests (Makefile.am): Build a program named + 'current-locale', not 'locale'. + 2020-01-01 Bruno Haible doc: Update documentation about wchar_t. diff --git a/modules/hard-locale-tests b/modules/hard-locale-tests index ddd101f175..ac7fcb2a67 100644 --- a/modules/hard-locale-tests +++ b/modules/hard-locale-tests @@ -15,5 +15,8 @@ AC_CHECK_FUNCS_ONCE([duplocale]) Makefile.am: TESTS += test-hard-locale check_PROGRAMS += test-hard-locale -noinst_PROGRAMS += locale test_hard_locale_LDADD = $(LDADD) $(LIB_SETLOCALE) @LIB_HARD_LOCALE@ +# We cannot call this program 'locale', because the C++ compiler on Mac OS X +# would then barf upon '#include '. So, call it 'current-locale'. +noinst_PROGRAMS += current-locale +current_locale_SOURCES = locale.c -- 2.39.5