diff options
| author | Bruno Haible <bruno@clisp.org> | 2023-04-05 02:36:02 +0200 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2023-04-05 02:36:02 +0200 |
| commit | 694e8acc49e776ea8b546530f9ffc9c1b2734466 (patch) | |
| tree | a324c89f67f42824632b82f4419c61a239cf7f57 /modules | |
| parent | 8676cefc9b41e7b43bdd358965fd243ed83e95d6 (diff) | |
| download | gnulib-694e8acc49e776ea8b546530f9ffc9c1b2734466.tar.gz | |
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.
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/duplocale | 5 |
1 files changed, 3 insertions, 2 deletions
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 ]) |