From: Bruno Haible Date: Fri, 11 Oct 2024 15:43:02 +0000 (+0200) Subject: bison-i18n: Add support for mingw builds on Cygwin hosts. X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=e979e268f05361154186a64d9814d457098c4fd8;p=gnulib.git bison-i18n: Add support for mingw builds on Cygwin hosts. * m4/bison-i18n.m4 (BISON_I18N): Define also BISON_LOCALEDIR_c and BISON_LOCALEDIR_c_make. * modules/bison-i18n (Files): Add m4/build-to-host.m4. --- diff --git a/ChangeLog b/ChangeLog index 517236fa6b..e56b67a268 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2024-10-11 Bruno Haible + + bison-i18n: Add support for mingw builds on Cygwin hosts. + * m4/bison-i18n.m4 (BISON_I18N): Define also BISON_LOCALEDIR_c and + BISON_LOCALEDIR_c_make. + * modules/bison-i18n (Files): Add m4/build-to-host.m4. + 2024-10-11 Bruno Haible build-to-host.m4: Add one more convenience macro. diff --git a/m4/bison-i18n.m4 b/m4/bison-i18n.m4 index ad8c1b2edf..62aaa4f16e 100644 --- a/m4/bison-i18n.m4 +++ b/m4/bison-i18n.m4 @@ -1,5 +1,5 @@ # bison-i18n.m4 -# serial 4 +# serial 5 dnl Copyright (C) 2005-2006, 2009-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -56,6 +56,26 @@ AC_DEFUN([BISON_I18N], fi fi AC_SUBST([BISON_LOCALEDIR]) + + dnl Define BISON_LOCALEDIR_c and BISON_LOCALEDIR_c_make. + dnl Find the final value of BISON_LOCALEDIR. + gl_saved_prefix="${prefix}" + gl_saved_datarootdir="${datarootdir}" + gl_saved_localedir="${localedir}" + gl_saved_bisonlocaledir="${BISON_LOCALEDIR}" + dnl Unfortunately, prefix gets only finally determined at the end of + dnl configure. + if test "X$prefix" = "XNONE"; then + prefix="$ac_default_prefix" + fi + eval datarootdir="$datarootdir" + eval localedir="$localedir" + eval BISON_LOCALEDIR="$BISON_LOCALEDIR" + gl_BUILD_TO_HOST([BISON_LOCALEDIR]) + BISON_LOCALEDIR="${gl_saved_bisonlocaledir}" + localedir="${gl_saved_localedir}" + datarootdir="${gl_saved_datarootdir}" + prefix="${gl_saved_prefix}" fi if test $BISON_USE_NLS = yes; then AC_DEFINE([YYENABLE_NLS], [1], diff --git a/modules/bison-i18n b/modules/bison-i18n index 0c763f1d92..b2bff0fadb 100644 --- a/modules/bison-i18n +++ b/modules/bison-i18n @@ -3,6 +3,7 @@ Support for internationalization of bison-generated parsers. Files: m4/bison-i18n.m4 +m4/build-to-host.m4 Depends-on: gettext