From 694e8acc49e776ea8b546530f9ffc9c1b2734466 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Wed, 5 Apr 2023 02:36:02 +0200 Subject: duplocale: Fix compilation error on Haiku (regression 2023-01-22). * lib/locale.in.h (duplocale): If HAVE_DUPLOCALE = 0, don't declare it, even if REPLACE_DUPLOCALE = 1. * modules/duplocale (Depends-on, configure.ac): Don't compile a replacement if HAVE_DUPLOCALE = 0 and REPLACE_DUPLOCALE = 1. --- modules/duplocale | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'modules/duplocale') diff --git a/modules/duplocale b/modules/duplocale index 80d4aaaf54..7c1a8730a5 100644 --- a/modules/duplocale +++ b/modules/duplocale @@ -7,11 +7,12 @@ m4/duplocale.m4 Depends-on: locale -setlocale-null [test $REPLACE_DUPLOCALE = 1] +setlocale-null [test $HAVE_DUPLOCALE = 1 && test $REPLACE_DUPLOCALE = 1] configure.ac: gl_FUNC_DUPLOCALE -gl_CONDITIONAL([GL_COND_OBJ_DUPLOCALE], [test $REPLACE_DUPLOCALE = 1]) +gl_CONDITIONAL([GL_COND_OBJ_DUPLOCALE], + [test $HAVE_DUPLOCALE = 1 && test $REPLACE_DUPLOCALE = 1]) AM_COND_IF([GL_COND_OBJ_DUPLOCALE], [ gl_PREREQ_DUPLOCALE ]) -- cgit v1.2.1