From 634ee03aa71607304b32e6c2fbeaca953625c5dd Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sun, 23 Apr 2023 20:19:50 +0200 Subject: category-none: Fix link errors on MSVC, when libunistring is installed. * modules/unictype/category-none (configure.ac): Remove gl_LIBUNISTRING_MODULE invocation. (Makefile.am): Compile unictype/categ_none.c always. --- ChangeLog | 7 +++++++ modules/unictype/category-none | 5 ++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8387b5ed57..ee64da3dba 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2023-04-23 Bruno Haible + + category-none: Fix link errors on MSVC, when libunistring is installed. + * modules/unictype/category-none (configure.ac): Remove + gl_LIBUNISTRING_MODULE invocation. + (Makefile.am): Compile unictype/categ_none.c always. + 2023-04-23 Paul Eggert manywarnings: use AS_IF diff --git a/modules/unictype/category-none b/modules/unictype/category-none index c07d55a96f..7b8aa83da6 100644 --- a/modules/unictype/category-none +++ b/modules/unictype/category-none @@ -8,12 +8,11 @@ Depends-on: unictype/base configure.ac: -gl_LIBUNISTRING_MODULE([0.9.8], [unictype/category-none]) +dnl Since _UC_CATEGORY_NONE is not exported from an installed libunistring, +dnl don't use gl_LIBUNISTRING_MODULE here. Makefile.am: -if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_NONE lib_SOURCES += unictype/categ_none.c -endif Include: "unictype.h" -- cgit v1.2.1