diff options
| author | Bruno Haible <bruno@clisp.org> | 2023-04-23 13:25:42 +0200 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2023-04-23 13:35:30 +0200 |
| commit | e46a05b5ee1cbe2d6d0c2ac679b71ad3fd2f7c2d (patch) | |
| tree | b3eb9f5427f3e860f9b5aca0bfc9fbbaab6ac4ea /modules/unicase | |
| parent | 934167a39654699eca26869c96b875092dc16976 (diff) | |
| download | gnulib-e46a05b5ee1cbe2d6d0c2ac679b71ad3fd2f7c2d.tar.gz | |
libunistring: Fix build on Windows, when a libunistring is installed.
* lib/unicase.in.h: Include <unistring/woe32dll.h>.
(unicase_empty_prefix_context, unicase_empty_suffix_context): Declare
with GNULIB_UNICASE_..._DLL_VARIABLE.
* lib/unictype.in.h: Include <unistring/woe32dll.h>.
(UC_CATEGORY_*, UC_PROPERTY_*): Declare with
GNULIB_UNICTYPE_..._DLL_VARIABLE.
* lib/uninorm.in.h: Include <unistring/woe32dll.h>.
(unicode_normalization_form uninorm_nf*): Declare with
GNULIB_UNINORM_..._DLL_VARIABLE.
* m4/libunistring-base.m4 (gl_LIBUNISTRING_MODULE_WITH_VARIABLE): New
macro.
(gl_LIBUNISTRING_LIB_PREPARE): Set HAVE_UNISTRING_WOE32DLL_H.
* m4/unicase_h.m4: New file.
* m4/unictype_h.m4: New file.
* m4/uninorm_h.m4: New file.
* modules/unicase/base (Files): Add m4/unicase_h.m4.
(configure.ac): Bump version number. Invoke gl_UNICASE_H,
gl_UNICASE_H_REQUIRE_DEFAULTS.
(Makefile.am): Substitute all GNULIB_UNICASE_*_DLL_VARIABLE.
* modules/unicase/empty-*-context (configure.ac): Invoke
gl_UNICASE_H_REQUIRE_DEFAULTS. Use gl_LIBUNISTRING_MODULE_WITH_VARIABLE.
* modules/unictype/base (Files): Add m4/unictype_h.m4.
(configure.ac): Bump version number. Invoke gl_UNICTYPE_H,
gl_UNICTYPE_H_REQUIRE_DEFAULTS.
(Makefile.am): Substitute all GNULIB_UNICTYPE_*_DLL_VARIABLE.
* modules/unictype/category-* (configure.ac): Invoke
gl_UNICTYPE_H_REQUIRE_DEFAULTS. Use
gl_LIBUNISTRING_MODULE_WITH_VARIABLE.
* modules/unictype/property-* (configure.ac): Likewise.
* modules/uninorm/base (Files): Add m4/uninorm_h.m4.
(configure.ac): Bump version number. Invoke gl_UNINORM_H,
gl_UNINORM_H_REQUIRE_DEFAULTS.
(Makefile.am): Substitute all GNULIB_UNINORM_*_DLL_VARIABLE.
* modules/uninorm/nf* (configure.ac): Invoke
gl_UNINORM_H_REQUIRE_DEFAULTS. Use gl_LIBUNISTRING_MODULE_WITH_VARIABLE.
Diffstat (limited to 'modules/unicase')
| -rw-r--r-- | modules/unicase/base | 11 | ||||
| -rw-r--r-- | modules/unicase/empty-prefix-context | 3 | ||||
| -rw-r--r-- | modules/unicase/empty-suffix-context | 3 |
3 files changed, 13 insertions, 4 deletions
diff --git a/modules/unicase/base b/modules/unicase/base index f273200f99..527be8d80a 100644 --- a/modules/unicase/base +++ b/modules/unicase/base @@ -4,6 +4,7 @@ Base layer for Unicode character case mappings. Files: lib/unicase.in.h m4/libunistring-base.m4 +m4/unicase_h.m4 Depends-on: gen-header @@ -12,7 +13,9 @@ uninorm/base stdbool configure.ac: -gl_LIBUNISTRING_LIBHEADER([0.9.11], [unicase.h]) +gl_LIBUNISTRING_LIBHEADER([1.2], [unicase.h]) +gl_UNICASE_H +gl_UNICASE_H_REQUIRE_DEFAULTS AC_PROG_MKDIR_P Makefile.am: @@ -20,7 +23,11 @@ BUILT_SOURCES += $(LIBUNISTRING_UNICASE_H) unicase.h: unicase.in.h @NMD@ $(AM_V_GEN)$(MKDIR_P) '%reldir%' - $(gl_V_at)$(SED_HEADER_TO_AT_t) $(srcdir)/unicase.in.h + $(gl_V_at)$(SED_HEADER_STDOUT) \ + -e 's|@''HAVE_UNISTRING_WOE32DLL_H''@|$(HAVE_UNISTRING_WOE32DLL_H)|g' \ + -e 's/@''GNULIB_UNICASE_EMPTY_PREFIX_CONTEXT_DLL_VARIABLE''@/$(GNULIB_UNICASE_EMPTY_PREFIX_CONTEXT_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICASE_EMPTY_SUFFIX_CONTEXT_DLL_VARIABLE''@/$(GNULIB_UNICASE_EMPTY_SUFFIX_CONTEXT_DLL_VARIABLE)/g' \ + $(srcdir)/unicase.in.h > $@-t $(AM_V_at)mv $@-t $@ MOSTLYCLEANFILES += unicase.h unicase.h-t diff --git a/modules/unicase/empty-prefix-context b/modules/unicase/empty-prefix-context index 12406b8832..d6444be49c 100644 --- a/modules/unicase/empty-prefix-context +++ b/modules/unicase/empty-prefix-context @@ -8,7 +8,8 @@ Depends-on: unicase/base configure.ac: -gl_LIBUNISTRING_MODULE([0.9.11], [unicase/empty-prefix-context]) +gl_UNICASE_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([0.9.11], [unicase/empty-prefix-context]) Makefile.am: if LIBUNISTRING_COMPILE_UNICASE_EMPTY_PREFIX_CONTEXT diff --git a/modules/unicase/empty-suffix-context b/modules/unicase/empty-suffix-context index 0226e12526..103fab2efa 100644 --- a/modules/unicase/empty-suffix-context +++ b/modules/unicase/empty-suffix-context @@ -8,7 +8,8 @@ Depends-on: unicase/base configure.ac: -gl_LIBUNISTRING_MODULE([0.9.11], [unicase/empty-suffix-context]) +gl_UNICASE_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([0.9.11], [unicase/empty-suffix-context]) Makefile.am: if LIBUNISTRING_COMPILE_UNICASE_EMPTY_SUFFIX_CONTEXT |