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 | |
| 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.
148 files changed, 939 insertions, 281 deletions
@@ -1,3 +1,42 @@ +2023-04-23 Bruno Haible <bruno@clisp.org> + + 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. + 2023-04-22 Bruno Haible <bruno@clisp.org> Avoid some Autoconf "was expanded before it was required" warnings. diff --git a/lib/unicase.in.h b/lib/unicase.in.h index cf2bc9bd62..f6b86d33f3 100644 --- a/lib/unicase.in.h +++ b/lib/unicase.in.h @@ -36,6 +36,12 @@ /* Get uninorm_t. */ #include "uninorm.h" +#if @HAVE_UNISTRING_WOE32DLL_H@ +# include <unistring/woe32dll.h> +#else +# define LIBUNISTRING_DLL_VARIABLE +#endif + #ifdef __cplusplus extern "C" { #endif @@ -155,7 +161,7 @@ typedef struct casing_prefix_context } casing_prefix_context_t; /* The case-mapping context of the empty prefix string. */ -extern const casing_prefix_context_t unicase_empty_prefix_context; +extern @GNULIB_UNICASE_EMPTY_PREFIX_CONTEXT_DLL_VARIABLE@ const casing_prefix_context_t unicase_empty_prefix_context; /* Return the case-mapping context of a given prefix string. */ extern casing_prefix_context_t u8_casing_prefix_context (const uint8_t *s, size_t n); @@ -184,7 +190,7 @@ typedef struct casing_suffix_context } casing_suffix_context_t; /* The case-mapping context of the empty suffix string. */ -extern const casing_suffix_context_t unicase_empty_suffix_context; +extern @GNULIB_UNICASE_EMPTY_SUFFIX_CONTEXT_DLL_VARIABLE@ const casing_suffix_context_t unicase_empty_suffix_context; /* Return the case-mapping context of a given suffix string. */ extern casing_suffix_context_t u8_casing_suffix_context (const uint8_t *s, size_t n); diff --git a/lib/unictype.in.h b/lib/unictype.in.h index c2f21c18f5..bab2aaf97a 100644 --- a/lib/unictype.in.h +++ b/lib/unictype.in.h @@ -25,6 +25,12 @@ /* Get size_t. */ #include <stddef.h> +#if @HAVE_UNISTRING_WOE32DLL_H@ +# include <unistring/woe32dll.h> +#else +# define LIBUNISTRING_DLL_VARIABLE +#endif + #ifdef __cplusplus extern "C" { #endif @@ -101,44 +107,44 @@ enum }; /* Predefined General category values. */ -extern const uc_general_category_t UC_CATEGORY_L; -extern const uc_general_category_t UC_CATEGORY_LC; -extern const uc_general_category_t UC_CATEGORY_Lu; -extern const uc_general_category_t UC_CATEGORY_Ll; -extern const uc_general_category_t UC_CATEGORY_Lt; -extern const uc_general_category_t UC_CATEGORY_Lm; -extern const uc_general_category_t UC_CATEGORY_Lo; -extern const uc_general_category_t UC_CATEGORY_M; -extern const uc_general_category_t UC_CATEGORY_Mn; -extern const uc_general_category_t UC_CATEGORY_Mc; -extern const uc_general_category_t UC_CATEGORY_Me; -extern const uc_general_category_t UC_CATEGORY_N; -extern const uc_general_category_t UC_CATEGORY_Nd; -extern const uc_general_category_t UC_CATEGORY_Nl; -extern const uc_general_category_t UC_CATEGORY_No; -extern const uc_general_category_t UC_CATEGORY_P; -extern const uc_general_category_t UC_CATEGORY_Pc; -extern const uc_general_category_t UC_CATEGORY_Pd; -extern const uc_general_category_t UC_CATEGORY_Ps; -extern const uc_general_category_t UC_CATEGORY_Pe; -extern const uc_general_category_t UC_CATEGORY_Pi; -extern const uc_general_category_t UC_CATEGORY_Pf; -extern const uc_general_category_t UC_CATEGORY_Po; -extern const uc_general_category_t UC_CATEGORY_S; -extern const uc_general_category_t UC_CATEGORY_Sm; -extern const uc_general_category_t UC_CATEGORY_Sc; -extern const uc_general_category_t UC_CATEGORY_Sk; -extern const uc_general_category_t UC_CATEGORY_So; -extern const uc_general_category_t UC_CATEGORY_Z; -extern const uc_general_category_t UC_CATEGORY_Zs; -extern const uc_general_category_t UC_CATEGORY_Zl; -extern const uc_general_category_t UC_CATEGORY_Zp; -extern const uc_general_category_t UC_CATEGORY_C; -extern const uc_general_category_t UC_CATEGORY_Cc; -extern const uc_general_category_t UC_CATEGORY_Cf; -extern const uc_general_category_t UC_CATEGORY_Cs; -extern const uc_general_category_t UC_CATEGORY_Co; -extern const uc_general_category_t UC_CATEGORY_Cn; +extern @GNULIB_UNICTYPE_CATEGORY_L_DLL_VARIABLE@ const uc_general_category_t UC_CATEGORY_L; +extern @GNULIB_UNICTYPE_CATEGORY_LC_DLL_VARIABLE@ const uc_general_category_t UC_CATEGORY_LC; +extern @GNULIB_UNICTYPE_CATEGORY_LU_DLL_VARIABLE@ const uc_general_category_t UC_CATEGORY_Lu; +extern @GNULIB_UNICTYPE_CATEGORY_LL_DLL_VARIABLE@ const uc_general_category_t UC_CATEGORY_Ll; +extern @GNULIB_UNICTYPE_CATEGORY_LT_DLL_VARIABLE@ const uc_general_category_t UC_CATEGORY_Lt; +extern @GNULIB_UNICTYPE_CATEGORY_LM_DLL_VARIABLE@ const uc_general_category_t UC_CATEGORY_Lm; +extern @GNULIB_UNICTYPE_CATEGORY_LO_DLL_VARIABLE@ const uc_general_category_t UC_CATEGORY_Lo; +extern @GNULIB_UNICTYPE_CATEGORY_M_DLL_VARIABLE@ const uc_general_category_t UC_CATEGORY_M; +extern @GNULIB_UNICTYPE_CATEGORY_MN_DLL_VARIABLE@ const uc_general_category_t UC_CATEGORY_Mn; +extern @GNULIB_UNICTYPE_CATEGORY_MC_DLL_VARIABLE@ const uc_general_category_t UC_CATEGORY_Mc; +extern @GNULIB_UNICTYPE_CATEGORY_ME_DLL_VARIABLE@ const uc_general_category_t UC_CATEGORY_Me; +extern @GNULIB_UNICTYPE_CATEGORY_N_DLL_VARIABLE@ const uc_general_category_t UC_CATEGORY_N; +extern @GNULIB_UNICTYPE_CATEGORY_ND_DLL_VARIABLE@ const uc_general_category_t UC_CATEGORY_Nd; +extern @GNULIB_UNICTYPE_CATEGORY_NL_DLL_VARIABLE@ const uc_general_category_t UC_CATEGORY_Nl; +extern @GNULIB_UNICTYPE_CATEGORY_NO_DLL_VARIABLE@ const uc_general_category_t UC_CATEGORY_No; +extern @GNULIB_UNICTYPE_CATEGORY_P_DLL_VARIABLE@ const uc_general_category_t UC_CATEGORY_P; +extern @GNULIB_UNICTYPE_CATEGORY_PC_DLL_VARIABLE@ const uc_general_category_t UC_CATEGORY_Pc; +extern @GNULIB_UNICTYPE_CATEGORY_PD_DLL_VARIABLE@ const uc_general_category_t UC_CATEGORY_Pd; +extern @GNULIB_UNICTYPE_CATEGORY_PS_DLL_VARIABLE@ const uc_general_category_t UC_CATEGORY_Ps; +extern @GNULIB_UNICTYPE_CATEGORY_PE_DLL_VARIABLE@ const uc_general_category_t UC_CATEGORY_Pe; +extern @GNULIB_UNICTYPE_CATEGORY_PI_DLL_VARIABLE@ const uc_general_category_t UC_CATEGORY_Pi; +extern @GNULIB_UNICTYPE_CATEGORY_PF_DLL_VARIABLE@ const uc_general_category_t UC_CATEGORY_Pf; +extern @GNULIB_UNICTYPE_CATEGORY_PO_DLL_VARIABLE@ const uc_general_category_t UC_CATEGORY_Po; +extern @GNULIB_UNICTYPE_CATEGORY_S_DLL_VARIABLE@ const uc_general_category_t UC_CATEGORY_S; +extern @GNULIB_UNICTYPE_CATEGORY_SM_DLL_VARIABLE@ const uc_general_category_t UC_CATEGORY_Sm; +extern @GNULIB_UNICTYPE_CATEGORY_SC_DLL_VARIABLE@ const uc_general_category_t UC_CATEGORY_Sc; +extern @GNULIB_UNICTYPE_CATEGORY_SK_DLL_VARIABLE@ const uc_general_category_t UC_CATEGORY_Sk; +extern @GNULIB_UNICTYPE_CATEGORY_SO_DLL_VARIABLE@ const uc_general_category_t UC_CATEGORY_So; +extern @GNULIB_UNICTYPE_CATEGORY_Z_DLL_VARIABLE@ const uc_general_category_t UC_CATEGORY_Z; +extern @GNULIB_UNICTYPE_CATEGORY_ZS_DLL_VARIABLE@ const uc_general_category_t UC_CATEGORY_Zs; +extern @GNULIB_UNICTYPE_CATEGORY_ZL_DLL_VARIABLE@ const uc_general_category_t UC_CATEGORY_Zl; +extern @GNULIB_UNICTYPE_CATEGORY_ZP_DLL_VARIABLE@ const uc_general_category_t UC_CATEGORY_Zp; +extern @GNULIB_UNICTYPE_CATEGORY_C_DLL_VARIABLE@ const uc_general_category_t UC_CATEGORY_C; +extern @GNULIB_UNICTYPE_CATEGORY_CC_DLL_VARIABLE@ const uc_general_category_t UC_CATEGORY_Cc; +extern @GNULIB_UNICTYPE_CATEGORY_CF_DLL_VARIABLE@ const uc_general_category_t UC_CATEGORY_Cf; +extern @GNULIB_UNICTYPE_CATEGORY_CS_DLL_VARIABLE@ const uc_general_category_t UC_CATEGORY_Cs; +extern @GNULIB_UNICTYPE_CATEGORY_CO_DLL_VARIABLE@ const uc_general_category_t UC_CATEGORY_Co; +extern @GNULIB_UNICTYPE_CATEGORY_CN_DLL_VARIABLE@ const uc_general_category_t UC_CATEGORY_Cn; /* Non-public. */ extern const uc_general_category_t _UC_CATEGORY_NONE; @@ -602,107 +608,107 @@ uc_property_t; /* Predefined properties. */ /* General. */ -extern const uc_property_t UC_PROPERTY_WHITE_SPACE; -extern const uc_property_t UC_PROPERTY_ALPHABETIC; -extern const uc_property_t UC_PROPERTY_OTHER_ALPHABETIC; -extern const uc_property_t UC_PROPERTY_NOT_A_CHARACTER; -extern const uc_property_t UC_PROPERTY_DEFAULT_IGNORABLE_CODE_POINT; -extern const uc_property_t UC_PROPERTY_OTHER_DEFAULT_IGNORABLE_CODE_POINT; -extern const uc_property_t UC_PROPERTY_DEPRECATED; -extern const uc_property_t UC_PROPERTY_LOGICAL_ORDER_EXCEPTION; -extern const uc_property_t UC_PROPERTY_VARIATION_SELECTOR; -extern const uc_property_t UC_PROPERTY_PRIVATE_USE; -extern const uc_property_t UC_PROPERTY_UNASSIGNED_CODE_VALUE; +extern @GNULIB_UNICTYPE_PROPERTY_WHITE_SPACE_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_WHITE_SPACE; +extern @GNULIB_UNICTYPE_PROPERTY_ALPHABETIC_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_ALPHABETIC; +extern @GNULIB_UNICTYPE_PROPERTY_OTHER_ALPHABETIC_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_OTHER_ALPHABETIC; +extern @GNULIB_UNICTYPE_PROPERTY_NOT_A_CHARACTER_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_NOT_A_CHARACTER; +extern @GNULIB_UNICTYPE_PROPERTY_DEFAULT_IGNORABLE_CODE_POINT_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_DEFAULT_IGNORABLE_CODE_POINT; +extern @GNULIB_UNICTYPE_PROPERTY_OTHER_DEFAULT_IGNORABLE_CODE_POINT_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_OTHER_DEFAULT_IGNORABLE_CODE_POINT; +extern @GNULIB_UNICTYPE_PROPERTY_DEPRECATED_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_DEPRECATED; +extern @GNULIB_UNICTYPE_PROPERTY_LOGICAL_ORDER_EXCEPTION_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_LOGICAL_ORDER_EXCEPTION; +extern @GNULIB_UNICTYPE_PROPERTY_VARIATION_SELECTOR_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_VARIATION_SELECTOR; +extern @GNULIB_UNICTYPE_PROPERTY_PRIVATE_USE_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_PRIVATE_USE; +extern @GNULIB_UNICTYPE_PROPERTY_UNASSIGNED_CODE_VALUE_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_UNASSIGNED_CODE_VALUE; /* Case. */ -extern const uc_property_t UC_PROPERTY_UPPERCASE; -extern const uc_property_t UC_PROPERTY_OTHER_UPPERCASE; -extern const uc_property_t UC_PROPERTY_LOWERCASE; -extern const uc_property_t UC_PROPERTY_OTHER_LOWERCASE; -extern const uc_property_t UC_PROPERTY_TITLECASE; -extern const uc_property_t UC_PROPERTY_CASED; -extern const uc_property_t UC_PROPERTY_CASE_IGNORABLE; -extern const uc_property_t UC_PROPERTY_CHANGES_WHEN_LOWERCASED; -extern const uc_property_t UC_PROPERTY_CHANGES_WHEN_UPPERCASED; -extern const uc_property_t UC_PROPERTY_CHANGES_WHEN_TITLECASED; -extern const uc_property_t UC_PROPERTY_CHANGES_WHEN_CASEFOLDED; -extern const uc_property_t UC_PROPERTY_CHANGES_WHEN_CASEMAPPED; -extern const uc_property_t UC_PROPERTY_SOFT_DOTTED; +extern @GNULIB_UNICTYPE_PROPERTY_UPPERCASE_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_UPPERCASE; +extern @GNULIB_UNICTYPE_PROPERTY_OTHER_UPPERCASE_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_OTHER_UPPERCASE; +extern @GNULIB_UNICTYPE_PROPERTY_LOWERCASE_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_LOWERCASE; +extern @GNULIB_UNICTYPE_PROPERTY_OTHER_LOWERCASE_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_OTHER_LOWERCASE; +extern @GNULIB_UNICTYPE_PROPERTY_TITLECASE_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_TITLECASE; +extern @GNULIB_UNICTYPE_PROPERTY_CASED_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_CASED; +extern @GNULIB_UNICTYPE_PROPERTY_CASE_IGNORABLE_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_CASE_IGNORABLE; +extern @GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_LOWERCASED_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_CHANGES_WHEN_LOWERCASED; +extern @GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_UPPERCASED_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_CHANGES_WHEN_UPPERCASED; +extern @GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_TITLECASED_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_CHANGES_WHEN_TITLECASED; +extern @GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_CASEFOLDED_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_CHANGES_WHEN_CASEFOLDED; +extern @GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_CASEMAPPED_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_CHANGES_WHEN_CASEMAPPED; +extern @GNULIB_UNICTYPE_PROPERTY_SOFT_DOTTED_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_SOFT_DOTTED; /* Identifiers. */ -extern const uc_property_t UC_PROPERTY_ID_START; -extern const uc_property_t UC_PROPERTY_OTHER_ID_START; -extern const uc_property_t UC_PROPERTY_ID_CONTINUE; -extern const uc_property_t UC_PROPERTY_OTHER_ID_CONTINUE; -extern const uc_property_t UC_PROPERTY_XID_START; -extern const uc_property_t UC_PROPERTY_XID_CONTINUE; -extern const uc_property_t UC_PROPERTY_PATTERN_WHITE_SPACE; -extern const uc_property_t UC_PROPERTY_PATTERN_SYNTAX; +extern @GNULIB_UNICTYPE_PROPERTY_ID_START_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_ID_START; +extern @GNULIB_UNICTYPE_PROPERTY_OTHER_ID_START_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_OTHER_ID_START; +extern @GNULIB_UNICTYPE_PROPERTY_ID_CONTINUE_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_ID_CONTINUE; +extern @GNULIB_UNICTYPE_PROPERTY_OTHER_ID_CONTINUE_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_OTHER_ID_CONTINUE; +extern @GNULIB_UNICTYPE_PROPERTY_XID_START_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_XID_START; +extern @GNULIB_UNICTYPE_PROPERTY_XID_CONTINUE_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_XID_CONTINUE; +extern @GNULIB_UNICTYPE_PROPERTY_PATTERN_WHITE_SPACE_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_PATTERN_WHITE_SPACE; +extern @GNULIB_UNICTYPE_PROPERTY_PATTERN_SYNTAX_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_PATTERN_SYNTAX; /* Shaping and rendering. */ -extern const uc_property_t UC_PROPERTY_JOIN_CONTROL; -extern const uc_property_t UC_PROPERTY_GRAPHEME_BASE; -extern const uc_property_t UC_PROPERTY_GRAPHEME_EXTEND; -extern const uc_property_t UC_PROPERTY_OTHER_GRAPHEME_EXTEND; -extern const uc_property_t UC_PROPERTY_GRAPHEME_LINK; +extern @GNULIB_UNICTYPE_PROPERTY_JOIN_CONTROL_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_JOIN_CONTROL; +extern @GNULIB_UNICTYPE_PROPERTY_GRAPHEME_BASE_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_GRAPHEME_BASE; +extern @GNULIB_UNICTYPE_PROPERTY_GRAPHEME_EXTEND_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_GRAPHEME_EXTEND; +extern @GNULIB_UNICTYPE_PROPERTY_OTHER_GRAPHEME_EXTEND_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_OTHER_GRAPHEME_EXTEND; +extern @GNULIB_UNICTYPE_PROPERTY_GRAPHEME_LINK_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_GRAPHEME_LINK; /* Bidi. */ -extern const uc_property_t UC_PROPERTY_BIDI_CONTROL; -extern const uc_property_t UC_PROPERTY_BIDI_LEFT_TO_RIGHT; -extern const uc_property_t UC_PROPERTY_BIDI_HEBREW_RIGHT_TO_LEFT; -extern const uc_property_t UC_PROPERTY_BIDI_ARABIC_RIGHT_TO_LEFT; -extern const uc_property_t UC_PROPERTY_BIDI_EUROPEAN_DIGIT; -extern const uc_property_t UC_PROPERTY_BIDI_EUR_NUM_SEPARATOR; -extern const uc_property_t UC_PROPERTY_BIDI_EUR_NUM_TERMINATOR; -extern const uc_property_t UC_PROPERTY_BIDI_ARABIC_DIGIT; -extern const uc_property_t UC_PROPERTY_BIDI_COMMON_SEPARATOR; -extern const uc_property_t UC_PROPERTY_BIDI_BLOCK_SEPARATOR; -extern const uc_property_t UC_PROPERTY_BIDI_SEGMENT_SEPARATOR; -extern const uc_property_t UC_PROPERTY_BIDI_WHITESPACE; -extern const uc_property_t UC_PROPERTY_BIDI_NON_SPACING_MARK; -extern const uc_property_t UC_PROPERTY_BIDI_BOUNDARY_NEUTRAL; -extern const uc_property_t UC_PROPERTY_BIDI_PDF; -extern const uc_property_t UC_PROPERTY_BIDI_EMBEDDING_OR_OVERRIDE; -extern const uc_property_t UC_PROPERTY_BIDI_OTHER_NEUTRAL; +extern @GNULIB_UNICTYPE_PROPERTY_BIDI_CONTROL_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_BIDI_CONTROL; +extern @GNULIB_UNICTYPE_PROPERTY_BIDI_LEFT_TO_RIGHT_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_BIDI_LEFT_TO_RIGHT; +extern @GNULIB_UNICTYPE_PROPERTY_BIDI_HEBREW_RIGHT_TO_LEFT_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_BIDI_HEBREW_RIGHT_TO_LEFT; +extern @GNULIB_UNICTYPE_PROPERTY_BIDI_ARABIC_RIGHT_TO_LEFT_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_BIDI_ARABIC_RIGHT_TO_LEFT; +extern @GNULIB_UNICTYPE_PROPERTY_BIDI_EUROPEAN_DIGIT_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_BIDI_EUROPEAN_DIGIT; +extern @GNULIB_UNICTYPE_PROPERTY_BIDI_EUR_NUM_SEPARATOR_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_BIDI_EUR_NUM_SEPARATOR; +extern @GNULIB_UNICTYPE_PROPERTY_BIDI_EUR_NUM_TERMINATOR_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_BIDI_EUR_NUM_TERMINATOR; +extern @GNULIB_UNICTYPE_PROPERTY_BIDI_ARABIC_DIGIT_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_BIDI_ARABIC_DIGIT; +extern @GNULIB_UNICTYPE_PROPERTY_BIDI_COMMON_SEPARATOR_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_BIDI_COMMON_SEPARATOR; +extern @GNULIB_UNICTYPE_PROPERTY_BIDI_BLOCK_SEPARATOR_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_BIDI_BLOCK_SEPARATOR; +extern @GNULIB_UNICTYPE_PROPERTY_BIDI_SEGMENT_SEPARATOR_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_BIDI_SEGMENT_SEPARATOR; +extern @GNULIB_UNICTYPE_PROPERTY_BIDI_WHITESPACE_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_BIDI_WHITESPACE; +extern @GNULIB_UNICTYPE_PROPERTY_BIDI_NON_SPACING_MARK_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_BIDI_NON_SPACING_MARK; +extern @GNULIB_UNICTYPE_PROPERTY_BIDI_BOUNDARY_NEUTRAL_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_BIDI_BOUNDARY_NEUTRAL; +extern @GNULIB_UNICTYPE_PROPERTY_BIDI_PDF_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_BIDI_PDF; +extern @GNULIB_UNICTYPE_PROPERTY_BIDI_EMBEDDING_OR_OVERRIDE_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_BIDI_EMBEDDING_OR_OVERRIDE; +extern @GNULIB_UNICTYPE_PROPERTY_BIDI_OTHER_NEUTRAL_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_BIDI_OTHER_NEUTRAL; /* Numeric. */ -extern const uc_property_t UC_PROPERTY_HEX_DIGIT; -extern const uc_property_t UC_PROPERTY_ASCII_HEX_DIGIT; +extern @GNULIB_UNICTYPE_PROPERTY_HEX_DIGIT_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_HEX_DIGIT; +extern @GNULIB_UNICTYPE_PROPERTY_ASCII_HEX_DIGIT_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_ASCII_HEX_DIGIT; /* CJK. */ -extern const uc_property_t UC_PROPERTY_IDEOGRAPHIC; -extern const uc_property_t UC_PROPERTY_UNIFIED_IDEOGRAPH; -extern const uc_property_t UC_PROPERTY_RADICAL; -extern const uc_property_t UC_PROPERTY_IDS_BINARY_OPERATOR; -extern const uc_property_t UC_PROPERTY_IDS_TRINARY_OPERATOR; +extern @GNULIB_UNICTYPE_PROPERTY_IDEOGRAPHIC_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_IDEOGRAPHIC; +extern @GNULIB_UNICTYPE_PROPERTY_UNIFIED_IDEOGRAPH_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_UNIFIED_IDEOGRAPH; +extern @GNULIB_UNICTYPE_PROPERTY_RADICAL_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_RADICAL; +extern @GNULIB_UNICTYPE_PROPERTY_IDS_BINARY_OPERATOR_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_IDS_BINARY_OPERATOR; +extern @GNULIB_UNICTYPE_PROPERTY_IDS_TRINARY_OPERATOR_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_IDS_TRINARY_OPERATOR; /* Emoji. */ -extern const uc_property_t UC_PROPERTY_EMOJI; -extern const uc_property_t UC_PROPERTY_EMOJI_PRESENTATION; -extern const uc_property_t UC_PROPERTY_EMOJI_MODIFIER; -extern const uc_property_t UC_PROPERTY_EMOJI_MODIFIER_BASE; -extern const uc_property_t UC_PROPERTY_EMOJI_COMPONENT; -extern const uc_property_t UC_PROPERTY_EXTENDED_PICTOGRAPHIC; +extern @GNULIB_UNICTYPE_PROPERTY_EMOJI_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_EMOJI; +extern @GNULIB_UNICTYPE_PROPERTY_EMOJI_PRESENTATION_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_EMOJI_PRESENTATION; +extern @GNULIB_UNICTYPE_PROPERTY_EMOJI_MODIFIER_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_EMOJI_MODIFIER; +extern @GNULIB_UNICTYPE_PROPERTY_EMOJI_MODIFIER_BASE_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_EMOJI_MODIFIER_BASE; +extern @GNULIB_UNICTYPE_PROPERTY_EMOJI_COMPONENT_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_EMOJI_COMPONENT; +extern @GNULIB_UNICTYPE_PROPERTY_EXTENDED_PICTOGRAPHIC_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_EXTENDED_PICTOGRAPHIC; /* Misc. */ -extern const uc_property_t UC_PROPERTY_ZERO_WIDTH; -extern const uc_property_t UC_PROPERTY_SPACE; -extern const uc_property_t UC_PROPERTY_NON_BREAK; -extern const uc_property_t UC_PROPERTY_ISO_CONTROL; -extern const uc_property_t UC_PROPERTY_FORMAT_CONTROL; -extern const uc_property_t UC_PROPERTY_DASH; -extern const uc_property_t UC_PROPERTY_HYPHEN; -extern const uc_property_t UC_PROPERTY_PUNCTUATION; -extern const uc_property_t UC_PROPERTY_LINE_SEPARATOR; -extern const uc_property_t UC_PROPERTY_PARAGRAPH_SEPARATOR; -extern const uc_property_t UC_PROPERTY_QUOTATION_MARK; -extern const uc_property_t UC_PROPERTY_SENTENCE_TERMINAL; -extern const uc_property_t UC_PROPERTY_TERMINAL_PUNCTUATION; -extern const uc_property_t UC_PROPERTY_CURRENCY_SYMBOL; -extern const uc_property_t UC_PROPERTY_MATH; -extern const uc_property_t UC_PROPERTY_OTHER_MATH; -extern const uc_property_t UC_PROPERTY_PAIRED_PUNCTUATION; -extern const uc_property_t UC_PROPERTY_LEFT_OF_PAIR; -extern const uc_property_t UC_PROPERTY_COMBINING; -extern const uc_property_t UC_PROPERTY_COMPOSITE; -extern const uc_property_t UC_PROPERTY_DECIMAL_DIGIT; -extern const uc_property_t UC_PROPERTY_NUMERIC; -extern const uc_property_t UC_PROPERTY_DIACRITIC; -extern const uc_property_t UC_PROPERTY_EXTENDER; -extern const uc_property_t UC_PROPERTY_IGNORABLE_CONTROL; -extern const uc_property_t UC_PROPERTY_REGIONAL_INDICATOR; +extern @GNULIB_UNICTYPE_PROPERTY_ZERO_WIDTH_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_ZERO_WIDTH; +extern @GNULIB_UNICTYPE_PROPERTY_SPACE_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_SPACE; +extern @GNULIB_UNICTYPE_PROPERTY_NON_BREAK_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_NON_BREAK; +extern @GNULIB_UNICTYPE_PROPERTY_ISO_CONTROL_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_ISO_CONTROL; +extern @GNULIB_UNICTYPE_PROPERTY_FORMAT_CONTROL_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_FORMAT_CONTROL; +extern @GNULIB_UNICTYPE_PROPERTY_DASH_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_DASH; +extern @GNULIB_UNICTYPE_PROPERTY_HYPHEN_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_HYPHEN; +extern @GNULIB_UNICTYPE_PROPERTY_PUNCTUATION_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_PUNCTUATION; +extern @GNULIB_UNICTYPE_PROPERTY_LINE_SEPARATOR_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_LINE_SEPARATOR; +extern @GNULIB_UNICTYPE_PROPERTY_PARAGRAPH_SEPARATOR_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_PARAGRAPH_SEPARATOR; +extern @GNULIB_UNICTYPE_PROPERTY_QUOTATION_MARK_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_QUOTATION_MARK; +extern @GNULIB_UNICTYPE_PROPERTY_SENTENCE_TERMINAL_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_SENTENCE_TERMINAL; +extern @GNULIB_UNICTYPE_PROPERTY_TERMINAL_PUNCTUATION_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_TERMINAL_PUNCTUATION; +extern @GNULIB_UNICTYPE_PROPERTY_CURRENCY_SYMBOL_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_CURRENCY_SYMBOL; +extern @GNULIB_UNICTYPE_PROPERTY_MATH_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_MATH; +extern @GNULIB_UNICTYPE_PROPERTY_OTHER_MATH_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_OTHER_MATH; +extern @GNULIB_UNICTYPE_PROPERTY_PAIRED_PUNCTUATION_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_PAIRED_PUNCTUATION; +extern @GNULIB_UNICTYPE_PROPERTY_LEFT_OF_PAIR_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_LEFT_OF_PAIR; +extern @GNULIB_UNICTYPE_PROPERTY_COMBINING_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_COMBINING; +extern @GNULIB_UNICTYPE_PROPERTY_COMPOSITE_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_COMPOSITE; +extern @GNULIB_UNICTYPE_PROPERTY_DECIMAL_DIGIT_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_DECIMAL_DIGIT; +extern @GNULIB_UNICTYPE_PROPERTY_NUMERIC_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_NUMERIC; +extern @GNULIB_UNICTYPE_PROPERTY_DIACRITIC_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_DIACRITIC; +extern @GNULIB_UNICTYPE_PROPERTY_EXTENDER_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_EXTENDER; +extern @GNULIB_UNICTYPE_PROPERTY_IGNORABLE_CONTROL_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_IGNORABLE_CONTROL; +extern @GNULIB_UNICTYPE_PROPERTY_REGIONAL_INDICATOR_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_REGIONAL_INDICATOR; /* Return the property given by name, e.g. "White space". */ extern uc_property_t diff --git a/lib/uninorm.in.h b/lib/uninorm.in.h index a5a27b06c6..0698246ac7 100644 --- a/lib/uninorm.in.h +++ b/lib/uninorm.in.h @@ -23,6 +23,12 @@ #include "unitypes.h" +#if @HAVE_UNISTRING_WOE32DLL_H@ +# include <unistring/woe32dll.h> +#else +# define LIBUNISTRING_DLL_VARIABLE +#endif + #ifdef __cplusplus extern "C" { @@ -108,21 +114,21 @@ struct unicode_normalization_form; typedef const struct unicode_normalization_form *uninorm_t; /* UNINORM_NFD: Normalization form D: canonical decomposition. */ -extern const struct unicode_normalization_form uninorm_nfd; +extern @GNULIB_UNINORM_NFD_DLL_VARIABLE@ const struct unicode_normalization_form uninorm_nfd; #define UNINORM_NFD (&uninorm_nfd) /* UNINORM_NFC: Normalization form C: canonical decomposition, then canonical composition. */ -extern const struct unicode_normalization_form uninorm_nfc; +extern @GNULIB_UNINORM_NFC_DLL_VARIABLE@ const struct unicode_normalization_form uninorm_nfc; #define UNINORM_NFC (&uninorm_nfc) /* UNINORM_NFKD: Normalization form KD: compatibility decomposition. */ -extern const struct unicode_normalization_form uninorm_nfkd; +extern @GNULIB_UNINORM_NFKD_DLL_VARIABLE@ const struct unicode_normalization_form uninorm_nfkd; #define UNINORM_NFKD (&uninorm_nfkd) /* UNINORM_NFKC: Normalization form KC: compatibility decomposition, then canonical composition. */ -extern const struct unicode_normalization_form uninorm_nfkc; +extern @GNULIB_UNINORM_NFKC_DLL_VARIABLE@ const struct unicode_normalization_form uninorm_nfkc; #define UNINORM_NFKC (&uninorm_nfkc) /* Test whether a normalization form does compatibility decomposition. */ diff --git a/m4/libunistring-base.m4 b/m4/libunistring-base.m4 index fc6d02399c..6dd184a789 100644 --- a/m4/libunistring-base.m4 +++ b/m4/libunistring-base.m4 @@ -1,4 +1,4 @@ -# libunistring-base.m4 serial 7 +# libunistring-base.m4 serial 8 dnl Copyright (C) 2010-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -18,6 +18,8 @@ dnl You have to bump the VERSION argument to the next projected version dnl number each time you make a change that affects the behaviour of the dnl functions defined in Module (even if the sources of Module itself do not dnl change). +dnl +dnl This macro invocation must not occur in macros that are AC_REQUIREd. AC_DEFUN([gl_LIBUNISTRING_MODULE], [ @@ -28,6 +30,35 @@ AC_DEFUN([gl_LIBUNISTRING_MODULE], [gl_LIBUNISTRING_VERSION_CMP([$1])]) ]) +dnl gl_LIBUNISTRING_MODULE_WITH_VARIABLE([VERSION], [Module]) +dnl is like gl_LIBUNISTRING_MODULE([VERSION], [Module]), except that it also +dnl defines an AC_SUBSTed autoconf variable GNULIB_$MODULE_DLL_VARIABLE. +dnl What's the expansion of this autoconf variable? +dnl - When building libunistring, it expands to LIBUNISTRING_DLL_VARIABLE. +dnl (This is necessary because this token must be present in the .h files +dnl when the .h files get installed.) +dnl - When building gnulib or application code it expands to +dnl - LIBUNISTRING_DLL_VARIABLE by default, +dnl - empty if the automake conditional LIBUNISTRING_COMPILE_$MODULE +dnl evaluates to true. +dnl (This is necessary because when the conditional evaluates to false, +dnl the application code expects to use the declared variable from the +dnl installed libunistring; it's in this case that the +dnl LIBUNISTRING_DLL_VARIABLE macro from the installed +dnl <unistring/woe32dll.h> must be used.) +dnl +dnl This macro invocation must not occur in macros that are AC_REQUIREd. + +AC_DEFUN([gl_LIBUNISTRING_MODULE_WITH_VARIABLE], +[ + gl_LIBUNISTRING_MODULE([$1], [$2]) + m4_ifndef([gl_IN_LIBUNISTRING], + [if test -z "${AS_TR_CPP([LIBUNISTRING_COMPILE_$2])_TRUE}"; then + GL_MODULE_INDICATOR_PREFIX[]_GNULIB_[]AS_TR_CPP([$2_DLL_VARIABLE])= + fi + ]) +]) + dnl gl_LIBUNISTRING_LIBHEADER([VERSION], [HeaderFile]) dnl Declares that HeaderFile should be created, unless we are linking dnl with libunistring and its version is >= the given VERSION. @@ -95,6 +126,26 @@ changequote([,]) LIBUNISTRING_VERSION_MINOR=`echo "$LIBUNISTRING_VERSION" | sed -n -e "$gl_libunistring_sed_extract_minor"` LIBUNISTRING_VERSION_SUBMINOR=`echo "$LIBUNISTRING_VERSION" | sed -n -e "$gl_libunistring_sed_extract_subminor"` fi + + dnl Determine whether <unistring/woe32dll.h> from an installed libunistring + dnl is available. + m4_ifdef([gl_IN_LIBUNISTRING], + [dnl In libunistring, all .h files that declare variables need to + dnl #include <unistring/woe32dll.h>. This references the file + dnl unistring/woe32dll.h in libunistring. + HAVE_UNISTRING_WOE32DLL_H=1 + ], + [dnl In gnulib or in applications, we need a #include <unistring/woe32dll.h> + dnl if and only if an installed libunistring is available. + if test "$HAVE_LIBUNISTRING" = yes; then + AC_CHECK_HEADERS([unistring/woe32dll.h], + [HAVE_UNISTRING_WOE32DLL_H=1], + [HAVE_UNISTRING_WOE32DLL_H=0]) + else + HAVE_UNISTRING_WOE32DLL_H=0 + fi + ]) + AC_SUBST([HAVE_UNISTRING_WOE32DLL_H]) ]) dnl gl_LIBUNISTRING_VERSION_CMP([VERSION]) diff --git a/m4/unicase_h.m4 b/m4/unicase_h.m4 new file mode 100644 index 0000000000..86a1b7c47e --- /dev/null +++ b/m4/unicase_h.m4 @@ -0,0 +1,43 @@ +# unicase_h.m4 serial 1 +dnl Copyright (C) 2023 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +AC_DEFUN_ONCE([gl_UNICASE_H], +[ + dnl Ensure to expand the default settings once only, before all statements + dnl that occur in other macros. + AC_REQUIRE([gl_UNICASE_H_DEFAULTS]) +]) + +# gl_UNICASE_MODULE_INDICATOR([modulename]) +# sets the shell variable that indicates the presence of the given module +# to a C preprocessor expression that will evaluate to 1. +# This macro invocation must not occur in macros that are AC_REQUIREd. +AC_DEFUN([gl_UNICASE_MODULE_INDICATOR], +[ + dnl Ensure to expand the default settings once only. + gl_UNICASE_H_REQUIRE_DEFAULTS + gl_MODULE_INDICATOR_SET_VARIABLE([$1]) + dnl Define it also as a C macro, for the benefit of the unit tests. + gl_MODULE_INDICATOR_FOR_TESTS([$1]) +]) + +# Initializes the default values for AC_SUBSTed shell variables. +# This macro must not be AC_REQUIREd. It must only be invoked, and only +# outside of macros or in macros that are not AC_REQUIREd. +AC_DEFUN([gl_UNICASE_H_REQUIRE_DEFAULTS], +[ + m4_defun(GL_MODULE_INDICATOR_PREFIX[_UNICASE_H_MODULE_INDICATOR_DEFAULTS], [ + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICASE_EMPTY_PREFIX_CONTEXT_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICASE_EMPTY_SUFFIX_CONTEXT_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + ]) + m4_require(GL_MODULE_INDICATOR_PREFIX[_UNICASE_H_MODULE_INDICATOR_DEFAULTS]) + AC_REQUIRE([gl_UNICASE_H_DEFAULTS]) +]) + +AC_DEFUN([gl_UNICASE_H_DEFAULTS], +[ + dnl Assume proper GNU behavior unless another module says otherwise. +]) diff --git a/m4/unictype_h.m4 b/m4/unictype_h.m4 new file mode 100644 index 0000000000..bab46356d3 --- /dev/null +++ b/m4/unictype_h.m4 @@ -0,0 +1,172 @@ +# unictype_h.m4 serial 1 +dnl Copyright (C) 2023 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +AC_DEFUN_ONCE([gl_UNICTYPE_H], +[ + dnl Ensure to expand the default settings once only, before all statements + dnl that occur in other macros. + AC_REQUIRE([gl_UNICTYPE_H_DEFAULTS]) +]) + +# gl_UNICTYPE_MODULE_INDICATOR([modulename]) +# sets the shell variable that indicates the presence of the given module +# to a C preprocessor expression that will evaluate to 1. +# This macro invocation must not occur in macros that are AC_REQUIREd. +AC_DEFUN([gl_UNICTYPE_MODULE_INDICATOR], +[ + dnl Ensure to expand the default settings once only. + gl_UNICTYPE_H_REQUIRE_DEFAULTS + gl_MODULE_INDICATOR_SET_VARIABLE([$1]) + dnl Define it also as a C macro, for the benefit of the unit tests. + gl_MODULE_INDICATOR_FOR_TESTS([$1]) +]) + +# Initializes the default values for AC_SUBSTed shell variables. +# This macro must not be AC_REQUIREd. It must only be invoked, and only +# outside of macros or in macros that are not AC_REQUIREd. +AC_DEFUN([gl_UNICTYPE_H_REQUIRE_DEFAULTS], +[ + m4_defun(GL_MODULE_INDICATOR_PREFIX[_UNICTYPE_H_MODULE_INDICATOR_DEFAULTS], [ + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_CATEGORY_L_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_CATEGORY_LC_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_CATEGORY_LU_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_CATEGORY_LL_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_CATEGORY_LT_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_CATEGORY_LM_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_CATEGORY_LO_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_CATEGORY_M_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_CATEGORY_MN_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_CATEGORY_MC_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_CATEGORY_ME_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_CATEGORY_N_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_CATEGORY_ND_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_CATEGORY_NL_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_CATEGORY_NO_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_CATEGORY_P_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_CATEGORY_PC_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_CATEGORY_PD_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_CATEGORY_PS_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_CATEGORY_PE_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_CATEGORY_PI_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_CATEGORY_PF_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_CATEGORY_PO_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_CATEGORY_S_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_CATEGORY_SM_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_CATEGORY_SC_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_CATEGORY_SK_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_CATEGORY_SO_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_CATEGORY_Z_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_CATEGORY_ZS_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_CATEGORY_ZL_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_CATEGORY_ZP_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_CATEGORY_C_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_CATEGORY_CC_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_CATEGORY_CF_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_CATEGORY_CS_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_CATEGORY_CO_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_CATEGORY_CN_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_WHITE_SPACE_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_ALPHABETIC_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_OTHER_ALPHABETIC_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_NOT_A_CHARACTER_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_DEFAULT_IGNORABLE_CODE_POINT_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_OTHER_DEFAULT_IGNORABLE_CODE_POINT_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_DEPRECATED_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_LOGICAL_ORDER_EXCEPTION_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_VARIATION_SELECTOR_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_PRIVATE_USE_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_UNASSIGNED_CODE_VALUE_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_UPPERCASE_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_OTHER_UPPERCASE_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_LOWERCASE_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_OTHER_LOWERCASE_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_TITLECASE_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_CASED_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_CASE_IGNORABLE_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_LOWERCASED_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_UPPERCASED_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_TITLECASED_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_CASEFOLDED_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_CASEMAPPED_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_SOFT_DOTTED_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_ID_START_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_OTHER_ID_START_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_ID_CONTINUE_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_OTHER_ID_CONTINUE_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_XID_START_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_XID_CONTINUE_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_PATTERN_WHITE_SPACE_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_PATTERN_SYNTAX_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_JOIN_CONTROL_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_GRAPHEME_BASE_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_GRAPHEME_EXTEND_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_OTHER_GRAPHEME_EXTEND_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_GRAPHEME_LINK_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_BIDI_CONTROL_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_BIDI_LEFT_TO_RIGHT_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_BIDI_HEBREW_RIGHT_TO_LEFT_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_BIDI_ARABIC_RIGHT_TO_LEFT_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_BIDI_EUROPEAN_DIGIT_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_BIDI_EUR_NUM_SEPARATOR_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_BIDI_EUR_NUM_TERMINATOR_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_BIDI_ARABIC_DIGIT_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_BIDI_COMMON_SEPARATOR_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_BIDI_BLOCK_SEPARATOR_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_BIDI_SEGMENT_SEPARATOR_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_BIDI_WHITESPACE_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_BIDI_NON_SPACING_MARK_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_BIDI_BOUNDARY_NEUTRAL_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_BIDI_PDF_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_BIDI_EMBEDDING_OR_OVERRIDE_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_BIDI_OTHER_NEUTRAL_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_HEX_DIGIT_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_ASCII_HEX_DIGIT_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_IDEOGRAPHIC_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_UNIFIED_IDEOGRAPH_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_RADICAL_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_IDS_BINARY_OPERATOR_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_IDS_TRINARY_OPERATOR_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_EMOJI_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_EMOJI_PRESENTATION_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_EMOJI_MODIFIER_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_EMOJI_MODIFIER_BASE_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_EMOJI_COMPONENT_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_EXTENDED_PICTOGRAPHIC_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_ZERO_WIDTH_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_SPACE_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_NON_BREAK_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_ISO_CONTROL_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_FORMAT_CONTROL_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_DASH_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_HYPHEN_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_PUNCTUATION_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_LINE_SEPARATOR_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_PARAGRAPH_SEPARATOR_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_QUOTATION_MARK_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_SENTENCE_TERMINAL_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_TERMINAL_PUNCTUATION_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_CURRENCY_SYMBOL_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_MATH_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_OTHER_MATH_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_PAIRED_PUNCTUATION_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_LEFT_OF_PAIR_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_COMBINING_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_COMPOSITE_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_DECIMAL_DIGIT_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_NUMERIC_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_DIACRITIC_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_EXTENDER_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_IGNORABLE_CONTROL_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_REGIONAL_INDICATOR_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + ]) + m4_require(GL_MODULE_INDICATOR_PREFIX[_UNICTYPE_H_MODULE_INDICATOR_DEFAULTS]) + AC_REQUIRE([gl_UNICTYPE_H_DEFAULTS]) +]) + +AC_DEFUN([gl_UNICTYPE_H_DEFAULTS], +[ + dnl Assume proper GNU behavior unless another module says otherwise. +]) diff --git a/m4/uninorm_h.m4 b/m4/uninorm_h.m4 new file mode 100644 index 0000000000..b6b342d8cc --- /dev/null +++ b/m4/uninorm_h.m4 @@ -0,0 +1,45 @@ +# uninorm_h.m4 serial 1 +dnl Copyright (C) 2023 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +AC_DEFUN_ONCE([gl_UNINORM_H], +[ + dnl Ensure to expand the default settings once only, before all statements + dnl that occur in other macros. + AC_REQUIRE([gl_UNINORM_H_DEFAULTS]) +]) + +# gl_UNINORM_MODULE_INDICATOR([modulename]) +# sets the shell variable that indicates the presence of the given module +# to a C preprocessor expression that will evaluate to 1. +# This macro invocation must not occur in macros that are AC_REQUIREd. +AC_DEFUN([gl_UNINORM_MODULE_INDICATOR], +[ + dnl Ensure to expand the default settings once only. + gl_UNINORM_H_REQUIRE_DEFAULTS + gl_MODULE_INDICATOR_SET_VARIABLE([$1]) + dnl Define it also as a C macro, for the benefit of the unit tests. + gl_MODULE_INDICATOR_FOR_TESTS([$1]) +]) + +# Initializes the default values for AC_SUBSTed shell variables. +# This macro must not be AC_REQUIREd. It must only be invoked, and only +# outside of macros or in macros that are not AC_REQUIREd. +AC_DEFUN([gl_UNINORM_H_REQUIRE_DEFAULTS], +[ + m4_defun(GL_MODULE_INDICATOR_PREFIX[_UNINORM_H_MODULE_INDICATOR_DEFAULTS], [ + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNINORM_NFD_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNINORM_NFC_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNINORM_NFKD_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNINORM_NFKC_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE']) + ]) + m4_require(GL_MODULE_INDICATOR_PREFIX[_UNINORM_H_MODULE_INDICATOR_DEFAULTS]) + AC_REQUIRE([gl_UNINORM_H_DEFAULTS]) +]) + +AC_DEFUN([gl_UNINORM_H_DEFAULTS], +[ + dnl Assume proper GNU behavior unless another module says otherwise. +]) 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 diff --git a/modules/unictype/base b/modules/unictype/base index b2d22f8762..e15c63a39d 100644 --- a/modules/unictype/base +++ b/modules/unictype/base @@ -4,6 +4,7 @@ Base layer for Unicode classification and properties. Files: lib/unictype.in.h m4/libunistring-base.m4 +m4/unictype_h.m4 Depends-on: gen-header @@ -11,7 +12,9 @@ unitypes stdbool configure.ac: -gl_LIBUNISTRING_LIBHEADER([0.9.11], [unictype.h]) +gl_LIBUNISTRING_LIBHEADER([1.2], [unictype.h]) +gl_UNICTYPE_H +gl_UNICTYPE_H_REQUIRE_DEFAULTS AC_PROG_MKDIR_P Makefile.am: @@ -19,7 +22,141 @@ BUILT_SOURCES += $(LIBUNISTRING_UNICTYPE_H) unictype.h: unictype.in.h @NMD@ $(AM_V_GEN)$(MKDIR_P) '%reldir%' - $(gl_V_at)$(SED_HEADER_TO_AT_t) $(srcdir)/unictype.in.h + $(gl_V_at)$(SED_HEADER_STDOUT) \ + -e 's|@''HAVE_UNISTRING_WOE32DLL_H''@|$(HAVE_UNISTRING_WOE32DLL_H)|g' \ + -e 's/@''GNULIB_UNICTYPE_CATEGORY_L_DLL_VARIABLE''@/$(GNULIB_UNICTYPE_CATEGORY_L_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_CATEGORY_LC_DLL_VARIABLE''@/$(GNULIB_UNICTYPE_CATEGORY_LC_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_CATEGORY_LU_DLL_VARIABLE''@/$(GNULIB_UNICTYPE_CATEGORY_LU_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_CATEGORY_LL_DLL_VARIABLE''@/$(GNULIB_UNICTYPE_CATEGORY_LL_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_CATEGORY_LT_DLL_VARIABLE''@/$(GNULIB_UNICTYPE_CATEGORY_LT_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_CATEGORY_LM_DLL_VARIABLE''@/$(GNULIB_UNICTYPE_CATEGORY_LM_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_CATEGORY_LO_DLL_VARIABLE''@/$(GNULIB_UNICTYPE_CATEGORY_LO_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_CATEGORY_M_DLL_VARIABLE''@/$(GNULIB_UNICTYPE_CATEGORY_M_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_CATEGORY_MN_DLL_VARIABLE''@/$(GNULIB_UNICTYPE_CATEGORY_MN_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_CATEGORY_MC_DLL_VARIABLE''@/$(GNULIB_UNICTYPE_CATEGORY_MC_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_CATEGORY_ME_DLL_VARIABLE''@/$(GNULIB_UNICTYPE_CATEGORY_ME_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_CATEGORY_N_DLL_VARIABLE''@/$(GNULIB_UNICTYPE_CATEGORY_N_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_CATEGORY_ND_DLL_VARIABLE''@/$(GNULIB_UNICTYPE_CATEGORY_ND_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_CATEGORY_NL_DLL_VARIABLE''@/$(GNULIB_UNICTYPE_CATEGORY_NL_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_CATEGORY_NO_DLL_VARIABLE''@/$(GNULIB_UNICTYPE_CATEGORY_NO_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_CATEGORY_P_DLL_VARIABLE''@/$(GNULIB_UNICTYPE_CATEGORY_P_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_CATEGORY_PC_DLL_VARIABLE''@/$(GNULIB_UNICTYPE_CATEGORY_PC_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_CATEGORY_PD_DLL_VARIABLE''@/$(GNULIB_UNICTYPE_CATEGORY_PD_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_CATEGORY_PS_DLL_VARIABLE''@/$(GNULIB_UNICTYPE_CATEGORY_PS_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_CATEGORY_PE_DLL_VARIABLE''@/$(GNULIB_UNICTYPE_CATEGORY_PE_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_CATEGORY_PI_DLL_VARIABLE''@/$(GNULIB_UNICTYPE_CATEGORY_PI_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_CATEGORY_PF_DLL_VARIABLE''@/$(GNULIB_UNICTYPE_CATEGORY_PF_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_CATEGORY_PO_DLL_VARIABLE''@/$(GNULIB_UNICTYPE_CATEGORY_PO_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_CATEGORY_S_DLL_VARIABLE''@/$(GNULIB_UNICTYPE_CATEGORY_S_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_CATEGORY_SM_DLL_VARIABLE''@/$(GNULIB_UNICTYPE_CATEGORY_SM_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_CATEGORY_SC_DLL_VARIABLE''@/$(GNULIB_UNICTYPE_CATEGORY_SC_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_CATEGORY_SK_DLL_VARIABLE''@/$(GNULIB_UNICTYPE_CATEGORY_SK_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_CATEGORY_SO_DLL_VARIABLE''@/$(GNULIB_UNICTYPE_CATEGORY_SO_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_CATEGORY_Z_DLL_VARIABLE''@/$(GNULIB_UNICTYPE_CATEGORY_Z_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_CATEGORY_ZS_DLL_VARIABLE''@/$(GNULIB_UNICTYPE_CATEGORY_ZS_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_CATEGORY_ZL_DLL_VARIABLE''@/$(GNULIB_UNICTYPE_CATEGORY_ZL_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_CATEGORY_ZP_DLL_VARIABLE''@/$(GNULIB_UNICTYPE_CATEGORY_ZP_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_CATEGORY_C_DLL_VARIABLE''@/$(GNULIB_UNICTYPE_CATEGORY_C_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_CATEGORY_CC_DLL_VARIABLE''@/$(GNULIB_UNICTYPE_CATEGORY_CC_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_CATEGORY_CF_DLL_VARIABLE''@/$(GNULIB_UNICTYPE_CATEGORY_CF_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_CATEGORY_CS_DLL_VARIABLE''@/$(GNULIB_UNICTYPE_CATEGORY_CS_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_CATEGORY_CO_DLL_VARIABLE''@/$(GNULIB_UNICTYPE_CATEGORY_CO_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_CATEGORY_CN_DLL_VARIABLE''@/$(GNULIB_UNICTYPE_CATEGORY_CN_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_PROPERTY_WHITE_SPACE_DLL_VARIABLE''@/$(GNULIB_UNICTYPE_PROPERTY_WHITE_SPACE_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_PROPERTY_ALPHABETIC_DLL_VARIABLE''@/$(GNULIB_UNICTYPE_PROPERTY_ALPHABETIC_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_PROPERTY_OTHER_ALPHABETIC_DLL_VARIABLE''@/$(GNULIB_UNICTYPE_PROPERTY_OTHER_ALPHABETIC_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_PROPERTY_NOT_A_CHARACTER_DLL_VARIABLE''@/$(GNULIB_UNICTYPE_PROPERTY_NOT_A_CHARACTER_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_PROPERTY_DEFAULT_IGNORABLE_CODE_POINT_DLL_VARIABLE''@/$(GNULIB_UNICTYPE_PROPERTY_DEFAULT_IGNORABLE_CODE_POINT_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_PROPERTY_OTHER_DEFAULT_IGNORABLE_CODE_POINT_DLL_VARIABLE''@/$(GNULIB_UNICTYPE_PROPERTY_OTHER_DEFAULT_IGNORABLE_CODE_POINT_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_PROPERTY_DEPRECATED_DLL_VARIABLE''@/$(GNULIB_UNICTYPE_PROPERTY_DEPRECATED_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_PROPERTY_LOGICAL_ORDER_EXCEPTION_DLL_VARIABLE''@/$(GNULIB_UNICTYPE_PROPERTY_LOGICAL_ORDER_EXCEPTION_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_PROPERTY_VARIATION_SELECTOR_DLL_VARIABLE''@/$(GNULIB_UNICTYPE_PROPERTY_VARIATION_SELECTOR_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_PROPERTY_PRIVATE_USE_DLL_VARIABLE''@/$(GNULIB_UNICTYPE_PROPERTY_PRIVATE_USE_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_PROPERTY_UNASSIGNED_CODE_VALUE_DLL_VARIABLE''@/$(GNULIB_UNICTYPE_PROPERTY_UNASSIGNED_CODE_VALUE_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_PROPERTY_UPPERCASE_DLL_VARIABLE''@/$(GNULIB_UNICTYPE_PROPERTY_UPPERCASE_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_PROPERTY_OTHER_UPPERCASE_DLL_VARIABLE''@/$(GNULIB_UNICTYPE_PROPERTY_OTHER_UPPERCASE_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_PROPERTY_LOWERCASE_DLL_VARIABLE''@/$(GNULIB_UNICTYPE_PROPERTY_LOWERCASE_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_PROPERTY_OTHER_LOWERCASE_DLL_VARIABLE''@/$(GNULIB_UNICTYPE_PROPERTY_OTHER_LOWERCASE_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_PROPERTY_TITLECASE_DLL_VARIABLE''@/$(GNULIB_UNICTYPE_PROPERTY_TITLECASE_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_PROPERTY_CASED_DLL_VARIABLE''@/$(GNULIB_UNICTYPE_PROPERTY_CASED_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_PROPERTY_CASE_IGNORABLE_DLL_VARIABLE''@/$(GNULIB_UNICTYPE_PROPERTY_CASE_IGNORABLE_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_LOWERCASED_DLL_VARIABLE''@/$(GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_LOWERCASED_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_UPPERCASED_DLL_VARIABLE''@/$(GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_UPPERCASED_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_TITLECASED_DLL_VARIABLE''@/$(GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_TITLECASED_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_CASEFOLDED_DLL_VARIABLE''@/$(GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_CASEFOLDED_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_CASEMAPPED_DLL_VARIABLE''@/$(GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_CASEMAPPED_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_PROPERTY_SOFT_DOTTED_DLL_VARIABLE''@/$(GNULIB_UNICTYPE_PROPERTY_SOFT_DOTTED_DLL_VARIABLE)/g' \ + < $(srcdir)/unictype.in.h | \ + sed -e 's/@''GNULIB_UNICTYPE_PROPERTY_ID_START_DLL_VARIABLE''@/$(GNULIB_UNICTYPE_PROPERTY_ID_START_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_PROPERTY_OTHER_ID_START_DLL_VARIABLE''@/$(GNULIB_UNICTYPE_PROPERTY_OTHER_ID_START_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_PROPERTY_ID_CONTINUE_DLL_VARIABLE''@/$(GNULIB_UNICTYPE_PROPERTY_ID_CONTINUE_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_PROPERTY_OTHER_ID_CONTINUE_DLL_VARIABLE''@/$(GNULIB_UNICTYPE_PROPERTY_OTHER_ID_CONTINUE_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_PROPERTY_XID_START_DLL_VARIABLE''@/$(GNULIB_UNICTYPE_PROPERTY_XID_START_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_PROPERTY_XID_CONTINUE_DLL_VARIABLE''@/$(GNULIB_UNICTYPE_PROPERTY_XID_CONTINUE_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_PROPERTY_PATTERN_WHITE_SPACE_DLL_VARIABLE''@/$(GNULIB_UNICTYPE_PROPERTY_PATTERN_WHITE_SPACE_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_PROPERTY_PATTERN_SYNTAX_DLL_VARIABLE''@/$(GNULIB_UNICTYPE_PROPERTY_PATTERN_SYNTAX_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_PROPERTY_JOIN_CONTROL_DLL_VARIABLE''@/$(GNULIB_UNICTYPE_PROPERTY_JOIN_CONTROL_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_PROPERTY_GRAPHEME_BASE_DLL_VARIABLE''@/$(GNULIB_UNICTYPE_PROPERTY_GRAPHEME_BASE_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_PROPERTY_GRAPHEME_EXTEND_DLL_VARIABLE''@/$(GNULIB_UNICTYPE_PROPERTY_GRAPHEME_EXTEND_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_PROPERTY_OTHER_GRAPHEME_EXTEND_DLL_VARIABLE''@/$(GNULIB_UNICTYPE_PROPERTY_OTHER_GRAPHEME_EXTEND_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_PROPERTY_GRAPHEME_LINK_DLL_VARIABLE''@/$(GNULIB_UNICTYPE_PROPERTY_GRAPHEME_LINK_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_CONTROL_DLL_VARIABLE''@/$(GNULIB_UNICTYPE_PROPERTY_BIDI_CONTROL_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_LEFT_TO_RIGHT_DLL_VARIABLE''@/$(GNULIB_UNICTYPE_PROPERTY_BIDI_LEFT_TO_RIGHT_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_HEBREW_RIGHT_TO_LEFT_DLL_VARIABLE''@/$(GNULIB_UNICTYPE_PROPERTY_BIDI_HEBREW_RIGHT_TO_LEFT_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_ARABIC_RIGHT_TO_LEFT_DLL_VARIABLE''@/$(GNULIB_UNICTYPE_PROPERTY_BIDI_ARABIC_RIGHT_TO_LEFT_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_EUROPEAN_DIGIT_DLL_VARIABLE''@/$(GNULIB_UNICTYPE_PROPERTY_BIDI_EUROPEAN_DIGIT_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_EUR_NUM_SEPARATOR_DLL_VARIABLE''@/$(GNULIB_UNICTYPE_PROPERTY_BIDI_EUR_NUM_SEPARATOR_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_EUR_NUM_TERMINATOR_DLL_VARIABLE''@/$(GNULIB_UNICTYPE_PROPERTY_BIDI_EUR_NUM_TERMINATOR_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_ARABIC_DIGIT_DLL_VARIABLE''@/$(GNULIB_UNICTYPE_PROPERTY_BIDI_ARABIC_DIGIT_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_COMMON_SEPARATOR_DLL_VARIABLE''@/$(GNULIB_UNICTYPE_PROPERTY_BIDI_COMMON_SEPARATOR_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_BLOCK_SEPARATOR_DLL_VARIABLE''@/$(GNULIB_UNICTYPE_PROPERTY_BIDI_BLOCK_SEPARATOR_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_SEGMENT_SEPARATOR_DLL_VARIABLE''@/$(GNULIB_UNICTYPE_PROPERTY_BIDI_SEGMENT_SEPARATOR_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_WHITESPACE_DLL_VARIABLE''@/$(GNULIB_UNICTYPE_PROPERTY_BIDI_WHITESPACE_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_NON_SPACING_MARK_DLL_VARIABLE''@/$(GNULIB_UNICTYPE_PROPERTY_BIDI_NON_SPACING_MARK_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_BOUNDARY_NEUTRAL_DLL_VARIABLE''@/$(GNULIB_UNICTYPE_PROPERTY_BIDI_BOUNDARY_NEUTRAL_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_PDF_DLL_VARIABLE''@/$(GNULIB_UNICTYPE_PROPERTY_BIDI_PDF_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_EMBEDDING_OR_OVERRIDE_DLL_VARIABLE''@/$(GNULIB_UNICTYPE_PROPERTY_BIDI_EMBEDDING_OR_OVERRIDE_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_OTHER_NEUTRAL_DLL_VARIABLE''@/$(GNULIB_UNICTYPE_PROPERTY_BIDI_OTHER_NEUTRAL_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_PROPERTY_HEX_DIGIT_DLL_VARIABLE''@/$(GNULIB_UNICTYPE_PROPERTY_HEX_DIGIT_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_PROPERTY_ASCII_HEX_DIGIT_DLL_VARIABLE''@/$(GNULIB_UNICTYPE_PROPERTY_ASCII_HEX_DIGIT_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_PROPERTY_IDEOGRAPHIC_DLL_VARIABLE''@/$(GNULIB_UNICTYPE_PROPERTY_IDEOGRAPHIC_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_PROPERTY_UNIFIED_IDEOGRAPH_DLL_VARIABLE''@/$(GNULIB_UNICTYPE_PROPERTY_UNIFIED_IDEOGRAPH_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_PROPERTY_RADICAL_DLL_VARIABLE''@/$(GNULIB_UNICTYPE_PROPERTY_RADICAL_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_PROPERTY_IDS_BINARY_OPERATOR_DLL_VARIABLE''@/$(GNULIB_UNICTYPE_PROPERTY_IDS_BINARY_OPERATOR_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_PROPERTY_IDS_TRINARY_OPERATOR_DLL_VARIABLE''@/$(GNULIB_UNICTYPE_PROPERTY_IDS_TRINARY_OPERATOR_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_PROPERTY_EMOJI_DLL_VARIABLE''@/$(GNULIB_UNICTYPE_PROPERTY_EMOJI_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_PROPERTY_EMOJI_PRESENTATION_DLL_VARIABLE''@/$(GNULIB_UNICTYPE_PROPERTY_EMOJI_PRESENTATION_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_PROPERTY_EMOJI_MODIFIER_DLL_VARIABLE''@/$(GNULIB_UNICTYPE_PROPERTY_EMOJI_MODIFIER_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_PROPERTY_EMOJI_MODIFIER_BASE_DLL_VARIABLE''@/$(GNULIB_UNICTYPE_PROPERTY_EMOJI_MODIFIER_BASE_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_PROPERTY_EMOJI_COMPONENT_DLL_VARIABLE''@/$(GNULIB_UNICTYPE_PROPERTY_EMOJI_COMPONENT_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_PROPERTY_EXTENDED_PICTOGRAPHIC_DLL_VARIABLE''@/$(GNULIB_UNICTYPE_PROPERTY_EXTENDED_PICTOGRAPHIC_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_PROPERTY_ZERO_WIDTH_DLL_VARIABLE''@/$(GNULIB_UNICTYPE_PROPERTY_ZERO_WIDTH_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_PROPERTY_SPACE_DLL_VARIABLE''@/$(GNULIB_UNICTYPE_PROPERTY_SPACE_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_PROPERTY_NON_BREAK_DLL_VARIABLE''@/$(GNULIB_UNICTYPE_PROPERTY_NON_BREAK_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_PROPERTY_ISO_CONTROL_DLL_VARIABLE''@/$(GNULIB_UNICTYPE_PROPERTY_ISO_CONTROL_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_PROPERTY_FORMAT_CONTROL_DLL_VARIABLE''@/$(GNULIB_UNICTYPE_PROPERTY_FORMAT_CONTROL_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_PROPERTY_DASH_DLL_VARIABLE''@/$(GNULIB_UNICTYPE_PROPERTY_DASH_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_PROPERTY_HYPHEN_DLL_VARIABLE''@/$(GNULIB_UNICTYPE_PROPERTY_HYPHEN_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_PROPERTY_PUNCTUATION_DLL_VARIABLE''@/$(GNULIB_UNICTYPE_PROPERTY_PUNCTUATION_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_PROPERTY_LINE_SEPARATOR_DLL_VARIABLE''@/$(GNULIB_UNICTYPE_PROPERTY_LINE_SEPARATOR_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_PROPERTY_PARAGRAPH_SEPARATOR_DLL_VARIABLE''@/$(GNULIB_UNICTYPE_PROPERTY_PARAGRAPH_SEPARATOR_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_PROPERTY_QUOTATION_MARK_DLL_VARIABLE''@/$(GNULIB_UNICTYPE_PROPERTY_QUOTATION_MARK_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_PROPERTY_SENTENCE_TERMINAL_DLL_VARIABLE''@/$(GNULIB_UNICTYPE_PROPERTY_SENTENCE_TERMINAL_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_PROPERTY_TERMINAL_PUNCTUATION_DLL_VARIABLE''@/$(GNULIB_UNICTYPE_PROPERTY_TERMINAL_PUNCTUATION_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_PROPERTY_CURRENCY_SYMBOL_DLL_VARIABLE''@/$(GNULIB_UNICTYPE_PROPERTY_CURRENCY_SYMBOL_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_PROPERTY_MATH_DLL_VARIABLE''@/$(GNULIB_UNICTYPE_PROPERTY_MATH_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_PROPERTY_OTHER_MATH_DLL_VARIABLE''@/$(GNULIB_UNICTYPE_PROPERTY_OTHER_MATH_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_PROPERTY_PAIRED_PUNCTUATION_DLL_VARIABLE''@/$(GNULIB_UNICTYPE_PROPERTY_PAIRED_PUNCTUATION_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_PROPERTY_LEFT_OF_PAIR_DLL_VARIABLE''@/$(GNULIB_UNICTYPE_PROPERTY_LEFT_OF_PAIR_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_PROPERTY_COMBINING_DLL_VARIABLE''@/$(GNULIB_UNICTYPE_PROPERTY_COMBINING_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_PROPERTY_COMPOSITE_DLL_VARIABLE''@/$(GNULIB_UNICTYPE_PROPERTY_COMPOSITE_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_PROPERTY_DECIMAL_DIGIT_DLL_VARIABLE''@/$(GNULIB_UNICTYPE_PROPERTY_DECIMAL_DIGIT_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_PROPERTY_NUMERIC_DLL_VARIABLE''@/$(GNULIB_UNICTYPE_PROPERTY_NUMERIC_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_PROPERTY_DIACRITIC_DLL_VARIABLE''@/$(GNULIB_UNICTYPE_PROPERTY_DIACRITIC_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_PROPERTY_EXTENDER_DLL_VARIABLE''@/$(GNULIB_UNICTYPE_PROPERTY_EXTENDER_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_PROPERTY_IGNORABLE_CONTROL_DLL_VARIABLE''@/$(GNULIB_UNICTYPE_PROPERTY_IGNORABLE_CONTROL_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNICTYPE_PROPERTY_REGIONAL_INDICATOR_DLL_VARIABLE''@/$(GNULIB_UNICTYPE_PROPERTY_REGIONAL_INDICATOR_DLL_VARIABLE)/g' \ + > $@-t $(AM_V_at)mv $@-t $@ MOSTLYCLEANFILES += unictype.h unictype.h-t diff --git a/modules/unictype/category-C b/modules/unictype/category-C index 9d2666523c..920ac0e11d 100644 --- a/modules/unictype/category-C +++ b/modules/unictype/category-C @@ -9,7 +9,8 @@ Depends-on: unictype/base configure.ac: -gl_LIBUNISTRING_MODULE([1.1], [unictype/category-C]) +gl_UNICTYPE_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([1.1], [unictype/category-C]) Makefile.am: if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_C diff --git a/modules/unictype/category-Cc b/modules/unictype/category-Cc index cde33c73ed..bad5462fac 100644 --- a/modules/unictype/category-Cc +++ b/modules/unictype/category-Cc @@ -9,7 +9,8 @@ Depends-on: unictype/base configure.ac: -gl_LIBUNISTRING_MODULE([0.9.8], [unictype/category-Cc]) +gl_UNICTYPE_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([0.9.8], [unictype/category-Cc]) Makefile.am: if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_CC diff --git a/modules/unictype/category-Cf b/modules/unictype/category-Cf index c4d9c89276..558d659f16 100644 --- a/modules/unictype/category-Cf +++ b/modules/unictype/category-Cf @@ -9,7 +9,8 @@ Depends-on: unictype/base configure.ac: -gl_LIBUNISTRING_MODULE([1.1], [unictype/category-Cf]) +gl_UNICTYPE_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([1.1], [unictype/category-Cf]) Makefile.am: if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_CF diff --git a/modules/unictype/category-Cn b/modules/unictype/category-Cn index d06aac7d1f..d4a5694953 100644 --- a/modules/unictype/category-Cn +++ b/modules/unictype/category-Cn @@ -9,7 +9,8 @@ Depends-on: unictype/base configure.ac: -gl_LIBUNISTRING_MODULE([1.1], [unictype/category-Cn]) +gl_UNICTYPE_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([1.1], [unictype/category-Cn]) Makefile.am: if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_CN diff --git a/modules/unictype/category-Co b/modules/unictype/category-Co index 83f064cd08..433113f57c 100644 --- a/modules/unictype/category-Co +++ b/modules/unictype/category-Co @@ -9,7 +9,8 @@ Depends-on: unictype/base configure.ac: -gl_LIBUNISTRING_MODULE([0.9.8], [unictype/category-Co]) +gl_UNICTYPE_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([0.9.8], [unictype/category-Co]) Makefile.am: if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_CO diff --git a/modules/unictype/category-Cs b/modules/unictype/category-Cs index 95a9aa5c26..799c776219 100644 --- a/modules/unictype/category-Cs +++ b/modules/unictype/category-Cs @@ -9,7 +9,8 @@ Depends-on: unictype/base configure.ac: -gl_LIBUNISTRING_MODULE([0.9.8], [unictype/category-Cs]) +gl_UNICTYPE_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([0.9.8], [unictype/category-Cs]) Makefile.am: if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_CS diff --git a/modules/unictype/category-L b/modules/unictype/category-L index 59bc2e799d..775972eadf 100644 --- a/modules/unictype/category-L +++ b/modules/unictype/category-L @@ -9,7 +9,8 @@ Depends-on: unictype/base configure.ac: -gl_LIBUNISTRING_MODULE([1.1], [unictype/category-L]) +gl_UNICTYPE_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([1.1], [unictype/category-L]) Makefile.am: if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_L diff --git a/modules/unictype/category-LC b/modules/unictype/category-LC index 64638f593c..89851f4a3e 100644 --- a/modules/unictype/category-LC +++ b/modules/unictype/category-LC @@ -9,7 +9,8 @@ Depends-on: unictype/base configure.ac: -gl_LIBUNISTRING_MODULE([1.1], [unictype/category-LC]) +gl_UNICTYPE_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([1.1], [unictype/category-LC]) Makefile.am: if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_LC diff --git a/modules/unictype/category-Ll b/modules/unictype/category-Ll index 22fb0ab42a..30b42d8c65 100644 --- a/modules/unictype/category-Ll +++ b/modules/unictype/category-Ll @@ -9,7 +9,8 @@ Depends-on: unictype/base configure.ac: -gl_LIBUNISTRING_MODULE([1.1], [unictype/category-Ll]) +gl_UNICTYPE_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([1.1], [unictype/category-Ll]) Makefile.am: if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_LL diff --git a/modules/unictype/category-Lm b/modules/unictype/category-Lm index 5ef35a5c32..5f8ec0fc37 100644 --- a/modules/unictype/category-Lm +++ b/modules/unictype/category-Lm @@ -9,7 +9,8 @@ Depends-on: unictype/base configure.ac: -gl_LIBUNISTRING_MODULE([1.1], [unictype/category-Lm]) +gl_UNICTYPE_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([1.1], [unictype/category-Lm]) Makefile.am: if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_LM diff --git a/modules/unictype/category-Lo b/modules/unictype/category-Lo index 906f37cefb..14aef8c11b 100644 --- a/modules/unictype/category-Lo +++ b/modules/unictype/category-Lo @@ -9,7 +9,8 @@ Depends-on: unictype/base configure.ac: -gl_LIBUNISTRING_MODULE([1.1], [unictype/category-Lo]) +gl_UNICTYPE_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([1.1], [unictype/category-Lo]) Makefile.am: if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_LO diff --git a/modules/unictype/category-Lt b/modules/unictype/category-Lt index 66e408b8f9..b4a436f8cd 100644 --- a/modules/unictype/category-Lt +++ b/modules/unictype/category-Lt @@ -9,7 +9,8 @@ Depends-on: unictype/base configure.ac: -gl_LIBUNISTRING_MODULE([0.9.8], [unictype/category-Lt]) +gl_UNICTYPE_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([0.9.8], [unictype/category-Lt]) Makefile.am: if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_LT diff --git a/modules/unictype/category-Lu b/modules/unictype/category-Lu index e47033825d..7eeedd5c74 100644 --- a/modules/unictype/category-Lu +++ b/modules/unictype/category-Lu @@ -9,7 +9,8 @@ Depends-on: unictype/base configure.ac: -gl_LIBUNISTRING_MODULE([0.9.11], [unictype/category-Lu]) +gl_UNICTYPE_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([0.9.11], [unictype/category-Lu]) Makefile.am: if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_LU diff --git a/modules/unictype/category-M b/modules/unictype/category-M index 6e1a8a5e44..c6882ec3a4 100644 --- a/modules/unictype/category-M +++ b/modules/unictype/category-M @@ -9,7 +9,8 @@ Depends-on: unictype/base configure.ac: -gl_LIBUNISTRING_MODULE([1.1], [unictype/category-M]) +gl_UNICTYPE_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([1.1], [unictype/category-M]) Makefile.am: if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_M diff --git a/modules/unictype/category-Mc b/modules/unictype/category-Mc index 56be269346..c92824a759 100644 --- a/modules/unictype/category-Mc +++ b/modules/unictype/category-Mc @@ -9,7 +9,8 @@ Depends-on: unictype/base configure.ac: -gl_LIBUNISTRING_MODULE([1.1], [unictype/category-Mc]) +gl_UNICTYPE_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([1.1], [unictype/category-Mc]) Makefile.am: if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_MC diff --git a/modules/unictype/category-Me b/modules/unictype/category-Me index 4277bf1aaa..bc14e9b8f3 100644 --- a/modules/unictype/category-Me +++ b/modules/unictype/category-Me @@ -9,7 +9,8 @@ Depends-on: unictype/base configure.ac: -gl_LIBUNISTRING_MODULE([0.9.8], [unictype/category-Me]) +gl_UNICTYPE_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([0.9.8], [unictype/category-Me]) Makefile.am: if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_ME diff --git a/modules/unictype/category-Mn b/modules/unictype/category-Mn index 65e6681f81..98fa15d514 100644 --- a/modules/unictype/category-Mn +++ b/modules/unictype/category-Mn @@ -9,7 +9,8 @@ Depends-on: unictype/base configure.ac: -gl_LIBUNISTRING_MODULE([1.1], [unictype/category-Mn]) +gl_UNICTYPE_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([1.1], [unictype/category-Mn]) Makefile.am: if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_MN diff --git a/modules/unictype/category-N b/modules/unictype/category-N index 036cc41e8f..d941d3cf06 100644 --- a/modules/unictype/category-N +++ b/modules/unictype/category-N @@ -9,7 +9,8 @@ Depends-on: unictype/base configure.ac: -gl_LIBUNISTRING_MODULE([1.1], [unictype/category-N]) +gl_UNICTYPE_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([1.1], [unictype/category-N]) Makefile.am: if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_N diff --git a/modules/unictype/category-Nd b/modules/unictype/category-Nd index b995ef1adf..953f047037 100644 --- a/modules/unictype/category-Nd +++ b/modules/unictype/category-Nd @@ -9,7 +9,8 @@ Depends-on: unictype/base configure.ac: -gl_LIBUNISTRING_MODULE([1.1], [unictype/category-Nd]) +gl_UNICTYPE_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([1.1], [unictype/category-Nd]) Makefile.am: if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_ND diff --git a/modules/unictype/category-Nl b/modules/unictype/category-Nl index da4bf4ccf4..15bf734764 100644 --- a/modules/unictype/category-Nl +++ b/modules/unictype/category-Nl @@ -9,7 +9,8 @@ Depends-on: unictype/base configure.ac: -gl_LIBUNISTRING_MODULE([0.9.8], [unictype/category-Nl]) +gl_UNICTYPE_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([0.9.8], [unictype/category-Nl]) Makefile.am: if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_NL diff --git a/modules/unictype/category-No b/modules/unictype/category-No index 36b74e540b..56b425c031 100644 --- a/modules/unictype/category-No +++ b/modules/unictype/category-No @@ -9,7 +9,8 @@ Depends-on: unictype/base configure.ac: -gl_LIBUNISTRING_MODULE([1.1], [unictype/category-No]) +gl_UNICTYPE_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([1.1], [unictype/category-No]) Makefile.am: if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_NO diff --git a/modules/unictype/category-P b/modules/unictype/category-P index 434e4dabe4..7a130824d7 100644 --- a/modules/unictype/category-P +++ b/modules/unictype/category-P @@ -9,7 +9,8 @@ Depends-on: unictype/base configure.ac: -gl_LIBUNISTRING_MODULE([1.1], [unictype/category-P]) +gl_UNICTYPE_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([1.1], [unictype/category-P]) Makefile.am: if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_P diff --git a/modules/unictype/category-Pc b/modules/unictype/category-Pc index a9faa90e99..e29568c530 100644 --- a/modules/unictype/category-Pc +++ b/modules/unictype/category-Pc @@ -9,7 +9,8 @@ Depends-on: unictype/base configure.ac: -gl_LIBUNISTRING_MODULE([0.9.8], [unictype/category-Pc]) +gl_UNICTYPE_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([0.9.8], [unictype/category-Pc]) Makefile.am: if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_PC diff --git a/modules/unictype/category-Pd b/modules/unictype/category-Pd index 31312f388b..f83661bc06 100644 --- a/modules/unictype/category-Pd +++ b/modules/unictype/category-Pd @@ -9,7 +9,8 @@ Depends-on: unictype/base configure.ac: -gl_LIBUNISTRING_MODULE([0.9.11], [unictype/category-Pd]) +gl_UNICTYPE_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([0.9.11], [unictype/category-Pd]) Makefile.am: if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_PD diff --git a/modules/unictype/category-Pe b/modules/unictype/category-Pe index 1b6c7b6964..f60ef24d55 100644 --- a/modules/unictype/category-Pe +++ b/modules/unictype/category-Pe @@ -9,7 +9,8 @@ Depends-on: unictype/base configure.ac: -gl_LIBUNISTRING_MODULE([0.9.11], [unictype/category-Pe]) +gl_UNICTYPE_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([0.9.11], [unictype/category-Pe]) Makefile.am: if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_PE diff --git a/modules/unictype/category-Pf b/modules/unictype/category-Pf index 51d51ed90d..9e57e3d609 100644 --- a/modules/unictype/category-Pf +++ b/modules/unictype/category-Pf @@ -9,7 +9,8 @@ Depends-on: unictype/base configure.ac: -gl_LIBUNISTRING_MODULE([0.9.8], [unictype/category-Pf]) +gl_UNICTYPE_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([0.9.8], [unictype/category-Pf]) Makefile.am: if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_PF diff --git a/modules/unictype/category-Pi b/modules/unictype/category-Pi index 841974fed4..e399968ee9 100644 --- a/modules/unictype/category-Pi +++ b/modules/unictype/category-Pi @@ -9,7 +9,8 @@ Depends-on: unictype/base configure.ac: -gl_LIBUNISTRING_MODULE([0.9.8], [unictype/category-Pi]) +gl_UNICTYPE_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([0.9.8], [unictype/category-Pi]) Makefile.am: if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_PI diff --git a/modules/unictype/category-Po b/modules/unictype/category-Po index 28bfd5e282..554db31093 100644 --- a/modules/unictype/category-Po +++ b/modules/unictype/category-Po @@ -9,7 +9,8 @@ Depends-on: unictype/base configure.ac: -gl_LIBUNISTRING_MODULE([1.1], [unictype/category-Po]) +gl_UNICTYPE_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([1.1], [unictype/category-Po]) Makefile.am: if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_PO diff --git a/modules/unictype/category-Ps b/modules/unictype/category-Ps index 2632d8b0fd..3bffac7591 100644 --- a/modules/unictype/category-Ps +++ b/modules/unictype/category-Ps @@ -9,7 +9,8 @@ Depends-on: unictype/base configure.ac: -gl_LIBUNISTRING_MODULE([0.9.11], [unictype/category-Ps]) +gl_UNICTYPE_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([0.9.11], [unictype/category-Ps]) Makefile.am: if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_PS diff --git a/modules/unictype/category-S b/modules/unictype/category-S index e2ac1d06c7..7a04266eaa 100644 --- a/modules/unictype/category-S +++ b/modules/unictype/category-S @@ -9,7 +9,8 @@ Depends-on: unictype/base configure.ac: -gl_LIBUNISTRING_MODULE([1.1], [unictype/category-S]) +gl_UNICTYPE_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([1.1], [unictype/category-S]) Makefile.am: if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_S diff --git a/modules/unictype/category-Sc b/modules/unictype/category-Sc index fdf8461a55..d3405f74f9 100644 --- a/modules/unictype/category-Sc +++ b/modules/unictype/category-Sc @@ -9,7 +9,8 @@ Depends-on: unictype/base configure.ac: -gl_LIBUNISTRING_MODULE([0.9.11], [unictype/category-Sc]) +gl_UNICTYPE_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([0.9.11], [unictype/category-Sc]) Makefile.am: if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_SC diff --git a/modules/unictype/category-Sk b/modules/unictype/category-Sk index 1e5d7eec37..4c7ad8f453 100644 --- a/modules/unictype/category-Sk +++ b/modules/unictype/category-Sk @@ -9,7 +9,8 @@ Depends-on: unictype/base configure.ac: -gl_LIBUNISTRING_MODULE([0.9.11], [unictype/category-Sk]) +gl_UNICTYPE_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([0.9.11], [unictype/category-Sk]) Makefile.am: if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_SK diff --git a/modules/unictype/category-Sm b/modules/unictype/category-Sm index 66a7a67f8e..d266776f72 100644 --- a/modules/unictype/category-Sm +++ b/modules/unictype/category-Sm @@ -9,7 +9,8 @@ Depends-on: unictype/base configure.ac: -gl_LIBUNISTRING_MODULE([0.9.8], [unictype/category-Sm]) +gl_UNICTYPE_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([0.9.8], [unictype/category-Sm]) Makefile.am: if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_SM diff --git a/modules/unictype/category-So b/modules/unictype/category-So index 835a5ec9ca..4f52ecaa19 100644 --- a/modules/unictype/category-So +++ b/modules/unictype/category-So @@ -9,7 +9,8 @@ Depends-on: unictype/base configure.ac: -gl_LIBUNISTRING_MODULE([1.1], [unictype/category-So]) +gl_UNICTYPE_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([1.1], [unictype/category-So]) Makefile.am: if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_SO diff --git a/modules/unictype/category-Z b/modules/unictype/category-Z index b6cca93f94..9ae228de4c 100644 --- a/modules/unictype/category-Z +++ b/modules/unictype/category-Z @@ -9,7 +9,8 @@ Depends-on: unictype/base configure.ac: -gl_LIBUNISTRING_MODULE([0.9.8], [unictype/category-Z]) +gl_UNICTYPE_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([0.9.8], [unictype/category-Z]) Makefile.am: if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_Z diff --git a/modules/unictype/category-Zl b/modules/unictype/category-Zl index df9f439218..3e2c15a133 100644 --- a/modules/unictype/category-Zl +++ b/modules/unictype/category-Zl @@ -9,7 +9,8 @@ Depends-on: unictype/base configure.ac: -gl_LIBUNISTRING_MODULE([0.9.8], [unictype/category-Zl]) +gl_UNICTYPE_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([0.9.8], [unictype/category-Zl]) Makefile.am: if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_ZL diff --git a/modules/unictype/category-Zp b/modules/unictype/category-Zp index 8d41d601be..a4dba5519e 100644 --- a/modules/unictype/category-Zp +++ b/modules/unictype/category-Zp @@ -9,7 +9,8 @@ Depends-on: unictype/base configure.ac: -gl_LIBUNISTRING_MODULE([0.9.8], [unictype/category-Zp]) +gl_UNICTYPE_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([0.9.8], [unictype/category-Zp]) Makefile.am: if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_ZP diff --git a/modules/unictype/category-Zs b/modules/unictype/category-Zs index e79ee10dfc..611cac9beb 100644 --- a/modules/unictype/category-Zs +++ b/modules/unictype/category-Zs @@ -9,7 +9,8 @@ Depends-on: unictype/base configure.ac: -gl_LIBUNISTRING_MODULE([0.9.8], [unictype/category-Zs]) +gl_UNICTYPE_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([0.9.8], [unictype/category-Zs]) Makefile.am: if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_ZS diff --git a/modules/unictype/property-alphabetic b/modules/unictype/property-alphabetic index 46f89adc3f..8afa9f3dde 100644 --- a/modules/unictype/property-alphabetic +++ b/modules/unictype/property-alphabetic @@ -11,7 +11,8 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_MODULE([1.1], [unictype/property-alphabetic]) +gl_UNICTYPE_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([1.1], [unictype/property-alphabetic]) Makefile.am: if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_ALPHABETIC diff --git a/modules/unictype/property-ascii-hex-digit b/modules/unictype/property-ascii-hex-digit index 6bbfc14c7f..49e9ab5838 100644 --- a/modules/unictype/property-ascii-hex-digit +++ b/modules/unictype/property-ascii-hex-digit @@ -11,7 +11,8 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_MODULE([0.9.8], [unictype/property-ascii-hex-digit]) +gl_UNICTYPE_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([0.9.8], [unictype/property-ascii-hex-digit]) Makefile.am: if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_ASCII_HEX_DIGIT diff --git a/modules/unictype/property-bidi-arabic-digit b/modules/unictype/property-bidi-arabic-digit index 09c8fa5e6f..12a2b4db1c 100644 --- a/modules/unictype/property-bidi-arabic-digit +++ b/modules/unictype/property-bidi-arabic-digit @@ -12,7 +12,8 @@ unictype/bidiclass-of configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_MODULE([1.1], [unictype/property-bidi-arabic-digit]) +gl_UNICTYPE_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([1.1], [unictype/property-bidi-arabic-digit]) Makefile.am: if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_BIDI_ARABIC_DIGIT diff --git a/modules/unictype/property-bidi-arabic-right-to-left b/modules/unictype/property-bidi-arabic-right-to-left index 8596bc519f..0800f91b92 100644 --- a/modules/unictype/property-bidi-arabic-right-to-left +++ b/modules/unictype/property-bidi-arabic-right-to-left @@ -12,7 +12,8 @@ unictype/bidiclass-of configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_MODULE([1.1], [unictype/property-bidi-arabic-right-to-left]) +gl_UNICTYPE_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([1.1], [unictype/property-bidi-arabic-right-to-left]) Makefile.am: if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_BIDI_ARABIC_RIGHT_TO_LEFT diff --git a/modules/unictype/property-bidi-block-separator b/modules/unictype/property-bidi-block-separator index 56b162787a..1148354bff 100644 --- a/modules/unictype/property-bidi-block-separator +++ b/modules/unictype/property-bidi-block-separator @@ -12,7 +12,8 @@ unictype/bidiclass-of configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_MODULE([1.1], [unictype/property-bidi-block-separator]) +gl_UNICTYPE_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([1.1], [unictype/property-bidi-block-separator]) Makefile.am: if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_BIDI_BLOCK_SEPARATOR diff --git a/modules/unictype/property-bidi-boundary-neutral b/modules/unictype/property-bidi-boundary-neutral index 2b4250d135..5b9d20cd90 100644 --- a/modules/unictype/property-bidi-boundary-neutral +++ b/modules/unictype/property-bidi-boundary-neutral @@ -12,7 +12,8 @@ unictype/bidiclass-of configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_MODULE([1.1], [unictype/property-bidi-boundary-neutral]) +gl_UNICTYPE_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([1.1], [unictype/property-bidi-boundary-neutral]) Makefile.am: if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_BIDI_BOUNDARY_NEUTRAL diff --git a/modules/unictype/property-bidi-common-separator b/modules/unictype/property-bidi-common-separator index 96121f62af..59ee0e93c8 100644 --- a/modules/unictype/property-bidi-common-separator +++ b/modules/unictype/property-bidi-common-separator @@ -12,7 +12,8 @@ unictype/bidiclass-of configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_MODULE([1.1], [unictype/property-bidi-common-separator]) +gl_UNICTYPE_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([1.1], [unictype/property-bidi-common-separator]) Makefile.am: if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_BIDI_COMMON_SEPARATOR diff --git a/modules/unictype/property-bidi-control b/modules/unictype/property-bidi-control index 9f196ebd5f..fec5863b93 100644 --- a/modules/unictype/property-bidi-control +++ b/modules/unictype/property-bidi-control @@ -12,7 +12,8 @@ unictype/bidiclass-of configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_MODULE([1.1], [unictype/property-bidi-control]) +gl_UNICTYPE_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([1.1], [unictype/property-bidi-control]) Makefile.am: if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_BIDI_CONTROL diff --git a/modules/unictype/property-bidi-embedding-or-override b/modules/unictype/property-bidi-embedding-or-override index 2644eecb78..7c422e8c9e 100644 --- a/modules/unictype/property-bidi-embedding-or-override +++ b/modules/unictype/property-bidi-embedding-or-override @@ -12,7 +12,8 @@ unictype/bidiclass-of configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_MODULE([1.1], [unictype/property-bidi-embedding-or-override]) +gl_UNICTYPE_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([1.1], [unictype/property-bidi-embedding-or-override]) Makefile.am: if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_BIDI_EMBEDDING_OR_OVERRIDE diff --git a/modules/unictype/property-bidi-eur-num-separator b/modules/unictype/property-bidi-eur-num-separator index aa31cacd68..530742dd07 100644 --- a/modules/unictype/property-bidi-eur-num-separator +++ b/modules/unictype/property-bidi-eur-num-separator @@ -12,7 +12,8 @@ unictype/bidiclass-of configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_MODULE([1.1], [unictype/property-bidi-eur-num-separator]) +gl_UNICTYPE_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([1.1], [unictype/property-bidi-eur-num-separator]) Makefile.am: if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_BIDI_EUR_NUM_SEPARATOR diff --git a/modules/unictype/property-bidi-eur-num-terminator b/modules/unictype/property-bidi-eur-num-terminator index 93c86e9343..354426c9c2 100644 --- a/modules/unictype/property-bidi-eur-num-terminator +++ b/modules/unictype/property-bidi-eur-num-terminator @@ -12,7 +12,8 @@ unictype/bidiclass-of configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_MODULE([1.1], [unictype/property-bidi-eur-num-terminator]) +gl_UNICTYPE_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([1.1], [unictype/property-bidi-eur-num-terminator]) Makefile.am: if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_BIDI_EUR_NUM_TERMINATOR diff --git a/modules/unictype/property-bidi-european-digit b/modules/unictype/property-bidi-european-digit index b6ff829daa..51c9368453 100644 --- a/modules/unictype/property-bidi-european-digit +++ b/modules/unictype/property-bidi-european-digit @@ -12,7 +12,8 @@ unictype/bidiclass-of configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_MODULE([1.1], [unictype/property-bidi-european-digit]) +gl_UNICTYPE_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([1.1], [unictype/property-bidi-european-digit]) Makefile.am: if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_BIDI_EUROPEAN_DIGIT diff --git a/modules/unictype/property-bidi-hebrew-right-to-left b/modules/unictype/property-bidi-hebrew-right-to-left index cb05b17a8d..2c937df3bc 100644 --- a/modules/unictype/property-bidi-hebrew-right-to-left +++ b/modules/unictype/property-bidi-hebrew-right-to-left @@ -12,7 +12,8 @@ unictype/bidiclass-of configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_MODULE([1.1], [unictype/property-bidi-hebrew-right-to-left]) +gl_UNICTYPE_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([1.1], [unictype/property-bidi-hebrew-right-to-left]) Makefile.am: if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_BIDI_HEBREW_RIGHT_TO_LEFT diff --git a/modules/unictype/property-bidi-left-to-right b/modules/unictype/property-bidi-left-to-right index 37e232070c..3d29fb863e 100644 --- a/modules/unictype/property-bidi-left-to-right +++ b/modules/unictype/property-bidi-left-to-right @@ -12,7 +12,8 @@ unictype/bidiclass-of configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_MODULE([1.1], [unictype/property-bidi-left-to-right]) +gl_UNICTYPE_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([1.1], [unictype/property-bidi-left-to-right]) Makefile.am: if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_BIDI_LEFT_TO_RIGHT diff --git a/modules/unictype/property-bidi-non-spacing-mark b/modules/unictype/property-bidi-non-spacing-mark index bfc9243246..db51c5ab0d 100644 --- a/modules/unictype/property-bidi-non-spacing-mark +++ b/modules/unictype/property-bidi-non-spacing-mark @@ -12,7 +12,8 @@ unictype/bidiclass-of configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_MODULE([1.1], [unictype/property-bidi-non-spacing-mark]) +gl_UNICTYPE_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([1.1], [unictype/property-bidi-non-spacing-mark]) Makefile.am: if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_BIDI_NON_SPACING_MARK diff --git a/modules/unictype/property-bidi-other-neutral b/modules/unictype/property-bidi-other-neutral index 1a705d11dc..e652305237 100644 --- a/modules/unictype/property-bidi-other-neutral +++ b/modules/unictype/property-bidi-other-neutral @@ -12,7 +12,8 @@ unictype/bidiclass-of configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_MODULE([1.1], [unictype/property-bidi-other-neutral]) +gl_UNICTYPE_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([1.1], [unictype/property-bidi-other-neutral]) Makefile.am: if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_BIDI_OTHER_NEUTRAL diff --git a/modules/unictype/property-bidi-pdf b/modules/unictype/property-bidi-pdf index a7a04d5d32..c4ed8ab98a 100644 --- a/modules/unictype/property-bidi-pdf +++ b/modules/unictype/property-bidi-pdf @@ -12,7 +12,8 @@ unictype/bidiclass-of configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_MODULE([1.1], [unictype/property-bidi-pdf]) +gl_UNICTYPE_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([1.1], [unictype/property-bidi-pdf]) Makefile.am: if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_BIDI_PDF diff --git a/modules/unictype/property-bidi-segment-separator b/modules/unictype/property-bidi-segment-separator index 8ca350f6fd..aab0ed6c3a 100644 --- a/modules/unictype/property-bidi-segment-separator +++ b/modules/unictype/property-bidi-segment-separator @@ -12,7 +12,8 @@ unictype/bidiclass-of configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_MODULE([1.1], [unictype/property-bidi-segment-separator]) +gl_UNICTYPE_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([1.1], [unictype/property-bidi-segment-separator]) Makefile.am: if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_BIDI_SEGMENT_SEPARATOR diff --git a/modules/unictype/property-bidi-whitespace b/modules/unictype/property-bidi-whitespace index 3edeecfefb..9fdf819fae 100644 --- a/modules/unictype/property-bidi-whitespace +++ b/modules/unictype/property-bidi-whitespace @@ -12,7 +12,8 @@ unictype/bidiclass-of configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_MODULE([1.1], [unictype/property-bidi-whitespace]) +gl_UNICTYPE_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([1.1], [unictype/property-bidi-whitespace]) Makefile.am: if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_BIDI_WHITESPACE diff --git a/modules/unictype/property-case-ignorable b/modules/unictype/property-case-ignorable index 444dbda281..1bf059d0f2 100644 --- a/modules/unictype/property-case-ignorable +++ b/modules/unictype/property-case-ignorable @@ -11,7 +11,8 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_MODULE([1.1], [unictype/property-case-ignorable]) +gl_UNICTYPE_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([1.1], [unictype/property-case-ignorable]) Makefile.am: if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_CASE_IGNORABLE diff --git a/modules/unictype/property-cased b/modules/unictype/property-cased index f4d841c74d..654ef2cd7e 100644 --- a/modules/unictype/property-cased +++ b/modules/unictype/property-cased @@ -11,7 +11,8 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_MODULE([1.1], [unictype/property-cased]) +gl_UNICTYPE_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([1.1], [unictype/property-cased]) Makefile.am: if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_CASED diff --git a/modules/unictype/property-changes-when-casefolded b/modules/unictype/property-changes-when-casefolded index 20e4e326fb..f6dab3784b 100644 --- a/modules/unictype/property-changes-when-casefolded +++ b/modules/unictype/property-changes-when-casefolded @@ -11,7 +11,8 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-changes-when-casefolded]) +gl_UNICTYPE_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([0.9.11], [unictype/property-changes-when-casefolded]) Makefile.am: if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_CHANGES_WHEN_CASEFOLDED diff --git a/modules/unictype/property-changes-when-casemapped b/modules/unictype/property-changes-when-casemapped index efdb8a8655..31564da357 100644 --- a/modules/unictype/property-changes-when-casemapped +++ b/modules/unictype/property-changes-when-casemapped @@ -11,7 +11,8 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-changes-when-casemapped]) +gl_UNICTYPE_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([0.9.11], [unictype/property-changes-when-casemapped]) Makefile.am: if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_CHANGES_WHEN_CASEMAPPED diff --git a/modules/unictype/property-changes-when-lowercased b/modules/unictype/property-changes-when-lowercased index dea13c47e6..b228f22cdc 100644 --- a/modules/unictype/property-changes-when-lowercased +++ b/modules/unictype/property-changes-when-lowercased @@ -11,7 +11,8 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-changes-when-lowercased]) +gl_UNICTYPE_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([0.9.11], [unictype/property-changes-when-lowercased]) Makefile.am: if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_CHANGES_WHEN_LOWERCASED diff --git a/modules/unictype/property-changes-when-titlecased b/modules/unictype/property-changes-when-titlecased index 5324d721af..59c9abcf95 100644 --- a/modules/unictype/property-changes-when-titlecased +++ b/modules/unictype/property-changes-when-titlecased @@ -11,7 +11,8 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-changes-when-titlecased]) +gl_UNICTYPE_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([0.9.11], [unictype/property-changes-when-titlecased]) Makefile.am: if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_CHANGES_WHEN_TITLECASED diff --git a/modules/unictype/property-changes-when-uppercased b/modules/unictype/property-changes-when-uppercased index 00748c07f5..e7532a6138 100644 --- a/modules/unictype/property-changes-when-uppercased +++ b/modules/unictype/property-changes-when-uppercased @@ -11,7 +11,8 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-changes-when-uppercased]) +gl_UNICTYPE_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([0.9.11], [unictype/property-changes-when-uppercased]) Makefile.am: if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_CHANGES_WHEN_UPPERCASED diff --git a/modules/unictype/property-combining b/modules/unictype/property-combining index 74c9362e07..7720b3a043 100644 --- a/modules/unictype/property-combining +++ b/modules/unictype/property-combining @@ -11,7 +11,8 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_MODULE([1.1], [unictype/property-combining]) +gl_UNICTYPE_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([1.1], [unictype/property-combining]) Makefile.am: if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_COMBINING diff --git a/modules/unictype/property-composite b/modules/unictype/property-composite index e0b8104967..b70fe88ea4 100644 --- a/modules/unictype/property-composite +++ b/modules/unictype/property-composite @@ -11,7 +11,8 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-composite]) +gl_UNICTYPE_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([0.9.11], [unictype/property-composite]) Makefile.am: if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_COMPOSITE diff --git a/modules/unictype/property-currency-symbol b/modules/unictype/property-currency-symbol index a1f3ce95b4..a8dbeabbc9 100644 --- a/modules/unictype/property-currency-symbol +++ b/modules/unictype/property-currency-symbol @@ -13,7 +13,8 @@ unictype/category-Sc configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-currency-symbol]) +gl_UNICTYPE_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([0.9.11], [unictype/property-currency-symbol]) Makefile.am: if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_CURRENCY_SYMBOL diff --git a/modules/unictype/property-dash b/modules/unictype/property-dash index 3f280738fe..2b8e4209ea 100644 --- a/modules/unictype/property-dash +++ b/modules/unictype/property-dash @@ -11,7 +11,8 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-dash]) +gl_UNICTYPE_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([0.9.11], [unictype/property-dash]) Makefile.am: if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_DASH diff --git a/modules/unictype/property-decimal-digit b/modules/unictype/property-decimal-digit index 230823201c..1f6be7dc7b 100644 --- a/modules/unictype/property-decimal-digit +++ b/modules/unictype/property-decimal-digit @@ -13,7 +13,8 @@ unictype/category-Nd configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_MODULE([1.1], [unictype/property-decimal-digit]) +gl_UNICTYPE_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([1.1], [unictype/property-decimal-digit]) Makefile.am: if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_DECIMAL_DIGIT diff --git a/modules/unictype/property-default-ignorable-code-point b/modules/unictype/property-default-ignorable-code-point index 012e36eeda..775879c958 100644 --- a/modules/unictype/property-default-ignorable-code-point +++ b/modules/unictype/property-default-ignorable-code-point @@ -11,7 +11,8 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-default-ignorable-code-point]) +gl_UNICTYPE_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([0.9.11], [unictype/property-default-ignorable-code-point]) Makefile.am: if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_DEFAULT_IGNORABLE_CODE_POINT diff --git a/modules/unictype/property-deprecated b/modules/unictype/property-deprecated index 9cc59b7a9f..7c4baad45f 100644 --- a/modules/unictype/property-deprecated +++ b/modules/unictype/property-deprecated @@ -11,7 +11,8 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_MODULE([0.9.8], [unictype/property-deprecated]) +gl_UNICTYPE_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([0.9.8], [unictype/property-deprecated]) Makefile.am: if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_DEPRECATED diff --git a/modules/unictype/property-diacritic b/modules/unictype/property-diacritic index 7a3c65a6fc..f5be0de12b 100644 --- a/modules/unictype/property-diacritic +++ b/modules/unictype/property-diacritic @@ -11,7 +11,8 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_MODULE([1.1], [unictype/property-diacritic]) +gl_UNICTYPE_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([1.1], [unictype/property-diacritic]) Makefile.am: if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_DIACRITIC diff --git a/modules/unictype/property-emoji b/modules/unictype/property-emoji index 74ad627578..8184b0b21f 100644 --- a/modules/unictype/property-emoji +++ b/modules/unictype/property-emoji @@ -11,7 +11,8 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_MODULE([1.1], [unictype/property-emoji]) +gl_UNICTYPE_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([1.1], [unictype/property-emoji]) Makefile.am: if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_EMOJI diff --git a/modules/unictype/property-emoji-component b/modules/unictype/property-emoji-component index df067e3c74..bbf969af3b 100644 --- a/modules/unictype/property-emoji-component +++ b/modules/unictype/property-emoji-component @@ -11,7 +11,8 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-emoji-component]) +gl_UNICTYPE_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([0.9.11], [unictype/property-emoji-component]) Makefile.am: if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_EMOJI_COMPONENT diff --git a/modules/unictype/property-emoji-modifier b/modules/unictype/property-emoji-modifier index 9d358e7860..189ef4e67b 100644 --- a/modules/unictype/property-emoji-modifier +++ b/modules/unictype/property-emoji-modifier @@ -11,7 +11,8 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-emoji-modifier]) +gl_UNICTYPE_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([0.9.11], [unictype/property-emoji-modifier]) Makefile.am: if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_EMOJI_MODIFIER diff --git a/modules/unictype/property-emoji-modifier-base b/modules/unictype/property-emoji-modifier-base index 2a43a7f844..8cd3a86c25 100644 --- a/modules/unictype/property-emoji-modifier-base +++ b/modules/unictype/property-emoji-modifier-base @@ -11,7 +11,8 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_MODULE([1.1], [unictype/property-emoji-modifier-base]) +gl_UNICTYPE_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([1.1], [unictype/property-emoji-modifier-base]) Makefile.am: if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_EMOJI_MODIFIER_BASE diff --git a/modules/unictype/property-emoji-presentation b/modules/unictype/property-emoji-presentation index c10525b56b..4412a42cea 100644 --- a/modules/unictype/property-emoji-presentation +++ b/modules/unictype/property-emoji-presentation @@ -11,7 +11,8 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_MODULE([1.1], [unictype/property-emoji-presentation]) +gl_UNICTYPE_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([1.1], [unictype/property-emoji-presentation]) Makefile.am: if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_EMOJI_PRESENTATION diff --git a/modules/unictype/property-extended-pictographic b/modules/unictype/property-extended-pictographic index 96ce308a51..66e85cda62 100644 --- a/modules/unictype/property-extended-pictographic +++ b/modules/unictype/property-extended-pictographic @@ -11,7 +11,8 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-extended-pictographic]) +gl_UNICTYPE_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([0.9.11], [unictype/property-extended-pictographic]) Makefile.am: if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_EXTENDED_PICTOGRAPHIC diff --git a/modules/unictype/property-extender b/modules/unictype/property-extender index b6c2bb1328..599efe25e3 100644 --- a/modules/unictype/property-extender +++ b/modules/unictype/property-extender @@ -11,7 +11,8 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-extender]) +gl_UNICTYPE_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([0.9.11], [unictype/property-extender]) Makefile.am: if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_EXTENDER diff --git a/modules/unictype/property-format-control b/modules/unictype/property-format-control index 8539b53e58..d6a2397d2e 100644 --- a/modules/unictype/property-format-control +++ b/modules/unictype/property-format-control @@ -11,7 +11,8 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_MODULE([0.9.8], [unictype/property-format-control]) +gl_UNICTYPE_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([0.9.8], [unictype/property-format-control]) Makefile.am: if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_FORMAT_CONTROL diff --git a/modules/unictype/property-grapheme-base b/modules/unictype/property-grapheme-base index 91eb8ed30c..46b453ab5e 100644 --- a/modules/unictype/property-grapheme-base +++ b/modules/unictype/property-grapheme-base @@ -11,7 +11,8 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_MODULE([1.1], [unictype/property-grapheme-base]) +gl_UNICTYPE_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([1.1], [unictype/property-grapheme-base]) Makefile.am: if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_GRAPHEME_BASE diff --git a/modules/unictype/property-grapheme-extend b/modules/unictype/property-grapheme-extend index 276703217f..fa9d0fb8fc 100644 --- a/modules/unictype/property-grapheme-extend +++ b/modules/unictype/property-grapheme-extend @@ -11,7 +11,8 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_MODULE([1.1], [unictype/property-grapheme-extend]) +gl_UNICTYPE_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([1.1], [unictype/property-grapheme-extend]) Makefile.am: if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_GRAPHEME_EXTEND diff --git a/modules/unictype/property-grapheme-link b/modules/unictype/property-grapheme-link index 73bd5ca4b5..93969770ea 100644 --- a/modules/unictype/property-grapheme-link +++ b/modules/unictype/property-grapheme-link @@ -11,7 +11,8 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_MODULE([1.1], [unictype/property-grapheme-link]) +gl_UNICTYPE_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([1.1], [unictype/property-grapheme-link]) Makefile.am: if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_GRAPHEME_LINK diff --git a/modules/unictype/property-hex-digit b/modules/unictype/property-hex-digit index 1df2e191f9..670092c8d3 100644 --- a/modules/unictype/property-hex-digit +++ b/modules/unictype/property-hex-digit @@ -11,7 +11,8 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_MODULE([0.9.8], [unictype/property-hex-digit]) +gl_UNICTYPE_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([0.9.8], [unictype/property-hex-digit]) Makefile.am: if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_HEX_DIGIT diff --git a/modules/unictype/property-hyphen b/modules/unictype/property-hyphen index 31169d9343..3e1bdd8190 100644 --- a/modules/unictype/property-hyphen +++ b/modules/unictype/property-hyphen @@ -11,7 +11,8 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_MODULE([0.9.8], [unictype/property-hyphen]) +gl_UNICTYPE_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([0.9.8], [unictype/property-hyphen]) Makefile.am: if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_HYPHEN diff --git a/modules/unictype/property-id-continue b/modules/unictype/property-id-continue index 7addc91b07..aec4b3d5c3 100644 --- a/modules/unictype/property-id-continue +++ b/modules/unictype/property-id-continue @@ -11,7 +11,8 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_MODULE([1.1], [unictype/property-id-continue]) +gl_UNICTYPE_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([1.1], [unictype/property-id-continue]) Makefile.am: if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_ID_CONTINUE diff --git a/modules/unictype/property-id-start b/modules/unictype/property-id-start index 2d908bef3f..2bf28f3d65 100644 --- a/modules/unictype/property-id-start +++ b/modules/unictype/property-id-start @@ -11,7 +11,8 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_MODULE([1.1], [unictype/property-id-start]) +gl_UNICTYPE_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([1.1], [unictype/property-id-start]) Makefile.am: if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_ID_START diff --git a/modules/unictype/property-ideographic b/modules/unictype/property-ideographic index 18047a1662..d0534e1374 100644 --- a/modules/unictype/property-ideographic +++ b/modules/unictype/property-ideographic @@ -11,7 +11,8 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_MODULE([1.1], [unictype/property-ideographic]) +gl_UNICTYPE_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([1.1], [unictype/property-ideographic]) Makefile.am: if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_IDEOGRAPHIC diff --git a/modules/unictype/property-ids-binary-operator b/modules/unictype/property-ids-binary-operator index d3f1faea6b..a453340214 100644 --- a/modules/unictype/property-ids-binary-operator +++ b/modules/unictype/property-ids-binary-operator @@ -11,7 +11,8 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_MODULE([0.9.8], [unictype/property-ids-binary-operator]) +gl_UNICTYPE_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([0.9.8], [unictype/property-ids-binary-operator]) Makefile.am: if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_IDS_BINARY_OPERATOR diff --git a/modules/unictype/property-ids-trinary-operator b/modules/unictype/property-ids-trinary-operator index 9ec126755a..c37c796341 100644 --- a/modules/unictype/property-ids-trinary-operator +++ b/modules/unictype/property-ids-trinary-operator @@ -11,7 +11,8 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_MODULE([0.9.8], [unictype/property-ids-trinary-operator]) +gl_UNICTYPE_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([0.9.8], [unictype/property-ids-trinary-operator]) Makefile.am: if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_IDS_TRINARY_OPERATOR diff --git a/modules/unictype/property-ignorable-control b/modules/unictype/property-ignorable-control index eee20452f7..3a19783374 100644 --- a/modules/unictype/property-ignorable-control +++ b/modules/unictype/property-ignorable-control @@ -11,7 +11,8 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_MODULE([1.1], [unictype/property-ignorable-control]) +gl_UNICTYPE_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([1.1], [unictype/property-ignorable-control]) Makefile.am: if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_IGNORABLE_CONTROL diff --git a/modules/unictype/property-iso-control b/modules/unictype/property-iso-control index 5ea2519d03..63299cc86c 100644 --- a/modules/unictype/property-iso-control +++ b/modules/unictype/property-iso-control @@ -13,7 +13,8 @@ unictype/category-Cc configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_MODULE([0.9.8], [unictype/property-iso-control]) +gl_UNICTYPE_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([0.9.8], [unictype/property-iso-control]) Makefile.am: if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_ISO_CONTROL diff --git a/modules/unictype/property-join-control b/modules/unictype/property-join-control index b2778f7d06..9e91f41e65 100644 --- a/modules/unictype/property-join-control +++ b/modules/unictype/property-join-control @@ -11,7 +11,8 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_MODULE([0.9.8], [unictype/property-join-control]) +gl_UNICTYPE_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([0.9.8], [unictype/property-join-control]) Makefile.am: if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_JOIN_CONTROL diff --git a/modules/unictype/property-left-of-pair b/modules/unictype/property-left-of-pair index eba29070f6..bdfaf16d25 100644 --- a/modules/unictype/property-left-of-pair +++ b/modules/unictype/property-left-of-pair @@ -11,7 +11,8 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_MODULE([0.9.8], [unictype/property-left-of-pair]) +gl_UNICTYPE_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([0.9.8], [unictype/property-left-of-pair]) Makefile.am: if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_LEFT_OF_PAIR diff --git a/modules/unictype/property-line-separator b/modules/unictype/property-line-separator index d6e0d32074..784463b489 100644 --- a/modules/unictype/property-line-separator +++ b/modules/unictype/property-line-separator @@ -11,7 +11,8 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_MODULE([0.9.8], [unictype/property-line-separator]) +gl_UNICTYPE_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([0.9.8], [unictype/property-line-separator]) Makefile.am: if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_LINE_SEPARATOR diff --git a/modules/unictype/property-logical-order-exception b/modules/unictype/property-logical-order-exception index 7dae5c4a27..f07630e334 100644 --- a/modules/unictype/property-logical-order-exception +++ b/modules/unictype/property-logical-order-exception @@ -11,7 +11,8 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_MODULE([0.9.8], [unictype/property-logical-order-exception]) +gl_UNICTYPE_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([0.9.8], [unictype/property-logical-order-exception]) Makefile.am: if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_LOGICAL_ORDER_EXCEPTION diff --git a/modules/unictype/property-lowercase b/modules/unictype/property-lowercase index ee06407a90..c48c0ed4e1 100644 --- a/modules/unictype/property-lowercase +++ b/modules/unictype/property-lowercase @@ -11,7 +11,8 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_MODULE([1.1], [unictype/property-lowercase]) +gl_UNICTYPE_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([1.1], [unictype/property-lowercase]) Makefile.am: if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_LOWERCASE diff --git a/modules/unictype/property-math b/modules/unictype/property-math index 3dfa390071..2a54651c02 100644 --- a/modules/unictype/property-math +++ b/modules/unictype/property-math @@ -11,7 +11,8 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_MODULE([0.9.8], [unictype/property-math]) +gl_UNICTYPE_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([0.9.8], [unictype/property-math]) Makefile.am: if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_MATH diff --git a/modules/unictype/property-non-break b/modules/unictype/property-non-break index 07d2cf4294..ed940354a7 100644 --- a/modules/unictype/property-non-break +++ b/modules/unictype/property-non-break @@ -11,7 +11,8 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_MODULE([0.9.8], [unictype/property-non-break]) +gl_UNICTYPE_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([0.9.8], [unictype/property-non-break]) Makefile.am: if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_NON_BREAK diff --git a/modules/unictype/property-not-a-character b/modules/unictype/property-not-a-character index ecac2beb8a..d16b3a44a8 100644 --- a/modules/unictype/property-not-a-character +++ b/modules/unictype/property-not-a-character @@ -11,7 +11,8 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_MODULE([0.9.8], [unictype/property-not-a-character]) +gl_UNICTYPE_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([0.9.8], [unictype/property-not-a-character]) Makefile.am: if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_NOT_A_CHARACTER diff --git a/modules/unictype/property-numeric b/modules/unictype/property-numeric index 754f3dcd89..9c26999bbf 100644 --- a/modules/unictype/property-numeric +++ b/modules/unictype/property-numeric @@ -11,7 +11,8 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_MODULE([1.1], [unictype/property-numeric]) +gl_UNICTYPE_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([1.1], [unictype/property-numeric]) Makefile.am: if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_NUMERIC diff --git a/modules/unictype/property-other-alphabetic b/modules/unictype/property-other-alphabetic index c11c5d6df0..ad9e728702 100644 --- a/modules/unictype/property-other-alphabetic +++ b/modules/unictype/property-other-alphabetic @@ -11,7 +11,8 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_MODULE([1.1], [unictype/property-other-alphabetic]) +gl_UNICTYPE_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([1.1], [unictype/property-other-alphabetic]) Makefile.am: if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_OTHER_ALPHABETIC diff --git a/modules/unictype/property-other-default-ignorable-code-point b/modules/unictype/property-other-default-ignorable-code-point index 82738b2010..02a49d8c2f 100644 --- a/modules/unictype/property-other-default-ignorable-code-point +++ b/modules/unictype/property-other-default-ignorable-code-point @@ -11,7 +11,8 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_MODULE([0.9.8], [unictype/property-other-default-ignorable-code-point]) +gl_UNICTYPE_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([0.9.8], [unictype/property-other-default-ignorable-code-point]) Makefile.am: if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_OTHER_DEFAULT_IGNORABLE_CODE_POINT diff --git a/modules/unictype/property-other-grapheme-extend b/modules/unictype/property-other-grapheme-extend index f5eb14a1a2..23d261da98 100644 --- a/modules/unictype/property-other-grapheme-extend +++ b/modules/unictype/property-other-grapheme-extend @@ -11,7 +11,8 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-other-grapheme-extend]) +gl_UNICTYPE_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([0.9.11], [unictype/property-other-grapheme-extend]) Makefile.am: if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_OTHER_GRAPHEME_EXTEND diff --git a/modules/unictype/property-other-id-continue b/modules/unictype/property-other-id-continue index f2a8d0a963..39ca2dcbbc 100644 --- a/modules/unictype/property-other-id-continue +++ b/modules/unictype/property-other-id-continue @@ -11,7 +11,8 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_MODULE([0.9.8], [unictype/property-other-id-continue]) +gl_UNICTYPE_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([0.9.8], [unictype/property-other-id-continue]) Makefile.am: if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_OTHER_ID_CONTINUE diff --git a/modules/unictype/property-other-id-start b/modules/unictype/property-other-id-start index 10691e7eff..7a9f2daa83 100644 --- a/modules/unictype/property-other-id-start +++ b/modules/unictype/property-other-id-start @@ -11,7 +11,8 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_MODULE([0.9.8], [unictype/property-other-id-start]) +gl_UNICTYPE_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([0.9.8], [unictype/property-other-id-start]) Makefile.am: if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_OTHER_ID_START diff --git a/modules/unictype/property-other-lowercase b/modules/unictype/property-other-lowercase index 0f1120a299..3cf37e1634 100644 --- a/modules/unictype/property-other-lowercase +++ b/modules/unictype/property-other-lowercase @@ -11,7 +11,8 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_MODULE([1.1], [unictype/property-other-lowercase]) +gl_UNICTYPE_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([1.1], [unictype/property-other-lowercase]) Makefile.am: if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_OTHER_LOWERCASE diff --git a/modules/unictype/property-other-math b/modules/unictype/property-other-math index d232d42f4f..03bd25b2f5 100644 --- a/modules/unictype/property-other-math +++ b/modules/unictype/property-other-math @@ -11,7 +11,8 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_MODULE([0.9.8], [unictype/property-other-math]) +gl_UNICTYPE_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([0.9.8], [unictype/property-other-math]) Makefile.am: if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_OTHER_MATH diff --git a/modules/unictype/property-other-uppercase b/modules/unictype/property-other-uppercase index ea64aa3637..8723f70b98 100644 --- a/modules/unictype/property-other-uppercase +++ b/modules/unictype/property-other-uppercase @@ -11,7 +11,8 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_MODULE([0.9.8], [unictype/property-other-uppercase]) +gl_UNICTYPE_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([0.9.8], [unictype/property-other-uppercase]) Makefile.am: if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_OTHER_UPPERCASE diff --git a/modules/unictype/property-paired-punctuation b/modules/unictype/property-paired-punctuation index 0c37744b00..e38bdeeb4d 100644 --- a/modules/unictype/property-paired-punctuation +++ b/modules/unictype/property-paired-punctuation @@ -11,7 +11,8 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_MODULE([0.9.8], [unictype/property-paired-punctuation]) +gl_UNICTYPE_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([0.9.8], [unictype/property-paired-punctuation]) Makefile.am: if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_PAIRED_PUNCTUATION diff --git a/modules/unictype/property-paragraph-separator b/modules/unictype/property-paragraph-separator index 94acfaab8f..d10781d3ba 100644 --- a/modules/unictype/property-paragraph-separator +++ b/modules/unictype/property-paragraph-separator @@ -11,7 +11,8 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_MODULE([0.9.8], [unictype/property-paragraph-separator]) +gl_UNICTYPE_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([0.9.8], [unictype/property-paragraph-separator]) Makefile.am: if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_PARAGRAPH_SEPARATOR diff --git a/modules/unictype/property-pattern-syntax b/modules/unictype/property-pattern-syntax index 2e1d818bcf..6f1a63392b 100644 --- a/modules/unictype/property-pattern-syntax +++ b/modules/unictype/property-pattern-syntax @@ -11,7 +11,8 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_MODULE([0.9.8], [unictype/property-pattern-syntax]) +gl_UNICTYPE_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([0.9.8], [unictype/property-pattern-syntax]) Makefile.am: if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_PATTERN_SYNTAX diff --git a/modules/unictype/property-pattern-white-space b/modules/unictype/property-pattern-white-space index 9c132fec9b..dc928da5ad 100644 --- a/modules/unictype/property-pattern-white-space +++ b/modules/unictype/property-pattern-white-space @@ -11,7 +11,8 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_MODULE([0.9.8], [unictype/property-pattern-white-space]) +gl_UNICTYPE_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([0.9.8], [unictype/property-pattern-white-space]) Makefile.am: if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_PATTERN_WHITE_SPACE diff --git a/modules/unictype/property-private-use b/modules/unictype/property-private-use index 65a7a262c1..d3061c654d 100644 --- a/modules/unictype/property-private-use +++ b/modules/unictype/property-private-use @@ -11,7 +11,8 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_MODULE([0.9.8], [unictype/property-private-use]) +gl_UNICTYPE_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([0.9.8], [unictype/property-private-use]) Makefile.am: if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_PRIVATE_USE diff --git a/modules/unictype/property-punctuation b/modules/unictype/property-punctuation index b0c0f9e412..5ffd924edd 100644 --- a/modules/unictype/property-punctuation +++ b/modules/unictype/property-punctuation @@ -13,7 +13,8 @@ unictype/category-P configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_MODULE([1.1], [unictype/property-punctuation]) +gl_UNICTYPE_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([1.1], [unictype/property-punctuation]) Makefile.am: if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_PUNCTUATION diff --git a/modules/unictype/property-quotation-mark b/modules/unictype/property-quotation-mark index a98326ced3..97b2ef9b28 100644 --- a/modules/unictype/property-quotation-mark +++ b/modules/unictype/property-quotation-mark @@ -11,7 +11,8 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_MODULE([0.9.8], [unictype/property-quotation-mark]) +gl_UNICTYPE_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([0.9.8], [unictype/property-quotation-mark]) Makefile.am: if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_QUOTATION_MARK diff --git a/modules/unictype/property-radical b/modules/unictype/property-radical index 9b0317254f..1c6c0c1a36 100644 --- a/modules/unictype/property-radical +++ b/modules/unictype/property-radical @@ -11,7 +11,8 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_MODULE([0.9.8], [unictype/property-radical]) +gl_UNICTYPE_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([0.9.8], [unictype/property-radical]) Makefile.am: if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_RADICAL diff --git a/modules/unictype/property-regional-indicator b/modules/unictype/property-regional-indicator index c36e098cc3..a1d8509026 100644 --- a/modules/unictype/property-regional-indicator +++ b/modules/unictype/property-regional-indicator @@ -9,7 +9,8 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-regional-indicator]) +gl_UNICTYPE_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([0.9.11], [unictype/property-regional-indicator]) Makefile.am: if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_REGIONAL_INDICATOR diff --git a/modules/unictype/property-sentence-terminal b/modules/unictype/property-sentence-terminal index baf30cf64a..923ccc91df 100644 --- a/modules/unictype/property-sentence-terminal +++ b/modules/unictype/property-sentence-terminal @@ -11,7 +11,8 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_MODULE([1.1], [unictype/property-sentence-terminal]) +gl_UNICTYPE_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([1.1], [unictype/property-sentence-terminal]) Makefile.am: if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_SENTENCE_TERMINAL diff --git a/modules/unictype/property-soft-dotted b/modules/unictype/property-soft-dotted index d6d21f98a1..e67b807bc0 100644 --- a/modules/unictype/property-soft-dotted +++ b/modules/unictype/property-soft-dotted @@ -11,7 +11,8 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_MODULE([1.1], [unictype/property-soft-dotted]) +gl_UNICTYPE_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([1.1], [unictype/property-soft-dotted]) Makefile.am: if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_SOFT_DOTTED diff --git a/modules/unictype/property-space b/modules/unictype/property-space index fb0349bced..fe5e9f935c 100644 --- a/modules/unictype/property-space +++ b/modules/unictype/property-space @@ -13,7 +13,8 @@ unictype/category-Zs configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_MODULE([0.9.8], [unictype/property-space]) +gl_UNICTYPE_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([0.9.8], [unictype/property-space]) Makefile.am: if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_SPACE diff --git a/modules/unictype/property-terminal-punctuation b/modules/unictype/property-terminal-punctuation index b62a666cc0..d6be2e0332 100644 --- a/modules/unictype/property-terminal-punctuation +++ b/modules/unictype/property-terminal-punctuation @@ -11,7 +11,8 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_MODULE([1.1], [unictype/property-terminal-punctuation]) +gl_UNICTYPE_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([1.1], [unictype/property-terminal-punctuation]) Makefile.am: if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_TERMINAL_PUNCTUATION diff --git a/modules/unictype/property-titlecase b/modules/unictype/property-titlecase index a80a687f03..45b740a916 100644 --- a/modules/unictype/property-titlecase +++ b/modules/unictype/property-titlecase @@ -13,7 +13,8 @@ unictype/category-Lt configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_MODULE([0.9.8], [unictype/property-titlecase]) +gl_UNICTYPE_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([0.9.8], [unictype/property-titlecase]) Makefile.am: if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_TITLECASE diff --git a/modules/unictype/property-unassigned-code-value b/modules/unictype/property-unassigned-code-value index 52a8d7a857..9288d40463 100644 --- a/modules/unictype/property-unassigned-code-value +++ b/modules/unictype/property-unassigned-code-value @@ -11,7 +11,8 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_MODULE([1.1], [unictype/property-unassigned-code-value]) +gl_UNICTYPE_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([1.1], [unictype/property-unassigned-code-value]) Makefile.am: if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_UNASSIGNED_CODE_VALUE diff --git a/modules/unictype/property-unified-ideograph b/modules/unictype/property-unified-ideograph index 9db0b3499e..1f433459f5 100644 --- a/modules/unictype/property-unified-ideograph +++ b/modules/unictype/property-unified-ideograph @@ -11,7 +11,8 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_MODULE([1.1], [unictype/property-unified-ideograph]) +gl_UNICTYPE_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([1.1], [unictype/property-unified-ideograph]) Makefile.am: if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_UNIFIED_IDEOGRAPH diff --git a/modules/unictype/property-uppercase b/modules/unictype/property-uppercase index deca097841..a8637bde06 100644 --- a/modules/unictype/property-uppercase +++ b/modules/unictype/property-uppercase @@ -11,7 +11,8 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-uppercase]) +gl_UNICTYPE_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([0.9.11], [unictype/property-uppercase]) Makefile.am: if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_UPPERCASE diff --git a/modules/unictype/property-variation-selector b/modules/unictype/property-variation-selector index 5780bd4f10..6624d37ebd 100644 --- a/modules/unictype/property-variation-selector +++ b/modules/unictype/property-variation-selector @@ -11,7 +11,8 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-variation-selector]) +gl_UNICTYPE_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([0.9.11], [unictype/property-variation-selector]) Makefile.am: if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_VARIATION_SELECTOR diff --git a/modules/unictype/property-white-space b/modules/unictype/property-white-space index 615f87d188..c6bb41df33 100644 --- a/modules/unictype/property-white-space +++ b/modules/unictype/property-white-space @@ -11,7 +11,8 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_MODULE([0.9.8], [unictype/property-white-space]) +gl_UNICTYPE_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([0.9.8], [unictype/property-white-space]) Makefile.am: if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_WHITE_SPACE diff --git a/modules/unictype/property-xid-continue b/modules/unictype/property-xid-continue index e029159abf..43daed2868 100644 --- a/modules/unictype/property-xid-continue +++ b/modules/unictype/property-xid-continue @@ -11,7 +11,8 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_MODULE([1.1], [unictype/property-xid-continue]) +gl_UNICTYPE_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([1.1], [unictype/property-xid-continue]) Makefile.am: if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_XID_CONTINUE diff --git a/modules/unictype/property-xid-start b/modules/unictype/property-xid-start index 0f12feb06b..001b590ca8 100644 --- a/modules/unictype/property-xid-start +++ b/modules/unictype/property-xid-start @@ -11,7 +11,8 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_MODULE([1.1], [unictype/property-xid-start]) +gl_UNICTYPE_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([1.1], [unictype/property-xid-start]) Makefile.am: if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_XID_START diff --git a/modules/unictype/property-zero-width b/modules/unictype/property-zero-width index f8daab43e6..654520e1e2 100644 --- a/modules/unictype/property-zero-width +++ b/modules/unictype/property-zero-width @@ -11,7 +11,8 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_MODULE([1.1], [unictype/property-zero-width]) +gl_UNICTYPE_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([1.1], [unictype/property-zero-width]) Makefile.am: if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_ZERO_WIDTH diff --git a/modules/uninorm/base b/modules/uninorm/base index 65c8fe61c9..d5b8854828 100644 --- a/modules/uninorm/base +++ b/modules/uninorm/base @@ -4,13 +4,16 @@ Base layer for normalization forms of Unicode strings. Files: lib/uninorm.in.h m4/libunistring-base.m4 +m4/uninorm_h.m4 Depends-on: gen-header unitypes configure.ac: -gl_LIBUNISTRING_LIBHEADER([0.9.11], [uninorm.h]) +gl_LIBUNISTRING_LIBHEADER([1.2], [uninorm.h]) +gl_UNINORM_H +gl_UNINORM_H_REQUIRE_DEFAULTS AC_PROG_MKDIR_P Makefile.am: @@ -18,7 +21,13 @@ BUILT_SOURCES += $(LIBUNISTRING_UNINORM_H) uninorm.h: uninorm.in.h @NMD@ $(AM_V_GEN)$(MKDIR_P) '%reldir%' - $(gl_V_at)$(SED_HEADER_TO_AT_t) $(srcdir)/uninorm.in.h + $(gl_V_at)$(SED_HEADER_STDOUT) \ + -e 's|@''HAVE_UNISTRING_WOE32DLL_H''@|$(HAVE_UNISTRING_WOE32DLL_H)|g' \ + -e 's/@''GNULIB_UNINORM_NFD_DLL_VARIABLE''@/$(GNULIB_UNINORM_NFD_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNINORM_NFC_DLL_VARIABLE''@/$(GNULIB_UNINORM_NFC_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNINORM_NFKD_DLL_VARIABLE''@/$(GNULIB_UNINORM_NFKD_DLL_VARIABLE)/g' \ + -e 's/@''GNULIB_UNINORM_NFKC_DLL_VARIABLE''@/$(GNULIB_UNINORM_NFKC_DLL_VARIABLE)/g' \ + $(srcdir)/uninorm.in.h > $@-t $(AM_V_at)mv $@-t $@ MOSTLYCLEANFILES += uninorm.h uninorm.h-t diff --git a/modules/uninorm/nfc b/modules/uninorm/nfc index 50ea27073e..c8696c5214 100644 --- a/modules/uninorm/nfc +++ b/modules/uninorm/nfc @@ -12,7 +12,8 @@ uninorm/composition uninorm/nfd configure.ac: -gl_LIBUNISTRING_MODULE([1.1], [uninorm/nfc]) +gl_UNINORM_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([1.1], [uninorm/nfc]) Makefile.am: if LIBUNISTRING_COMPILE_UNINORM_NFC diff --git a/modules/uninorm/nfd b/modules/uninorm/nfd index 52a8acd1e5..50f1742da7 100644 --- a/modules/uninorm/nfd +++ b/modules/uninorm/nfd @@ -10,7 +10,8 @@ uninorm/base uninorm/canonical-decomposition configure.ac: -gl_LIBUNISTRING_MODULE([1.1], [uninorm/nfd]) +gl_UNINORM_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([1.1], [uninorm/nfd]) Makefile.am: if LIBUNISTRING_COMPILE_UNINORM_NFD diff --git a/modules/uninorm/nfkc b/modules/uninorm/nfkc index a5cb12b1c6..5fe7dfc409 100644 --- a/modules/uninorm/nfkc +++ b/modules/uninorm/nfkc @@ -12,7 +12,8 @@ uninorm/composition uninorm/nfkd configure.ac: -gl_LIBUNISTRING_MODULE([1.1], [uninorm/nfkc]) +gl_UNINORM_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([1.1], [uninorm/nfkc]) Makefile.am: if LIBUNISTRING_COMPILE_UNINORM_NFKC diff --git a/modules/uninorm/nfkd b/modules/uninorm/nfkd index a367ebe9be..cbc09a254b 100644 --- a/modules/uninorm/nfkd +++ b/modules/uninorm/nfkd @@ -10,7 +10,8 @@ uninorm/base uninorm/compat-decomposition configure.ac: -gl_LIBUNISTRING_MODULE([1.1], [uninorm/nfkd]) +gl_UNINORM_H_REQUIRE_DEFAULTS +gl_LIBUNISTRING_MODULE_WITH_VARIABLE([1.1], [uninorm/nfkd]) Makefile.am: if LIBUNISTRING_COMPILE_UNINORM_NFKD |