From 269da69eebd34b04e135b97c6794e9af38802837 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sat, 5 Aug 2023 02:40:03 +0200 Subject: [PATCH] unistr/{u8-mbtouc,u8-mbsnlen}: Fix test failures (regr. 2023-07-25). * modules/unistr/u8-mbtouc (configure.ac): Compile this code if the preinstalled libunistring version is >= 0.9.4, < 1.2. * modules/unistr/u8-mbsnlen (configure.ac): Likewise. --- ChangeLog | 5 +++++ modules/unistr/u8-mbsnlen | 2 +- modules/unistr/u8-mbtouc | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 12b0e68779..a6b3a10da2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2023-08-04 Bruno Haible + unistr/{u8-mbtouc,u8-mbsnlen}: Fix test failures (regr. 2023-07-25). + * modules/unistr/u8-mbtouc (configure.ac): Compile this code if the + preinstalled libunistring version is >= 0.9.4, < 1.2. + * modules/unistr/u8-mbsnlen (configure.ac): Likewise. + unistr/*-pcpy: Fix compilation errors (regression 2023-07-21). * modules/unistr/base (configure.ac): Generate unistr.h if the preinstalled libunistring version is >= 0.9.11, < 1.2. diff --git a/modules/unistr/u8-mbsnlen b/modules/unistr/u8-mbsnlen index 81ced96d0e..0ac4135685 100644 --- a/modules/unistr/u8-mbsnlen +++ b/modules/unistr/u8-mbsnlen @@ -10,7 +10,7 @@ unistr/u8-mbtoucr unistr/u8-mbtouc configure.ac: -gl_LIBUNISTRING_MODULE([0.9.4], [unistr/u8-mbsnlen]) +gl_LIBUNISTRING_MODULE([1.2], [unistr/u8-mbsnlen]) Makefile.am: if LIBUNISTRING_COMPILE_UNISTR_U8_MBSNLEN diff --git a/modules/unistr/u8-mbtouc b/modules/unistr/u8-mbtouc index 89370fde70..9eabaca559 100644 --- a/modules/unistr/u8-mbtouc +++ b/modules/unistr/u8-mbtouc @@ -10,7 +10,7 @@ unistr/base configure.ac: gl_MODULE_INDICATOR([unistr/u8-mbtouc]) -gl_LIBUNISTRING_MODULE([0.9.4], [unistr/u8-mbtouc]) +gl_LIBUNISTRING_MODULE([1.2], [unistr/u8-mbtouc]) Makefile.am: if LIBUNISTRING_COMPILE_UNISTR_U8_MBTOUC -- 2.39.5