* modules/hard-locale-tests (Makefile.am): Build a program named
'current-locale', not 'locale'.
+2020-01-01 Bruno Haible <bruno@clisp.org>
+
+ 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 <bruno@clisp.org>
doc: Update documentation about wchar_t.
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 <locale>'. So, call it 'current-locale'.
+noinst_PROGRAMS += current-locale
+current_locale_SOURCES = locale.c