summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruno Haible <bruno@clisp.org>2023-04-23 20:19:50 +0200
committerBruno Haible <bruno@clisp.org>2023-04-23 20:19:50 +0200
commit634ee03aa71607304b32e6c2fbeaca953625c5dd (patch)
treec8d5f26f479ae915468743687e70a6de8ceac167
parentda43b04cc39a814a367531f2e0d90cfd2333f8d5 (diff)
downloadgnulib-634ee03aa71607304b32e6c2fbeaca953625c5dd.tar.gz
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.
-rw-r--r--ChangeLog7
-rw-r--r--modules/unictype/category-none5
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 <bruno@clisp.org>
+
+ 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 <eggert@cs.ucla.edu>
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"