From: Bruno Haible Date: Thu, 3 Jun 2010 22:21:14 +0000 (+0200) Subject: Don't use AC_LIBOBJ with file names in subdirectories. X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=74d509383fe30bb5511a978b52e4f8ecae37826b;p=pspp Don't use AC_LIBOBJ with file names in subdirectories. --- diff --git a/ChangeLog b/ChangeLog index ec1c80f9be..e1c5d8b8b5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2010-06-03 Bruno Haible + + Don't use AC_LIBOBJ with file names in subdirectories. + * m4/libunistring-base.m4 (gl_LIBUNISTRING_MODULE): Renamed from + gl_LIBUNISTRING_LIBSOURCE. Take a module name as argument, not a file + name. Define an automake conditional. Don't invoke AC_LIBOBJ. + * m4/libunistring.m4 (gl_LIBUNISTRING): Update AC_BEFORE invocation. + * modules/uni*/* (configure.ac): Use gl_LIBUNISTRING_MODULE instead of + gl_LIBUNISTRING_LIBSOURCE. + (Makefile.am): Augment lib_SOURCES here, conditionally. + * NEWS: Drop requirement for Automake option 'subdir-objects'. + 2010-06-03 Bruno Haible Simplify gl_LIBUNISTRING_VERSION_CMP expansion. diff --git a/NEWS b/NEWS index 64569897a7..bb94b033ba 100644 --- a/NEWS +++ b/NEWS @@ -6,9 +6,6 @@ User visible incompatible changes Date Modules Changes -2010-05-18 uni*/* The Makefile.am now needs to declare the Automake - option 'subdir-objects'. - 2010-04-02 maintainer-makefile The macro _prohibit_regexp has been revamped into a new macro _sc_search_regexp; custom syntax diff --git a/m4/libunistring-base.m4 b/m4/libunistring-base.m4 index 09165c5fc9..8335ec54c2 100644 --- a/m4/libunistring-base.m4 +++ b/m4/libunistring-base.m4 @@ -1,4 +1,4 @@ -# libunistring-base.m4 serial 4 +# libunistring-base.m4 serial 5 dnl Copyright (C) 2010 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -6,28 +6,26 @@ dnl with or without modifications, as long as this notice is preserved. dnl From Paolo Bonzini and Bruno Haible. -dnl gl_LIBUNISTRING_LIBSOURCE([VERSION], [SourceFile]) -dnl Declares that SourceFile should be compiled, unless we are linking -dnl with libunistring and its version is >= the given VERSION. -dnl SourceFile should be relative to the lib directory and end in '.c'. +dnl gl_LIBUNISTRING_MODULE([VERSION], [Module]) +dnl Declares that the source files of Module should be compiled, unless we +dnl are linking with libunistring and its version is >= the given VERSION. +dnl Defines an automake conditional LIBUNISTRING_COMPILE_$MODULE that is +dnl true if the source files of Module should be compiled. dnl This macro is to be used for public libunistring API, not for dnl undocumented API. dnl 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 SourceFile (even if SourceFile itself does not +dnl functions defined in Module (even if the sources of Module itself do not dnl change). -AC_DEFUN([gl_LIBUNISTRING_LIBSOURCE], +AC_DEFUN([gl_LIBUNISTRING_MODULE], [ AC_REQUIRE([gl_LIBUNISTRING_LIB_PREPARE]) dnl Use the variables HAVE_LIBUNISTRING, LIBUNISTRING_VERSION from dnl gl_LIBUNISTRING_CORE if that macro has been run. - if gl_LIBUNISTRING_VERSION_CMP([$1]); then - m4_foreach_w([gl_source_file], [$2], - [AC_LIBOBJ(m4_bpatsubst(m4_defn([gl_source_file]), [\.c$], [])) - ]) - fi + AM_CONDITIONAL(AS_TR_CPP([LIBUNISTRING_COMPILE_$2]), + [gl_LIBUNISTRING_VERSION_CMP([$1])]) ]) dnl gl_LIBUNISTRING_LIBHEADER([VERSION], [HeaderFile]) @@ -38,8 +36,8 @@ dnl Prepares for substituting LIBUNISTRING_HEADERFILE (to HeaderFile or empty). dnl dnl When we are linking with the already installed libunistring and its version dnl is < VERSION, we create HeaderFile here, because we may compile functions -dnl (via gl_LIBUNISTRING_LIBSOURCE above) that are not contained in the -dnl installed version. +dnl (via gl_LIBUNISTRING_MODULE above) that are not contained in the installed +dnl version. dnl When we are linking with the already installed libunistring and its version dnl is > VERSION, we don't create HeaderFile here: it could cause compilation dnl errors in other libunistring header files if some types are missing. diff --git a/m4/libunistring.m4 b/m4/libunistring.m4 index 2dfa268b9f..7e920e5d93 100644 --- a/m4/libunistring.m4 +++ b/m4/libunistring.m4 @@ -1,4 +1,4 @@ -# libunistring.m4 serial 8 +# libunistring.m4 serial 9 dnl Copyright (C) 2009-2010 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -29,7 +29,7 @@ m4_define([gl_libunistring_AC_DEFUN], [$1], [$2])]])) gl_libunistring_AC_DEFUN([gl_LIBUNISTRING], [ - AC_BEFORE([$0], [gl_LIBUNISTRING_LIBSOURCE]) + AC_BEFORE([$0], [gl_LIBUNISTRING_MODULE]) AC_BEFORE([$0], [gl_LIBUNISTRING_LIBHEADER]) AC_BEFORE([$0], [gl_LIBUNISTRING_LIB_PREPARE]) diff --git a/modules/unicase/empty-prefix-context b/modules/unicase/empty-prefix-context index 6f9bed68b6..8d793ab23e 100644 --- a/modules/unicase/empty-prefix-context +++ b/modules/unicase/empty-prefix-context @@ -8,9 +8,12 @@ Depends-on: unicase/base configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9.1], [unicase/empty-prefix-context.c]) +gl_LIBUNISTRING_MODULE([0.9.1], [unicase/empty-prefix-context]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICASE_EMPTY_PREFIX_CONTEXT +lib_SOURCES += unicase/empty-prefix-context.c +endif Include: "unicase.h" diff --git a/modules/unicase/empty-suffix-context b/modules/unicase/empty-suffix-context index 9d93cbd9f3..161ef07777 100644 --- a/modules/unicase/empty-suffix-context +++ b/modules/unicase/empty-suffix-context @@ -8,9 +8,12 @@ Depends-on: unicase/base configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9.1], [unicase/empty-suffix-context.c]) +gl_LIBUNISTRING_MODULE([0.9.1], [unicase/empty-suffix-context]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICASE_EMPTY_SUFFIX_CONTEXT +lib_SOURCES += unicase/empty-suffix-context.c +endif Include: "unicase.h" diff --git a/modules/unicase/locale-language b/modules/unicase/locale-language index da3e540d53..8b05a975a4 100644 --- a/modules/unicase/locale-language +++ b/modules/unicase/locale-language @@ -11,9 +11,12 @@ localename gperf configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9.3], [unicase/locale-language.c]) +gl_LIBUNISTRING_MODULE([0.9.3], [unicase/locale-language]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICASE_LOCALE_LANGUAGE +lib_SOURCES += unicase/locale-language.c +endif unicase/locale-languages.h: $(srcdir)/unicase/locale-languages.gperf $(GPERF) -m 10 $(srcdir)/unicase/locale-languages.gperf > $(srcdir)/unicase/locale-languages.h-t diff --git a/modules/unicase/tolower b/modules/unicase/tolower index e28ee496d6..d784e57394 100644 --- a/modules/unicase/tolower +++ b/modules/unicase/tolower @@ -10,9 +10,12 @@ Depends-on: unicase/base configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unicase/tolower.c]) +gl_LIBUNISTRING_MODULE([0.9], [unicase/tolower]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICASE_TOLOWER +lib_SOURCES += unicase/tolower.c +endif Include: "unicase.h" diff --git a/modules/unicase/totitle b/modules/unicase/totitle index 6c7640a146..deb569516f 100644 --- a/modules/unicase/totitle +++ b/modules/unicase/totitle @@ -10,9 +10,12 @@ Depends-on: unicase/base configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unicase/totitle.c]) +gl_LIBUNISTRING_MODULE([0.9], [unicase/totitle]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICASE_TOTITLE +lib_SOURCES += unicase/totitle.c +endif Include: "unicase.h" diff --git a/modules/unicase/toupper b/modules/unicase/toupper index e4fc08feed..845ebc03ea 100644 --- a/modules/unicase/toupper +++ b/modules/unicase/toupper @@ -10,9 +10,12 @@ Depends-on: unicase/base configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unicase/toupper.c]) +gl_LIBUNISTRING_MODULE([0.9], [unicase/toupper]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICASE_TOUPPER +lib_SOURCES += unicase/toupper.c +endif Include: "unicase.h" diff --git a/modules/unicase/u16-casecmp b/modules/unicase/u16-casecmp index d974d0693a..bd28d0dc17 100644 --- a/modules/unicase/u16-casecmp +++ b/modules/unicase/u16-casecmp @@ -13,9 +13,12 @@ unistr/u16-cmp2 minmax configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9.1], [unicase/u16-casecmp.c]) +gl_LIBUNISTRING_MODULE([0.9.1], [unicase/u16-casecmp]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICASE_U16_CASECMP +lib_SOURCES += unicase/u16-casecmp.c +endif Include: "unicase.h" diff --git a/modules/unicase/u16-casecoll b/modules/unicase/u16-casecoll index de7b69664c..b5f801aaa5 100644 --- a/modules/unicase/u16-casecoll +++ b/modules/unicase/u16-casecoll @@ -12,9 +12,12 @@ unicase/u16-casexfrm memcmp2 configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9.1], [unicase/u16-casecoll.c]) +gl_LIBUNISTRING_MODULE([0.9.1], [unicase/u16-casecoll]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICASE_U16_CASECOLL +lib_SOURCES += unicase/u16-casecoll.c +endif Include: "unicase.h" diff --git a/modules/unicase/u16-casefold b/modules/unicase/u16-casefold index 5e15fa447b..db48a51749 100644 --- a/modules/unicase/u16-casefold +++ b/modules/unicase/u16-casefold @@ -12,9 +12,12 @@ unicase/empty-prefix-context unicase/empty-suffix-context configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9.1], [unicase/u16-casefold.c]) +gl_LIBUNISTRING_MODULE([0.9.1], [unicase/u16-casefold]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICASE_U16_CASEFOLD +lib_SOURCES += unicase/u16-casefold.c +endif Include: "unicase.h" diff --git a/modules/unicase/u16-casexfrm b/modules/unicase/u16-casexfrm index f30954d686..78774e2a75 100644 --- a/modules/unicase/u16-casexfrm +++ b/modules/unicase/u16-casexfrm @@ -14,9 +14,12 @@ localcharset memxfrm configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9.1], [unicase/u16-casexfrm.c]) +gl_LIBUNISTRING_MODULE([0.9.1], [unicase/u16-casexfrm]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICASE_U16_CASEXFRM +lib_SOURCES += unicase/u16-casexfrm.c +endif Include: "unicase.h" diff --git a/modules/unicase/u16-ct-casefold b/modules/unicase/u16-ct-casefold index d85ec51afa..84be69daf6 100644 --- a/modules/unicase/u16-ct-casefold +++ b/modules/unicase/u16-ct-casefold @@ -15,9 +15,12 @@ uninorm/u16-normalize uninorm/nfd configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9.1], [unicase/u16-ct-casefold.c]) +gl_LIBUNISTRING_MODULE([0.9.1], [unicase/u16-ct-casefold]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICASE_U16_CT_CASEFOLD +lib_SOURCES += unicase/u16-ct-casefold.c +endif Include: "unicase.h" diff --git a/modules/unicase/u16-ct-tolower b/modules/unicase/u16-ct-tolower index 51724a4259..f040e62d6c 100644 --- a/modules/unicase/u16-ct-tolower +++ b/modules/unicase/u16-ct-tolower @@ -11,9 +11,12 @@ unicase/special-casing unicase/toupper configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9.1], [unicase/u16-ct-tolower.c]) +gl_LIBUNISTRING_MODULE([0.9.1], [unicase/u16-ct-tolower]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICASE_U16_CT_TOLOWER +lib_SOURCES += unicase/u16-ct-tolower.c +endif Include: "unicase.h" diff --git a/modules/unicase/u16-ct-totitle b/modules/unicase/u16-ct-totitle index 6d02d18670..0ba83feac1 100644 --- a/modules/unicase/u16-ct-totitle +++ b/modules/unicase/u16-ct-totitle @@ -23,9 +23,12 @@ uninorm/u16-normalize stdbool configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9.1], [unicase/u16-ct-totitle.c]) +gl_LIBUNISTRING_MODULE([0.9.1], [unicase/u16-ct-totitle]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICASE_U16_CT_TOTITLE +lib_SOURCES += unicase/u16-ct-totitle.c +endif Include: "unicase.h" diff --git a/modules/unicase/u16-ct-toupper b/modules/unicase/u16-ct-toupper index f513a58707..c39dd8538a 100644 --- a/modules/unicase/u16-ct-toupper +++ b/modules/unicase/u16-ct-toupper @@ -11,9 +11,12 @@ unicase/special-casing unicase/toupper configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9.1], [unicase/u16-ct-toupper.c]) +gl_LIBUNISTRING_MODULE([0.9.1], [unicase/u16-ct-toupper]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICASE_U16_CT_TOUPPER +lib_SOURCES += unicase/u16-ct-toupper.c +endif Include: "unicase.h" diff --git a/modules/unicase/u16-is-cased b/modules/unicase/u16-is-cased index fd3921ed38..f5aa7bbf77 100644 --- a/modules/unicase/u16-is-cased +++ b/modules/unicase/u16-is-cased @@ -15,9 +15,12 @@ uninorm/nfd unistr/u16-cmp configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9.1], [unicase/u16-is-cased.c]) +gl_LIBUNISTRING_MODULE([0.9.1], [unicase/u16-is-cased]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICASE_U16_IS_CASED +lib_SOURCES += unicase/u16-is-cased.c +endif Include: "unicase.h" diff --git a/modules/unicase/u16-is-casefolded b/modules/unicase/u16-is-casefolded index 6471a9a578..d3959ecaa3 100644 --- a/modules/unicase/u16-is-casefolded +++ b/modules/unicase/u16-is-casefolded @@ -10,9 +10,12 @@ unicase/u16-is-invariant unicase/u16-casefold configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9.1], [unicase/u16-is-casefolded.c]) +gl_LIBUNISTRING_MODULE([0.9.1], [unicase/u16-is-casefolded]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICASE_U16_IS_CASEFOLDED +lib_SOURCES += unicase/u16-is-casefolded.c +endif Include: "unicase.h" diff --git a/modules/unicase/u16-is-lowercase b/modules/unicase/u16-is-lowercase index 62481a08a3..43f1dfdd6f 100644 --- a/modules/unicase/u16-is-lowercase +++ b/modules/unicase/u16-is-lowercase @@ -10,9 +10,12 @@ unicase/u16-is-invariant unicase/u16-tolower configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9.1], [unicase/u16-is-lowercase.c]) +gl_LIBUNISTRING_MODULE([0.9.1], [unicase/u16-is-lowercase]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICASE_U16_IS_LOWERCASE +lib_SOURCES += unicase/u16-is-lowercase.c +endif Include: "unicase.h" diff --git a/modules/unicase/u16-is-titlecase b/modules/unicase/u16-is-titlecase index 6501c233b5..cdfb764955 100644 --- a/modules/unicase/u16-is-titlecase +++ b/modules/unicase/u16-is-titlecase @@ -10,9 +10,12 @@ unicase/u16-is-invariant unicase/u16-totitle configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9.1], [unicase/u16-is-titlecase.c]) +gl_LIBUNISTRING_MODULE([0.9.1], [unicase/u16-is-titlecase]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICASE_U16_IS_TITLECASE +lib_SOURCES += unicase/u16-is-titlecase.c +endif Include: "unicase.h" diff --git a/modules/unicase/u16-is-uppercase b/modules/unicase/u16-is-uppercase index aa4995e161..ee94f8c33a 100644 --- a/modules/unicase/u16-is-uppercase +++ b/modules/unicase/u16-is-uppercase @@ -10,9 +10,12 @@ unicase/u16-is-invariant unicase/u16-toupper configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9.1], [unicase/u16-is-uppercase.c]) +gl_LIBUNISTRING_MODULE([0.9.1], [unicase/u16-is-uppercase]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICASE_U16_IS_UPPERCASE +lib_SOURCES += unicase/u16-is-uppercase.c +endif Include: "unicase.h" diff --git a/modules/unicase/u16-prefix-context b/modules/unicase/u16-prefix-context index 3f7b6d1a1a..268359cfcf 100644 --- a/modules/unicase/u16-prefix-context +++ b/modules/unicase/u16-prefix-context @@ -15,9 +15,12 @@ unistr/u16-mbtouc-unsafe unistr/u16-prev configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9.1], [unicase/u16-prefix-context.c]) +gl_LIBUNISTRING_MODULE([0.9.1], [unicase/u16-prefix-context]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICASE_U16_PREFIX_CONTEXT +lib_SOURCES += unicase/u16-prefix-context.c +endif Include: "unicase.h" diff --git a/modules/unicase/u16-suffix-context b/modules/unicase/u16-suffix-context index 18c43c7c11..77922658b3 100644 --- a/modules/unicase/u16-suffix-context +++ b/modules/unicase/u16-suffix-context @@ -14,9 +14,12 @@ unictype/combining-class unistr/u16-mbtouc-unsafe configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9.1], [unicase/u16-suffix-context.c]) +gl_LIBUNISTRING_MODULE([0.9.1], [unicase/u16-suffix-context]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICASE_U16_SUFFIX_CONTEXT +lib_SOURCES += unicase/u16-suffix-context.c +endif Include: "unicase.h" diff --git a/modules/unicase/u16-tolower b/modules/unicase/u16-tolower index d926f8af08..46b3f27747 100644 --- a/modules/unicase/u16-tolower +++ b/modules/unicase/u16-tolower @@ -13,9 +13,12 @@ unicase/empty-suffix-context unicase/tolower configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9.1], [unicase/u16-tolower.c]) +gl_LIBUNISTRING_MODULE([0.9.1], [unicase/u16-tolower]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICASE_U16_TOLOWER +lib_SOURCES += unicase/u16-tolower.c +endif Include: "unicase.h" diff --git a/modules/unicase/u16-totitle b/modules/unicase/u16-totitle index f6cbda5689..fb419f7f63 100644 --- a/modules/unicase/u16-totitle +++ b/modules/unicase/u16-totitle @@ -12,9 +12,12 @@ unicase/empty-prefix-context unicase/empty-suffix-context configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9.1], [unicase/u16-totitle.c]) +gl_LIBUNISTRING_MODULE([0.9.1], [unicase/u16-totitle]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICASE_U16_TOTITLE +lib_SOURCES += unicase/u16-totitle.c +endif Include: "unicase.h" diff --git a/modules/unicase/u16-toupper b/modules/unicase/u16-toupper index de6d2a52b5..87d9b2dcbf 100644 --- a/modules/unicase/u16-toupper +++ b/modules/unicase/u16-toupper @@ -13,9 +13,12 @@ unicase/empty-suffix-context unicase/toupper configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9.1], [unicase/u16-toupper.c]) +gl_LIBUNISTRING_MODULE([0.9.1], [unicase/u16-toupper]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICASE_U16_TOUPPER +lib_SOURCES += unicase/u16-toupper.c +endif Include: "unicase.h" diff --git a/modules/unicase/u32-casecmp b/modules/unicase/u32-casecmp index cbc620f91c..2be817f02c 100644 --- a/modules/unicase/u32-casecmp +++ b/modules/unicase/u32-casecmp @@ -13,9 +13,12 @@ unistr/u32-cmp2 minmax configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9.1], [unicase/u32-casecmp.c]) +gl_LIBUNISTRING_MODULE([0.9.1], [unicase/u32-casecmp]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICASE_U32_CASECMP +lib_SOURCES += unicase/u32-casecmp.c +endif Include: "unicase.h" diff --git a/modules/unicase/u32-casecoll b/modules/unicase/u32-casecoll index 5e67f3505e..9400197360 100644 --- a/modules/unicase/u32-casecoll +++ b/modules/unicase/u32-casecoll @@ -12,9 +12,12 @@ unicase/u32-casexfrm memcmp2 configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9.1], [unicase/u32-casecoll.c]) +gl_LIBUNISTRING_MODULE([0.9.1], [unicase/u32-casecoll]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICASE_U32_CASECOLL +lib_SOURCES += unicase/u32-casecoll.c +endif Include: "unicase.h" diff --git a/modules/unicase/u32-casefold b/modules/unicase/u32-casefold index e753e5047e..ca2e6551d3 100644 --- a/modules/unicase/u32-casefold +++ b/modules/unicase/u32-casefold @@ -12,9 +12,12 @@ unicase/empty-prefix-context unicase/empty-suffix-context configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9.1], [unicase/u32-casefold.c]) +gl_LIBUNISTRING_MODULE([0.9.1], [unicase/u32-casefold]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICASE_U32_CASEFOLD +lib_SOURCES += unicase/u32-casefold.c +endif Include: "unicase.h" diff --git a/modules/unicase/u32-casexfrm b/modules/unicase/u32-casexfrm index b206ad9a7a..6fb660eab5 100644 --- a/modules/unicase/u32-casexfrm +++ b/modules/unicase/u32-casexfrm @@ -14,9 +14,12 @@ localcharset memxfrm configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9.1], [unicase/u32-casexfrm.c]) +gl_LIBUNISTRING_MODULE([0.9.1], [unicase/u32-casexfrm]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICASE_U32_CASEXFRM +lib_SOURCES += unicase/u32-casexfrm.c +endif Include: "unicase.h" diff --git a/modules/unicase/u32-ct-casefold b/modules/unicase/u32-ct-casefold index e2931f6ff9..805cfdc271 100644 --- a/modules/unicase/u32-ct-casefold +++ b/modules/unicase/u32-ct-casefold @@ -15,9 +15,12 @@ uninorm/u32-normalize uninorm/nfd configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9.1], [unicase/u32-ct-casefold.c]) +gl_LIBUNISTRING_MODULE([0.9.1], [unicase/u32-ct-casefold]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICASE_U32_CT_CASEFOLD +lib_SOURCES += unicase/u32-ct-casefold.c +endif Include: "unicase.h" diff --git a/modules/unicase/u32-ct-tolower b/modules/unicase/u32-ct-tolower index cfd7f34a01..e54127cf7c 100644 --- a/modules/unicase/u32-ct-tolower +++ b/modules/unicase/u32-ct-tolower @@ -11,9 +11,12 @@ unicase/special-casing unicase/toupper configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9.1], [unicase/u32-ct-tolower.c]) +gl_LIBUNISTRING_MODULE([0.9.1], [unicase/u32-ct-tolower]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICASE_U32_CT_TOLOWER +lib_SOURCES += unicase/u32-ct-tolower.c +endif Include: "unicase.h" diff --git a/modules/unicase/u32-ct-totitle b/modules/unicase/u32-ct-totitle index 1c665ac890..9f77a96bd8 100644 --- a/modules/unicase/u32-ct-totitle +++ b/modules/unicase/u32-ct-totitle @@ -23,9 +23,12 @@ uninorm/u32-normalize stdbool configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9.1], [unicase/u32-ct-totitle.c]) +gl_LIBUNISTRING_MODULE([0.9.1], [unicase/u32-ct-totitle]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICASE_U32_CT_TOTITLE +lib_SOURCES += unicase/u32-ct-totitle.c +endif Include: "unicase.h" diff --git a/modules/unicase/u32-ct-toupper b/modules/unicase/u32-ct-toupper index b76397a6f5..c6d0055831 100644 --- a/modules/unicase/u32-ct-toupper +++ b/modules/unicase/u32-ct-toupper @@ -11,9 +11,12 @@ unicase/special-casing unicase/toupper configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9.1], [unicase/u32-ct-toupper.c]) +gl_LIBUNISTRING_MODULE([0.9.1], [unicase/u32-ct-toupper]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICASE_U32_CT_TOUPPER +lib_SOURCES += unicase/u32-ct-toupper.c +endif Include: "unicase.h" diff --git a/modules/unicase/u32-is-cased b/modules/unicase/u32-is-cased index d57777b694..6ae6ecb60c 100644 --- a/modules/unicase/u32-is-cased +++ b/modules/unicase/u32-is-cased @@ -15,9 +15,12 @@ uninorm/nfd unistr/u32-cmp configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9.1], [unicase/u32-is-cased.c]) +gl_LIBUNISTRING_MODULE([0.9.1], [unicase/u32-is-cased]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICASE_U32_IS_CASED +lib_SOURCES += unicase/u32-is-cased.c +endif Include: "unicase.h" diff --git a/modules/unicase/u32-is-casefolded b/modules/unicase/u32-is-casefolded index 7f59a81173..cbe0ba339d 100644 --- a/modules/unicase/u32-is-casefolded +++ b/modules/unicase/u32-is-casefolded @@ -10,9 +10,12 @@ unicase/u32-is-invariant unicase/u32-casefold configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9.1], [unicase/u32-is-casefolded.c]) +gl_LIBUNISTRING_MODULE([0.9.1], [unicase/u32-is-casefolded]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICASE_U32_IS_CASEFOLDED +lib_SOURCES += unicase/u32-is-casefolded.c +endif Include: "unicase.h" diff --git a/modules/unicase/u32-is-lowercase b/modules/unicase/u32-is-lowercase index f459e38f12..bd568b0093 100644 --- a/modules/unicase/u32-is-lowercase +++ b/modules/unicase/u32-is-lowercase @@ -10,9 +10,12 @@ unicase/u32-is-invariant unicase/u32-tolower configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9.1], [unicase/u32-is-lowercase.c]) +gl_LIBUNISTRING_MODULE([0.9.1], [unicase/u32-is-lowercase]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICASE_U32_IS_LOWERCASE +lib_SOURCES += unicase/u32-is-lowercase.c +endif Include: "unicase.h" diff --git a/modules/unicase/u32-is-titlecase b/modules/unicase/u32-is-titlecase index df841b24cd..54d0e5c622 100644 --- a/modules/unicase/u32-is-titlecase +++ b/modules/unicase/u32-is-titlecase @@ -10,9 +10,12 @@ unicase/u32-is-invariant unicase/u32-totitle configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9.1], [unicase/u32-is-titlecase.c]) +gl_LIBUNISTRING_MODULE([0.9.1], [unicase/u32-is-titlecase]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICASE_U32_IS_TITLECASE +lib_SOURCES += unicase/u32-is-titlecase.c +endif Include: "unicase.h" diff --git a/modules/unicase/u32-is-uppercase b/modules/unicase/u32-is-uppercase index 5b6215c644..8586ee861b 100644 --- a/modules/unicase/u32-is-uppercase +++ b/modules/unicase/u32-is-uppercase @@ -10,9 +10,12 @@ unicase/u32-is-invariant unicase/u32-toupper configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9.1], [unicase/u32-is-uppercase.c]) +gl_LIBUNISTRING_MODULE([0.9.1], [unicase/u32-is-uppercase]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICASE_U32_IS_UPPERCASE +lib_SOURCES += unicase/u32-is-uppercase.c +endif Include: "unicase.h" diff --git a/modules/unicase/u32-prefix-context b/modules/unicase/u32-prefix-context index 5b3e3e4615..2532a14480 100644 --- a/modules/unicase/u32-prefix-context +++ b/modules/unicase/u32-prefix-context @@ -15,9 +15,12 @@ unistr/u32-mbtouc-unsafe unistr/u32-prev configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9.1], [unicase/u32-prefix-context.c]) +gl_LIBUNISTRING_MODULE([0.9.1], [unicase/u32-prefix-context]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICASE_U32_PREFIX_CONTEXT +lib_SOURCES += unicase/u32-prefix-context.c +endif Include: "unicase.h" diff --git a/modules/unicase/u32-suffix-context b/modules/unicase/u32-suffix-context index 221f3982e8..7385db994d 100644 --- a/modules/unicase/u32-suffix-context +++ b/modules/unicase/u32-suffix-context @@ -14,9 +14,12 @@ unictype/combining-class unistr/u32-mbtouc-unsafe configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9.1], [unicase/u32-suffix-context.c]) +gl_LIBUNISTRING_MODULE([0.9.1], [unicase/u32-suffix-context]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICASE_U32_SUFFIX_CONTEXT +lib_SOURCES += unicase/u32-suffix-context.c +endif Include: "unicase.h" diff --git a/modules/unicase/u32-tolower b/modules/unicase/u32-tolower index dc27375af7..262d4757e7 100644 --- a/modules/unicase/u32-tolower +++ b/modules/unicase/u32-tolower @@ -13,9 +13,12 @@ unicase/empty-suffix-context unicase/tolower configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9.1], [unicase/u32-tolower.c]) +gl_LIBUNISTRING_MODULE([0.9.1], [unicase/u32-tolower]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICASE_U32_TOLOWER +lib_SOURCES += unicase/u32-tolower.c +endif Include: "unicase.h" diff --git a/modules/unicase/u32-totitle b/modules/unicase/u32-totitle index 0e41340c89..9f96f6c7dc 100644 --- a/modules/unicase/u32-totitle +++ b/modules/unicase/u32-totitle @@ -12,9 +12,12 @@ unicase/empty-prefix-context unicase/empty-suffix-context configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9.1], [unicase/u32-totitle.c]) +gl_LIBUNISTRING_MODULE([0.9.1], [unicase/u32-totitle]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICASE_U32_TOTITLE +lib_SOURCES += unicase/u32-totitle.c +endif Include: "unicase.h" diff --git a/modules/unicase/u32-toupper b/modules/unicase/u32-toupper index 009e094656..8a5d8ac90f 100644 --- a/modules/unicase/u32-toupper +++ b/modules/unicase/u32-toupper @@ -13,9 +13,12 @@ unicase/empty-suffix-context unicase/toupper configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9.1], [unicase/u32-toupper.c]) +gl_LIBUNISTRING_MODULE([0.9.1], [unicase/u32-toupper]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICASE_U32_TOUPPER +lib_SOURCES += unicase/u32-toupper.c +endif Include: "unicase.h" diff --git a/modules/unicase/u8-casecmp b/modules/unicase/u8-casecmp index 28dc0cb1a2..86598c7a1a 100644 --- a/modules/unicase/u8-casecmp +++ b/modules/unicase/u8-casecmp @@ -13,9 +13,12 @@ unistr/u8-cmp2 minmax configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9.1], [unicase/u8-casecmp.c]) +gl_LIBUNISTRING_MODULE([0.9.1], [unicase/u8-casecmp]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICASE_U8_CASECMP +lib_SOURCES += unicase/u8-casecmp.c +endif Include: "unicase.h" diff --git a/modules/unicase/u8-casecoll b/modules/unicase/u8-casecoll index 8d69a24886..8209fc3a59 100644 --- a/modules/unicase/u8-casecoll +++ b/modules/unicase/u8-casecoll @@ -12,9 +12,12 @@ unicase/u8-casexfrm memcmp2 configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9.1], [unicase/u8-casecoll.c]) +gl_LIBUNISTRING_MODULE([0.9.1], [unicase/u8-casecoll]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICASE_U8_CASECOLL +lib_SOURCES += unicase/u8-casecoll.c +endif Include: "unicase.h" diff --git a/modules/unicase/u8-casefold b/modules/unicase/u8-casefold index 76740d337d..b9b24ff036 100644 --- a/modules/unicase/u8-casefold +++ b/modules/unicase/u8-casefold @@ -12,9 +12,12 @@ unicase/empty-prefix-context unicase/empty-suffix-context configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9.1], [unicase/u8-casefold.c]) +gl_LIBUNISTRING_MODULE([0.9.1], [unicase/u8-casefold]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICASE_U8_CASEFOLD +lib_SOURCES += unicase/u8-casefold.c +endif Include: "unicase.h" diff --git a/modules/unicase/u8-casexfrm b/modules/unicase/u8-casexfrm index c8f62fecbc..968dd59be0 100644 --- a/modules/unicase/u8-casexfrm +++ b/modules/unicase/u8-casexfrm @@ -14,9 +14,12 @@ localcharset memxfrm configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9.1], [unicase/u8-casexfrm.c]) +gl_LIBUNISTRING_MODULE([0.9.1], [unicase/u8-casexfrm]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICASE_U8_CASEXFRM +lib_SOURCES += unicase/u8-casexfrm.c +endif Include: "unicase.h" diff --git a/modules/unicase/u8-ct-casefold b/modules/unicase/u8-ct-casefold index e4b2d44dc8..b25bee4326 100644 --- a/modules/unicase/u8-ct-casefold +++ b/modules/unicase/u8-ct-casefold @@ -15,9 +15,12 @@ uninorm/u8-normalize uninorm/nfd configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9.1], [unicase/u8-ct-casefold.c]) +gl_LIBUNISTRING_MODULE([0.9.1], [unicase/u8-ct-casefold]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICASE_U8_CT_CASEFOLD +lib_SOURCES += unicase/u8-ct-casefold.c +endif Include: "unicase.h" diff --git a/modules/unicase/u8-ct-tolower b/modules/unicase/u8-ct-tolower index 609bb27fad..0e1973bd08 100644 --- a/modules/unicase/u8-ct-tolower +++ b/modules/unicase/u8-ct-tolower @@ -11,9 +11,12 @@ unicase/special-casing unicase/toupper configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9.1], [unicase/u8-ct-tolower.c]) +gl_LIBUNISTRING_MODULE([0.9.1], [unicase/u8-ct-tolower]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICASE_U8_CT_TOLOWER +lib_SOURCES += unicase/u8-ct-tolower.c +endif Include: "unicase.h" diff --git a/modules/unicase/u8-ct-totitle b/modules/unicase/u8-ct-totitle index b0618a9e30..af95f369b0 100644 --- a/modules/unicase/u8-ct-totitle +++ b/modules/unicase/u8-ct-totitle @@ -23,9 +23,12 @@ uninorm/u8-normalize stdbool configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9.1], [unicase/u8-ct-totitle.c]) +gl_LIBUNISTRING_MODULE([0.9.1], [unicase/u8-ct-totitle]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICASE_U8_CT_TOTITLE +lib_SOURCES += unicase/u8-ct-totitle.c +endif Include: "unicase.h" diff --git a/modules/unicase/u8-ct-toupper b/modules/unicase/u8-ct-toupper index 23134f7874..0c30749cb7 100644 --- a/modules/unicase/u8-ct-toupper +++ b/modules/unicase/u8-ct-toupper @@ -11,9 +11,12 @@ unicase/special-casing unicase/toupper configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9.1], [unicase/u8-ct-toupper.c]) +gl_LIBUNISTRING_MODULE([0.9.1], [unicase/u8-ct-toupper]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICASE_U8_CT_TOUPPER +lib_SOURCES += unicase/u8-ct-toupper.c +endif Include: "unicase.h" diff --git a/modules/unicase/u8-is-cased b/modules/unicase/u8-is-cased index 8da54865fb..db7ee23e20 100644 --- a/modules/unicase/u8-is-cased +++ b/modules/unicase/u8-is-cased @@ -15,9 +15,12 @@ uninorm/nfd unistr/u8-cmp configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9.1], [unicase/u8-is-cased.c]) +gl_LIBUNISTRING_MODULE([0.9.1], [unicase/u8-is-cased]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICASE_U8_IS_CASED +lib_SOURCES += unicase/u8-is-cased.c +endif Include: "unicase.h" diff --git a/modules/unicase/u8-is-casefolded b/modules/unicase/u8-is-casefolded index 32bcc509d6..80773ba0d9 100644 --- a/modules/unicase/u8-is-casefolded +++ b/modules/unicase/u8-is-casefolded @@ -10,9 +10,12 @@ unicase/u8-is-invariant unicase/u8-casefold configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9.1], [unicase/u8-is-casefolded.c]) +gl_LIBUNISTRING_MODULE([0.9.1], [unicase/u8-is-casefolded]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICASE_U8_IS_CASEFOLDED +lib_SOURCES += unicase/u8-is-casefolded.c +endif Include: "unicase.h" diff --git a/modules/unicase/u8-is-lowercase b/modules/unicase/u8-is-lowercase index 2c385630a7..7cd53de26e 100644 --- a/modules/unicase/u8-is-lowercase +++ b/modules/unicase/u8-is-lowercase @@ -10,9 +10,12 @@ unicase/u8-is-invariant unicase/u8-tolower configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9.1], [unicase/u8-is-lowercase.c]) +gl_LIBUNISTRING_MODULE([0.9.1], [unicase/u8-is-lowercase]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICASE_U8_IS_LOWERCASE +lib_SOURCES += unicase/u8-is-lowercase.c +endif Include: "unicase.h" diff --git a/modules/unicase/u8-is-titlecase b/modules/unicase/u8-is-titlecase index 1043f15518..299b9fb39a 100644 --- a/modules/unicase/u8-is-titlecase +++ b/modules/unicase/u8-is-titlecase @@ -10,9 +10,12 @@ unicase/u8-is-invariant unicase/u8-totitle configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9.1], [unicase/u8-is-titlecase.c]) +gl_LIBUNISTRING_MODULE([0.9.1], [unicase/u8-is-titlecase]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICASE_U8_IS_TITLECASE +lib_SOURCES += unicase/u8-is-titlecase.c +endif Include: "unicase.h" diff --git a/modules/unicase/u8-is-uppercase b/modules/unicase/u8-is-uppercase index 1e4198e38e..4e40a5a9e5 100644 --- a/modules/unicase/u8-is-uppercase +++ b/modules/unicase/u8-is-uppercase @@ -10,9 +10,12 @@ unicase/u8-is-invariant unicase/u8-toupper configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9.1], [unicase/u8-is-uppercase.c]) +gl_LIBUNISTRING_MODULE([0.9.1], [unicase/u8-is-uppercase]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICASE_U8_IS_UPPERCASE +lib_SOURCES += unicase/u8-is-uppercase.c +endif Include: "unicase.h" diff --git a/modules/unicase/u8-prefix-context b/modules/unicase/u8-prefix-context index 21b17e95c8..94eea78727 100644 --- a/modules/unicase/u8-prefix-context +++ b/modules/unicase/u8-prefix-context @@ -15,9 +15,12 @@ unistr/u8-mbtouc-unsafe unistr/u8-prev configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9.1], [unicase/u8-prefix-context.c]) +gl_LIBUNISTRING_MODULE([0.9.1], [unicase/u8-prefix-context]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICASE_U8_PREFIX_CONTEXT +lib_SOURCES += unicase/u8-prefix-context.c +endif Include: "unicase.h" diff --git a/modules/unicase/u8-suffix-context b/modules/unicase/u8-suffix-context index 30a4f0abef..2ee7422c77 100644 --- a/modules/unicase/u8-suffix-context +++ b/modules/unicase/u8-suffix-context @@ -14,9 +14,12 @@ unictype/combining-class unistr/u8-mbtouc-unsafe configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9.1], [unicase/u8-suffix-context.c]) +gl_LIBUNISTRING_MODULE([0.9.1], [unicase/u8-suffix-context]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICASE_U8_SUFFIX_CONTEXT +lib_SOURCES += unicase/u8-suffix-context.c +endif Include: "unicase.h" diff --git a/modules/unicase/u8-tolower b/modules/unicase/u8-tolower index 22f3e224a1..12458e7ca2 100644 --- a/modules/unicase/u8-tolower +++ b/modules/unicase/u8-tolower @@ -13,9 +13,12 @@ unicase/empty-suffix-context unicase/tolower configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9.1], [unicase/u8-tolower.c]) +gl_LIBUNISTRING_MODULE([0.9.1], [unicase/u8-tolower]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICASE_U8_TOLOWER +lib_SOURCES += unicase/u8-tolower.c +endif Include: "unicase.h" diff --git a/modules/unicase/u8-totitle b/modules/unicase/u8-totitle index c238999ca2..49d9965bc6 100644 --- a/modules/unicase/u8-totitle +++ b/modules/unicase/u8-totitle @@ -12,9 +12,12 @@ unicase/empty-prefix-context unicase/empty-suffix-context configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9.1], [unicase/u8-totitle.c]) +gl_LIBUNISTRING_MODULE([0.9.1], [unicase/u8-totitle]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICASE_U8_TOTITLE +lib_SOURCES += unicase/u8-totitle.c +endif Include: "unicase.h" diff --git a/modules/unicase/u8-toupper b/modules/unicase/u8-toupper index 64cb010760..300f39f027 100644 --- a/modules/unicase/u8-toupper +++ b/modules/unicase/u8-toupper @@ -13,9 +13,12 @@ unicase/empty-suffix-context unicase/toupper configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9.1], [unicase/u8-toupper.c]) +gl_LIBUNISTRING_MODULE([0.9.1], [unicase/u8-toupper]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICASE_U8_TOUPPER +lib_SOURCES += unicase/u8-toupper.c +endif Include: "unicase.h" diff --git a/modules/unicase/ulc-casecmp b/modules/unicase/ulc-casecmp index dc8b0a55e1..58d0c5708d 100644 --- a/modules/unicase/ulc-casecmp +++ b/modules/unicase/ulc-casecmp @@ -15,9 +15,12 @@ localcharset minmax configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9.1], [unicase/ulc-casecmp.c]) +gl_LIBUNISTRING_MODULE([0.9.1], [unicase/ulc-casecmp]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICASE_ULC_CASECMP +lib_SOURCES += unicase/ulc-casecmp.c +endif Include: "unicase.h" diff --git a/modules/unicase/ulc-casecoll b/modules/unicase/ulc-casecoll index 48c64b808c..b3c04ae446 100644 --- a/modules/unicase/ulc-casecoll +++ b/modules/unicase/ulc-casecoll @@ -11,9 +11,12 @@ unicase/ulc-casexfrm memcmp2 configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9.1], [unicase/ulc-casecoll.c]) +gl_LIBUNISTRING_MODULE([0.9.1], [unicase/ulc-casecoll]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICASE_ULC_CASECOLL +lib_SOURCES += unicase/ulc-casecoll.c +endif Include: "unicase.h" diff --git a/modules/unicase/ulc-casexfrm b/modules/unicase/ulc-casexfrm index aa7036d0ad..0a8cccfd8a 100644 --- a/modules/unicase/ulc-casexfrm +++ b/modules/unicase/ulc-casexfrm @@ -11,9 +11,12 @@ uniconv/u8-conv-from-enc localcharset configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9.1], [unicase/ulc-casexfrm.c]) +gl_LIBUNISTRING_MODULE([0.9.1], [unicase/ulc-casexfrm]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICASE_ULC_CASEXFRM +lib_SOURCES += unicase/ulc-casexfrm.c +endif Include: "unicase.h" diff --git a/modules/uniconv/u16-conv-from-enc b/modules/uniconv/u16-conv-from-enc index 869428514d..ca84ed97cf 100644 --- a/modules/uniconv/u16-conv-from-enc +++ b/modules/uniconv/u16-conv-from-enc @@ -15,9 +15,12 @@ unistr/u16-mblen configure.ac: AC_REQUIRE([gl_BIGENDIAN]) -gl_LIBUNISTRING_LIBSOURCE([0.9], [uniconv/u16-conv-from-enc.c]) +gl_LIBUNISTRING_MODULE([0.9], [uniconv/u16-conv-from-enc]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICONV_U16_CONV_FROM_ENC +lib_SOURCES += uniconv/u16-conv-from-enc.c +endif Include: "uniconv.h" diff --git a/modules/uniconv/u16-conv-to-enc b/modules/uniconv/u16-conv-to-enc index 9854682cd4..287076f72f 100644 --- a/modules/uniconv/u16-conv-to-enc +++ b/modules/uniconv/u16-conv-to-enc @@ -16,9 +16,12 @@ unistr/u8-mblen configure.ac: AC_REQUIRE([gl_BIGENDIAN]) -gl_LIBUNISTRING_LIBSOURCE([0.9], [uniconv/u16-conv-to-enc.c]) +gl_LIBUNISTRING_MODULE([0.9], [uniconv/u16-conv-to-enc]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICONV_U16_CONV_TO_ENC +lib_SOURCES += uniconv/u16-conv-to-enc.c +endif Include: "uniconv.h" diff --git a/modules/uniconv/u16-strconv-from-enc b/modules/uniconv/u16-strconv-from-enc index 5dcba745c0..b6c1520df4 100644 --- a/modules/uniconv/u16-strconv-from-enc +++ b/modules/uniconv/u16-strconv-from-enc @@ -11,9 +11,12 @@ uniconv/u16-conv-from-enc unistr/u16-strlen configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [uniconv/u16-strconv-from-enc.c]) +gl_LIBUNISTRING_MODULE([0.9], [uniconv/u16-strconv-from-enc]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICONV_U16_STRCONV_FROM_ENC +lib_SOURCES += uniconv/u16-strconv-from-enc.c +endif Include: "uniconv.h" diff --git a/modules/uniconv/u16-strconv-from-locale b/modules/uniconv/u16-strconv-from-locale index 4239f50efc..e6b060e0a7 100644 --- a/modules/uniconv/u16-strconv-from-locale +++ b/modules/uniconv/u16-strconv-from-locale @@ -10,9 +10,12 @@ uniconv/u16-strconv-from-enc localcharset configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [uniconv/u16-strconv-from-locale.c]) +gl_LIBUNISTRING_MODULE([0.9], [uniconv/u16-strconv-from-locale]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICONV_U16_STRCONV_FROM_LOCALE +lib_SOURCES += uniconv/u16-strconv-from-locale.c +endif Include: "uniconv.h" diff --git a/modules/uniconv/u16-strconv-to-enc b/modules/uniconv/u16-strconv-to-enc index 354f095e04..d4805590d7 100644 --- a/modules/uniconv/u16-strconv-to-enc +++ b/modules/uniconv/u16-strconv-to-enc @@ -14,9 +14,12 @@ unistr/u16-strlen configure.ac: AC_REQUIRE([gl_BIGENDIAN]) -gl_LIBUNISTRING_LIBSOURCE([0.9], [uniconv/u16-strconv-to-enc.c]) +gl_LIBUNISTRING_MODULE([0.9], [uniconv/u16-strconv-to-enc]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICONV_U16_STRCONV_TO_ENC +lib_SOURCES += uniconv/u16-strconv-to-enc.c +endif Include: "uniconv.h" diff --git a/modules/uniconv/u16-strconv-to-locale b/modules/uniconv/u16-strconv-to-locale index 22845de1db..12fd3c48e8 100644 --- a/modules/uniconv/u16-strconv-to-locale +++ b/modules/uniconv/u16-strconv-to-locale @@ -10,9 +10,12 @@ uniconv/u16-strconv-to-enc localcharset configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [uniconv/u16-strconv-to-locale.c]) +gl_LIBUNISTRING_MODULE([0.9], [uniconv/u16-strconv-to-locale]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICONV_U16_STRCONV_TO_LOCALE +lib_SOURCES += uniconv/u16-strconv-to-locale.c +endif Include: "uniconv.h" diff --git a/modules/uniconv/u32-conv-from-enc b/modules/uniconv/u32-conv-from-enc index a3fb5ec0e2..d72e7c29b3 100644 --- a/modules/uniconv/u32-conv-from-enc +++ b/modules/uniconv/u32-conv-from-enc @@ -14,9 +14,12 @@ unistr/u8-mblen unistr/u32-mblen configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [uniconv/u32-conv-from-enc.c]) +gl_LIBUNISTRING_MODULE([0.9], [uniconv/u32-conv-from-enc]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICONV_U32_CONV_FROM_ENC +lib_SOURCES += uniconv/u32-conv-from-enc.c +endif Include: "uniconv.h" diff --git a/modules/uniconv/u32-conv-to-enc b/modules/uniconv/u32-conv-to-enc index 465fae4113..8aa6b09b0d 100644 --- a/modules/uniconv/u32-conv-to-enc +++ b/modules/uniconv/u32-conv-to-enc @@ -14,9 +14,12 @@ unistr/u32-mblen unistr/u8-mblen configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [uniconv/u32-conv-to-enc.c]) +gl_LIBUNISTRING_MODULE([0.9], [uniconv/u32-conv-to-enc]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICONV_U32_CONV_TO_ENC +lib_SOURCES += uniconv/u32-conv-to-enc.c +endif Include: "uniconv.h" diff --git a/modules/uniconv/u32-strconv-from-enc b/modules/uniconv/u32-strconv-from-enc index fd0117113e..7c2846d1f9 100644 --- a/modules/uniconv/u32-strconv-from-enc +++ b/modules/uniconv/u32-strconv-from-enc @@ -11,9 +11,12 @@ uniconv/u32-conv-from-enc unistr/u32-strlen configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [uniconv/u32-strconv-from-enc.c]) +gl_LIBUNISTRING_MODULE([0.9], [uniconv/u32-strconv-from-enc]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICONV_U32_STRCONV_FROM_ENC +lib_SOURCES += uniconv/u32-strconv-from-enc.c +endif Include: "uniconv.h" diff --git a/modules/uniconv/u32-strconv-from-locale b/modules/uniconv/u32-strconv-from-locale index e8e28bb11f..e05dbed77d 100644 --- a/modules/uniconv/u32-strconv-from-locale +++ b/modules/uniconv/u32-strconv-from-locale @@ -10,9 +10,12 @@ uniconv/u32-strconv-from-enc localcharset configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [uniconv/u32-strconv-from-locale.c]) +gl_LIBUNISTRING_MODULE([0.9], [uniconv/u32-strconv-from-locale]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICONV_U32_STRCONV_FROM_LOCALE +lib_SOURCES += uniconv/u32-strconv-from-locale.c +endif Include: "uniconv.h" diff --git a/modules/uniconv/u32-strconv-to-enc b/modules/uniconv/u32-strconv-to-enc index 1a0c5f39bd..e83477e8cb 100644 --- a/modules/uniconv/u32-strconv-to-enc +++ b/modules/uniconv/u32-strconv-to-enc @@ -13,9 +13,12 @@ unistr/u32-to-u8 unistr/u32-strlen configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [uniconv/u32-strconv-to-enc.c]) +gl_LIBUNISTRING_MODULE([0.9], [uniconv/u32-strconv-to-enc]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICONV_U32_STRCONV_TO_ENC +lib_SOURCES += uniconv/u32-strconv-to-enc.c +endif Include: "uniconv.h" diff --git a/modules/uniconv/u32-strconv-to-locale b/modules/uniconv/u32-strconv-to-locale index 022402df47..65260f6fbf 100644 --- a/modules/uniconv/u32-strconv-to-locale +++ b/modules/uniconv/u32-strconv-to-locale @@ -10,9 +10,12 @@ uniconv/u32-strconv-to-enc localcharset configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [uniconv/u32-strconv-to-locale.c]) +gl_LIBUNISTRING_MODULE([0.9], [uniconv/u32-strconv-to-locale]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICONV_U32_STRCONV_TO_LOCALE +lib_SOURCES += uniconv/u32-strconv-to-locale.c +endif Include: "uniconv.h" diff --git a/modules/uniconv/u8-conv-from-enc b/modules/uniconv/u8-conv-from-enc index 8ca0283a02..55321503c0 100644 --- a/modules/uniconv/u8-conv-from-enc +++ b/modules/uniconv/u8-conv-from-enc @@ -12,9 +12,12 @@ unistr/u8-check unistr/u8-mblen configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [uniconv/u8-conv-from-enc.c]) +gl_LIBUNISTRING_MODULE([0.9], [uniconv/u8-conv-from-enc]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICONV_U8_CONV_FROM_ENC +lib_SOURCES += uniconv/u8-conv-from-enc.c +endif Include: "uniconv.h" diff --git a/modules/uniconv/u8-conv-to-enc b/modules/uniconv/u8-conv-to-enc index a49fe82132..8ab4443055 100644 --- a/modules/uniconv/u8-conv-to-enc +++ b/modules/uniconv/u8-conv-to-enc @@ -11,9 +11,12 @@ striconveha unistr/u8-check configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [uniconv/u8-conv-to-enc.c]) +gl_LIBUNISTRING_MODULE([0.9], [uniconv/u8-conv-to-enc]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICONV_U8_CONV_TO_ENC +lib_SOURCES += uniconv/u8-conv-to-enc.c +endif Include: "uniconv.h" diff --git a/modules/uniconv/u8-strconv-from-enc b/modules/uniconv/u8-strconv-from-enc index e873b18693..c27b9890be 100644 --- a/modules/uniconv/u8-strconv-from-enc +++ b/modules/uniconv/u8-strconv-from-enc @@ -11,9 +11,12 @@ uniconv/u8-conv-from-enc unistr/u8-strlen configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [uniconv/u8-strconv-from-enc.c]) +gl_LIBUNISTRING_MODULE([0.9], [uniconv/u8-strconv-from-enc]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICONV_U8_STRCONV_FROM_ENC +lib_SOURCES += uniconv/u8-strconv-from-enc.c +endif Include: "uniconv.h" diff --git a/modules/uniconv/u8-strconv-from-locale b/modules/uniconv/u8-strconv-from-locale index 1112c275d7..e2a1f9d902 100644 --- a/modules/uniconv/u8-strconv-from-locale +++ b/modules/uniconv/u8-strconv-from-locale @@ -10,9 +10,12 @@ uniconv/u8-strconv-from-enc localcharset configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [uniconv/u8-strconv-from-locale.c]) +gl_LIBUNISTRING_MODULE([0.9], [uniconv/u8-strconv-from-locale]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICONV_U8_STRCONV_FROM_LOCALE +lib_SOURCES += uniconv/u8-strconv-from-locale.c +endif Include: "uniconv.h" diff --git a/modules/uniconv/u8-strconv-to-enc b/modules/uniconv/u8-strconv-to-enc index c0bcb7cc28..533a4536a2 100644 --- a/modules/uniconv/u8-strconv-to-enc +++ b/modules/uniconv/u8-strconv-to-enc @@ -12,9 +12,12 @@ unistr/u8-check unistr/u8-strlen configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [uniconv/u8-strconv-to-enc.c]) +gl_LIBUNISTRING_MODULE([0.9], [uniconv/u8-strconv-to-enc]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICONV_U8_STRCONV_TO_ENC +lib_SOURCES += uniconv/u8-strconv-to-enc.c +endif Include: "uniconv.h" diff --git a/modules/uniconv/u8-strconv-to-locale b/modules/uniconv/u8-strconv-to-locale index 2b9dc3cbe9..7d3e65278e 100644 --- a/modules/uniconv/u8-strconv-to-locale +++ b/modules/uniconv/u8-strconv-to-locale @@ -10,9 +10,12 @@ uniconv/u8-strconv-to-enc localcharset configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [uniconv/u8-strconv-to-locale.c]) +gl_LIBUNISTRING_MODULE([0.9], [uniconv/u8-strconv-to-locale]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICONV_U8_STRCONV_TO_LOCALE +lib_SOURCES += uniconv/u8-strconv-to-locale.c +endif Include: "uniconv.h" diff --git a/modules/unictype/bidicategory-byname b/modules/unictype/bidicategory-byname index 6d2bf55812..8303b2b23e 100644 --- a/modules/unictype/bidicategory-byname +++ b/modules/unictype/bidicategory-byname @@ -8,9 +8,12 @@ Depends-on: unictype/base configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/bidi_byname.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/bidicategory-byname]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_BIDICATEGORY_BYNAME +lib_SOURCES += unictype/bidi_byname.c +endif Include: "unictype.h" diff --git a/modules/unictype/bidicategory-name b/modules/unictype/bidicategory-name index 4686516ba0..7e4a6a032a 100644 --- a/modules/unictype/bidicategory-name +++ b/modules/unictype/bidicategory-name @@ -8,9 +8,12 @@ Depends-on: unictype/base configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/bidi_name.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/bidicategory-name]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_BIDICATEGORY_NAME +lib_SOURCES += unictype/bidi_name.c +endif Include: "unictype.h" diff --git a/modules/unictype/bidicategory-of b/modules/unictype/bidicategory-of index 7337288f4e..d284063b94 100644 --- a/modules/unictype/bidicategory-of +++ b/modules/unictype/bidicategory-of @@ -9,9 +9,12 @@ Depends-on: unictype/base configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/bidi_of.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/bidicategory-of]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_BIDICATEGORY_OF +lib_SOURCES += unictype/bidi_of.c +endif Include: "unictype.h" diff --git a/modules/unictype/bidicategory-test b/modules/unictype/bidicategory-test index 9fa3c56c5a..abbd277c51 100644 --- a/modules/unictype/bidicategory-test +++ b/modules/unictype/bidicategory-test @@ -9,9 +9,12 @@ unictype/base unictype/bidicategory-of configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/bidi_test.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/bidicategory-test]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_BIDICATEGORY_TEST +lib_SOURCES += unictype/bidi_test.c +endif Include: "unictype.h" diff --git a/modules/unictype/block-list b/modules/unictype/block-list index 440958eb4f..17650a76b4 100644 --- a/modules/unictype/block-list +++ b/modules/unictype/block-list @@ -9,9 +9,12 @@ Depends-on: unictype/base configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/blocks.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/block-list]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_BLOCK_LIST +lib_SOURCES += unictype/blocks.c +endif Include: "unictype.h" diff --git a/modules/unictype/block-test b/modules/unictype/block-test index 9e2ae8a065..21e9eae8c5 100644 --- a/modules/unictype/block-test +++ b/modules/unictype/block-test @@ -8,9 +8,12 @@ Depends-on: unictype/base configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/block_test.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/block-test]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_BLOCK_TEST +lib_SOURCES += unictype/block_test.c +endif Include: "unictype.h" diff --git a/modules/unictype/category-C b/modules/unictype/category-C index f27300cfe3..0eed125cf9 100644 --- a/modules/unictype/category-C +++ b/modules/unictype/category-C @@ -9,9 +9,12 @@ Depends-on: unictype/base configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/categ_C.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/category-C]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_C +lib_SOURCES += unictype/categ_C.c +endif Include: "unictype.h" diff --git a/modules/unictype/category-Cc b/modules/unictype/category-Cc index 9a51048b91..74fad8e5f9 100644 --- a/modules/unictype/category-Cc +++ b/modules/unictype/category-Cc @@ -9,9 +9,12 @@ Depends-on: unictype/base configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/categ_Cc.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/category-Cc]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_CC +lib_SOURCES += unictype/categ_Cc.c +endif Include: "unictype.h" diff --git a/modules/unictype/category-Cf b/modules/unictype/category-Cf index 66157edf1f..e939c822c5 100644 --- a/modules/unictype/category-Cf +++ b/modules/unictype/category-Cf @@ -9,9 +9,12 @@ Depends-on: unictype/base configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/categ_Cf.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/category-Cf]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_CF +lib_SOURCES += unictype/categ_Cf.c +endif Include: "unictype.h" diff --git a/modules/unictype/category-Cn b/modules/unictype/category-Cn index 4dfde19f1d..4a22ae2189 100644 --- a/modules/unictype/category-Cn +++ b/modules/unictype/category-Cn @@ -9,9 +9,12 @@ Depends-on: unictype/base configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/categ_Cn.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/category-Cn]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_CN +lib_SOURCES += unictype/categ_Cn.c +endif Include: "unictype.h" diff --git a/modules/unictype/category-Co b/modules/unictype/category-Co index e6950034ea..d5e6096cca 100644 --- a/modules/unictype/category-Co +++ b/modules/unictype/category-Co @@ -9,9 +9,12 @@ Depends-on: unictype/base configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/categ_Co.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/category-Co]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_CO +lib_SOURCES += unictype/categ_Co.c +endif Include: "unictype.h" diff --git a/modules/unictype/category-Cs b/modules/unictype/category-Cs index 78874fb8cf..1261b5ba8e 100644 --- a/modules/unictype/category-Cs +++ b/modules/unictype/category-Cs @@ -9,9 +9,12 @@ Depends-on: unictype/base configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/categ_Cs.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/category-Cs]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_CS +lib_SOURCES += unictype/categ_Cs.c +endif Include: "unictype.h" diff --git a/modules/unictype/category-L b/modules/unictype/category-L index 5ac31b4630..2b74a3cba8 100644 --- a/modules/unictype/category-L +++ b/modules/unictype/category-L @@ -9,9 +9,12 @@ Depends-on: unictype/base configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/categ_L.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/category-L]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_L +lib_SOURCES += unictype/categ_L.c +endif Include: "unictype.h" diff --git a/modules/unictype/category-Ll b/modules/unictype/category-Ll index de196bd72f..07d5cb02f1 100644 --- a/modules/unictype/category-Ll +++ b/modules/unictype/category-Ll @@ -9,9 +9,12 @@ Depends-on: unictype/base configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/categ_Ll.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/category-Ll]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_LL +lib_SOURCES += unictype/categ_Ll.c +endif Include: "unictype.h" diff --git a/modules/unictype/category-Lm b/modules/unictype/category-Lm index dd0f834246..5b58fc50b2 100644 --- a/modules/unictype/category-Lm +++ b/modules/unictype/category-Lm @@ -9,9 +9,12 @@ Depends-on: unictype/base configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/categ_Lm.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/category-Lm]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_LM +lib_SOURCES += unictype/categ_Lm.c +endif Include: "unictype.h" diff --git a/modules/unictype/category-Lo b/modules/unictype/category-Lo index 58d14510e7..94733cc881 100644 --- a/modules/unictype/category-Lo +++ b/modules/unictype/category-Lo @@ -9,9 +9,12 @@ Depends-on: unictype/base configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/categ_Lo.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/category-Lo]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_LO +lib_SOURCES += unictype/categ_Lo.c +endif Include: "unictype.h" diff --git a/modules/unictype/category-Lt b/modules/unictype/category-Lt index bc597aa2d9..e433d8f8d8 100644 --- a/modules/unictype/category-Lt +++ b/modules/unictype/category-Lt @@ -9,9 +9,12 @@ Depends-on: unictype/base configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/categ_Lt.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/category-Lt]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_LT +lib_SOURCES += unictype/categ_Lt.c +endif Include: "unictype.h" diff --git a/modules/unictype/category-Lu b/modules/unictype/category-Lu index 8d89454970..1adb0a0f72 100644 --- a/modules/unictype/category-Lu +++ b/modules/unictype/category-Lu @@ -9,9 +9,12 @@ Depends-on: unictype/base configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/categ_Lu.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/category-Lu]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_LU +lib_SOURCES += unictype/categ_Lu.c +endif Include: "unictype.h" diff --git a/modules/unictype/category-M b/modules/unictype/category-M index 3f65b6837f..262b3e5bf5 100644 --- a/modules/unictype/category-M +++ b/modules/unictype/category-M @@ -9,9 +9,12 @@ Depends-on: unictype/base configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/categ_M.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/category-M]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_M +lib_SOURCES += unictype/categ_M.c +endif Include: "unictype.h" diff --git a/modules/unictype/category-Mc b/modules/unictype/category-Mc index 13f886f39d..d325c9c6c3 100644 --- a/modules/unictype/category-Mc +++ b/modules/unictype/category-Mc @@ -9,9 +9,12 @@ Depends-on: unictype/base configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/categ_Mc.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/category-Mc]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_MC +lib_SOURCES += unictype/categ_Mc.c +endif Include: "unictype.h" diff --git a/modules/unictype/category-Me b/modules/unictype/category-Me index 6b96f4096c..1e3e7b2e32 100644 --- a/modules/unictype/category-Me +++ b/modules/unictype/category-Me @@ -9,9 +9,12 @@ Depends-on: unictype/base configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/categ_Me.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/category-Me]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_ME +lib_SOURCES += unictype/categ_Me.c +endif Include: "unictype.h" diff --git a/modules/unictype/category-Mn b/modules/unictype/category-Mn index ceb2a79bbd..e35a194395 100644 --- a/modules/unictype/category-Mn +++ b/modules/unictype/category-Mn @@ -9,9 +9,12 @@ Depends-on: unictype/base configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/categ_Mn.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/category-Mn]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_MN +lib_SOURCES += unictype/categ_Mn.c +endif Include: "unictype.h" diff --git a/modules/unictype/category-N b/modules/unictype/category-N index fca04fa4e5..5efb618d2d 100644 --- a/modules/unictype/category-N +++ b/modules/unictype/category-N @@ -9,9 +9,12 @@ Depends-on: unictype/base configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/categ_N.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/category-N]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_N +lib_SOURCES += unictype/categ_N.c +endif Include: "unictype.h" diff --git a/modules/unictype/category-Nd b/modules/unictype/category-Nd index 4854846532..20d281da9c 100644 --- a/modules/unictype/category-Nd +++ b/modules/unictype/category-Nd @@ -9,9 +9,12 @@ Depends-on: unictype/base configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/categ_Nd.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/category-Nd]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_ND +lib_SOURCES += unictype/categ_Nd.c +endif Include: "unictype.h" diff --git a/modules/unictype/category-Nl b/modules/unictype/category-Nl index 51e437def9..4c2ce54b6a 100644 --- a/modules/unictype/category-Nl +++ b/modules/unictype/category-Nl @@ -9,9 +9,12 @@ Depends-on: unictype/base configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/categ_Nl.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/category-Nl]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_NL +lib_SOURCES += unictype/categ_Nl.c +endif Include: "unictype.h" diff --git a/modules/unictype/category-No b/modules/unictype/category-No index 29263ad2da..caaa09b83b 100644 --- a/modules/unictype/category-No +++ b/modules/unictype/category-No @@ -9,9 +9,12 @@ Depends-on: unictype/base configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/categ_No.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/category-No]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_NO +lib_SOURCES += unictype/categ_No.c +endif Include: "unictype.h" diff --git a/modules/unictype/category-P b/modules/unictype/category-P index 9f224af442..93a6ffbad8 100644 --- a/modules/unictype/category-P +++ b/modules/unictype/category-P @@ -9,9 +9,12 @@ Depends-on: unictype/base configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/categ_P.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/category-P]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_P +lib_SOURCES += unictype/categ_P.c +endif Include: "unictype.h" diff --git a/modules/unictype/category-Pc b/modules/unictype/category-Pc index 694a7591c5..a85a0115fa 100644 --- a/modules/unictype/category-Pc +++ b/modules/unictype/category-Pc @@ -9,9 +9,12 @@ Depends-on: unictype/base configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/categ_Pc.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/category-Pc]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_PC +lib_SOURCES += unictype/categ_Pc.c +endif Include: "unictype.h" diff --git a/modules/unictype/category-Pd b/modules/unictype/category-Pd index 1454293362..c99fc8602c 100644 --- a/modules/unictype/category-Pd +++ b/modules/unictype/category-Pd @@ -9,9 +9,12 @@ Depends-on: unictype/base configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/categ_Pd.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/category-Pd]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_PD +lib_SOURCES += unictype/categ_Pd.c +endif Include: "unictype.h" diff --git a/modules/unictype/category-Pe b/modules/unictype/category-Pe index 1825b78aa7..41b679e1e5 100644 --- a/modules/unictype/category-Pe +++ b/modules/unictype/category-Pe @@ -9,9 +9,12 @@ Depends-on: unictype/base configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/categ_Pe.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/category-Pe]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_PE +lib_SOURCES += unictype/categ_Pe.c +endif Include: "unictype.h" diff --git a/modules/unictype/category-Pf b/modules/unictype/category-Pf index 39d13adc33..cbe49eec95 100644 --- a/modules/unictype/category-Pf +++ b/modules/unictype/category-Pf @@ -9,9 +9,12 @@ Depends-on: unictype/base configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/categ_Pf.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/category-Pf]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_PF +lib_SOURCES += unictype/categ_Pf.c +endif Include: "unictype.h" diff --git a/modules/unictype/category-Pi b/modules/unictype/category-Pi index b1ffefd2e7..8ef8304ddd 100644 --- a/modules/unictype/category-Pi +++ b/modules/unictype/category-Pi @@ -9,9 +9,12 @@ Depends-on: unictype/base configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/categ_Pi.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/category-Pi]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_PI +lib_SOURCES += unictype/categ_Pi.c +endif Include: "unictype.h" diff --git a/modules/unictype/category-Po b/modules/unictype/category-Po index b679bc5ea9..6efe728cc9 100644 --- a/modules/unictype/category-Po +++ b/modules/unictype/category-Po @@ -9,9 +9,12 @@ Depends-on: unictype/base configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/categ_Po.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/category-Po]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_PO +lib_SOURCES += unictype/categ_Po.c +endif Include: "unictype.h" diff --git a/modules/unictype/category-Ps b/modules/unictype/category-Ps index 3da8fb20ad..0a7e3cfaea 100644 --- a/modules/unictype/category-Ps +++ b/modules/unictype/category-Ps @@ -9,9 +9,12 @@ Depends-on: unictype/base configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/categ_Ps.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/category-Ps]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_PS +lib_SOURCES += unictype/categ_Ps.c +endif Include: "unictype.h" diff --git a/modules/unictype/category-S b/modules/unictype/category-S index a2b38c08be..820cdd056b 100644 --- a/modules/unictype/category-S +++ b/modules/unictype/category-S @@ -9,9 +9,12 @@ Depends-on: unictype/base configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/categ_S.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/category-S]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_S +lib_SOURCES += unictype/categ_S.c +endif Include: "unictype.h" diff --git a/modules/unictype/category-Sc b/modules/unictype/category-Sc index 01efd63ae6..039229acea 100644 --- a/modules/unictype/category-Sc +++ b/modules/unictype/category-Sc @@ -9,9 +9,12 @@ Depends-on: unictype/base configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/categ_Sc.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/category-Sc]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_SC +lib_SOURCES += unictype/categ_Sc.c +endif Include: "unictype.h" diff --git a/modules/unictype/category-Sk b/modules/unictype/category-Sk index fc303836a3..a6a6554c44 100644 --- a/modules/unictype/category-Sk +++ b/modules/unictype/category-Sk @@ -9,9 +9,12 @@ Depends-on: unictype/base configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/categ_Sk.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/category-Sk]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_SK +lib_SOURCES += unictype/categ_Sk.c +endif Include: "unictype.h" diff --git a/modules/unictype/category-Sm b/modules/unictype/category-Sm index 2226ff2a95..1ac1a4a900 100644 --- a/modules/unictype/category-Sm +++ b/modules/unictype/category-Sm @@ -9,9 +9,12 @@ Depends-on: unictype/base configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/categ_Sm.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/category-Sm]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_SM +lib_SOURCES += unictype/categ_Sm.c +endif Include: "unictype.h" diff --git a/modules/unictype/category-So b/modules/unictype/category-So index 6fd2c55b74..dff75dd5da 100644 --- a/modules/unictype/category-So +++ b/modules/unictype/category-So @@ -9,9 +9,12 @@ Depends-on: unictype/base configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/categ_So.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/category-So]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_SO +lib_SOURCES += unictype/categ_So.c +endif Include: "unictype.h" diff --git a/modules/unictype/category-Z b/modules/unictype/category-Z index 384f48db73..20eb401fde 100644 --- a/modules/unictype/category-Z +++ b/modules/unictype/category-Z @@ -9,9 +9,12 @@ Depends-on: unictype/base configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/categ_Z.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/category-Z]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_Z +lib_SOURCES += unictype/categ_Z.c +endif Include: "unictype.h" diff --git a/modules/unictype/category-Zl b/modules/unictype/category-Zl index 9416bf6f6c..2e5dece5bf 100644 --- a/modules/unictype/category-Zl +++ b/modules/unictype/category-Zl @@ -9,9 +9,12 @@ Depends-on: unictype/base configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/categ_Zl.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/category-Zl]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_ZL +lib_SOURCES += unictype/categ_Zl.c +endif Include: "unictype.h" diff --git a/modules/unictype/category-Zp b/modules/unictype/category-Zp index cd263f5bff..82b09cd5e4 100644 --- a/modules/unictype/category-Zp +++ b/modules/unictype/category-Zp @@ -9,9 +9,12 @@ Depends-on: unictype/base configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/categ_Zp.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/category-Zp]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_ZP +lib_SOURCES += unictype/categ_Zp.c +endif Include: "unictype.h" diff --git a/modules/unictype/category-Zs b/modules/unictype/category-Zs index 709eb741df..acf427261a 100644 --- a/modules/unictype/category-Zs +++ b/modules/unictype/category-Zs @@ -9,9 +9,12 @@ Depends-on: unictype/base configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/categ_Zs.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/category-Zs]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_ZS +lib_SOURCES += unictype/categ_Zs.c +endif Include: "unictype.h" diff --git a/modules/unictype/category-and b/modules/unictype/category-and index 6c75ae6218..ad9977c4f3 100644 --- a/modules/unictype/category-and +++ b/modules/unictype/category-and @@ -10,9 +10,12 @@ unictype/category-none unictype/category-test-withtable configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/categ_and.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/category-and]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_AND +lib_SOURCES += unictype/categ_and.c +endif Include: "unictype.h" diff --git a/modules/unictype/category-and-not b/modules/unictype/category-and-not index f7e6f4fbe3..bbcf2c916f 100644 --- a/modules/unictype/category-and-not +++ b/modules/unictype/category-and-not @@ -10,9 +10,12 @@ unictype/category-none unictype/category-test-withtable configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/categ_and_not.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/category-and-not]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_AND_NOT +lib_SOURCES += unictype/categ_and_not.c +endif Include: "unictype.h" diff --git a/modules/unictype/category-byname b/modules/unictype/category-byname index 3beeb09af9..4b39c3df63 100644 --- a/modules/unictype/category-byname +++ b/modules/unictype/category-byname @@ -46,9 +46,12 @@ unictype/category-Zs unictype/category-none configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/categ_byname.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/category-byname]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_BYNAME +lib_SOURCES += unictype/categ_byname.c +endif Include: "unictype.h" diff --git a/modules/unictype/category-name b/modules/unictype/category-name index 7cb4b2747c..3361ee9325 100644 --- a/modules/unictype/category-name +++ b/modules/unictype/category-name @@ -8,9 +8,12 @@ Depends-on: unictype/base configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/categ_name.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/category-name]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_NAME +lib_SOURCES += unictype/categ_name.c +endif Include: "unictype.h" diff --git a/modules/unictype/category-none b/modules/unictype/category-none index 0effca6dad..9e1626fdfd 100644 --- a/modules/unictype/category-none +++ b/modules/unictype/category-none @@ -8,9 +8,12 @@ Depends-on: unictype/base configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/categ_none.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/category-none]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_NONE +lib_SOURCES += unictype/categ_none.c +endif Include: "unictype.h" diff --git a/modules/unictype/category-of b/modules/unictype/category-of index a3c3238e56..4e32117e6c 100644 --- a/modules/unictype/category-of +++ b/modules/unictype/category-of @@ -11,9 +11,12 @@ unictype/category-none configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/categ_of.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/category-of]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_OF +lib_SOURCES += unictype/categ_of.c +endif Include: "unictype.h" diff --git a/modules/unictype/category-or b/modules/unictype/category-or index 8bbd41da51..616f7d533e 100644 --- a/modules/unictype/category-or +++ b/modules/unictype/category-or @@ -9,9 +9,12 @@ unictype/base unictype/category-test-withtable configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/categ_or.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/category-or]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_OR +lib_SOURCES += unictype/categ_or.c +endif Include: "unictype.h" diff --git a/modules/unictype/category-test b/modules/unictype/category-test index b6abf08f46..0a1f835c51 100644 --- a/modules/unictype/category-test +++ b/modules/unictype/category-test @@ -10,9 +10,12 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/categ_test.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/category-test]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_TEST +lib_SOURCES += unictype/categ_test.c +endif Include: "unictype.h" diff --git a/modules/unictype/combining-class b/modules/unictype/combining-class index c100224cf9..faddf7b494 100644 --- a/modules/unictype/combining-class +++ b/modules/unictype/combining-class @@ -9,9 +9,12 @@ Depends-on: unictype/base configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/combining.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/combining-class]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_COMBINING_CLASS +lib_SOURCES += unictype/combining.c +endif Include: "unictype.h" diff --git a/modules/unictype/ctype-alnum b/modules/unictype/ctype-alnum index 05cee3fea1..670f655fd0 100644 --- a/modules/unictype/ctype-alnum +++ b/modules/unictype/ctype-alnum @@ -12,9 +12,12 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/ctype_alnum.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/ctype-alnum]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_ALNUM +lib_SOURCES += unictype/ctype_alnum.c +endif Include: "unictype.h" diff --git a/modules/unictype/ctype-alpha b/modules/unictype/ctype-alpha index 222193f547..559ee6771a 100644 --- a/modules/unictype/ctype-alpha +++ b/modules/unictype/ctype-alpha @@ -12,9 +12,12 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/ctype_alpha.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/ctype-alpha]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_ALPHA +lib_SOURCES += unictype/ctype_alpha.c +endif Include: "unictype.h" diff --git a/modules/unictype/ctype-blank b/modules/unictype/ctype-blank index 8091e8689a..afcfdd45e9 100644 --- a/modules/unictype/ctype-blank +++ b/modules/unictype/ctype-blank @@ -12,9 +12,12 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/ctype_blank.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/ctype-blank]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_BLANK +lib_SOURCES += unictype/ctype_blank.c +endif Include: "unictype.h" diff --git a/modules/unictype/ctype-cntrl b/modules/unictype/ctype-cntrl index 375ce5e3cf..6b9d31948d 100644 --- a/modules/unictype/ctype-cntrl +++ b/modules/unictype/ctype-cntrl @@ -12,9 +12,12 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/ctype_cntrl.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/ctype-cntrl]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_CNTRL +lib_SOURCES += unictype/ctype_cntrl.c +endif Include: "unictype.h" diff --git a/modules/unictype/ctype-digit b/modules/unictype/ctype-digit index d52fc54fec..f40849fa82 100644 --- a/modules/unictype/ctype-digit +++ b/modules/unictype/ctype-digit @@ -12,9 +12,12 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/ctype_digit.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/ctype-digit]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_DIGIT +lib_SOURCES += unictype/ctype_digit.c +endif Include: "unictype.h" diff --git a/modules/unictype/ctype-graph b/modules/unictype/ctype-graph index d73af79001..c38e52e70c 100644 --- a/modules/unictype/ctype-graph +++ b/modules/unictype/ctype-graph @@ -12,9 +12,12 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/ctype_graph.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/ctype-graph]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_GRAPH +lib_SOURCES += unictype/ctype_graph.c +endif Include: "unictype.h" diff --git a/modules/unictype/ctype-lower b/modules/unictype/ctype-lower index 29d961f64b..3de33b05b7 100644 --- a/modules/unictype/ctype-lower +++ b/modules/unictype/ctype-lower @@ -12,9 +12,12 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/ctype_lower.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/ctype-lower]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_LOWER +lib_SOURCES += unictype/ctype_lower.c +endif Include: "unictype.h" diff --git a/modules/unictype/ctype-print b/modules/unictype/ctype-print index 36fae45c3d..435c3a1c83 100644 --- a/modules/unictype/ctype-print +++ b/modules/unictype/ctype-print @@ -12,9 +12,12 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/ctype_print.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/ctype-print]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_PRINT +lib_SOURCES += unictype/ctype_print.c +endif Include: "unictype.h" diff --git a/modules/unictype/ctype-punct b/modules/unictype/ctype-punct index 7b381d8f8d..63f7e2956b 100644 --- a/modules/unictype/ctype-punct +++ b/modules/unictype/ctype-punct @@ -12,9 +12,12 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/ctype_punct.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/ctype-punct]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_PUNCT +lib_SOURCES += unictype/ctype_punct.c +endif Include: "unictype.h" diff --git a/modules/unictype/ctype-space b/modules/unictype/ctype-space index e7d02db6b1..f6b28470ce 100644 --- a/modules/unictype/ctype-space +++ b/modules/unictype/ctype-space @@ -12,9 +12,12 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/ctype_space.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/ctype-space]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_SPACE +lib_SOURCES += unictype/ctype_space.c +endif Include: "unictype.h" diff --git a/modules/unictype/ctype-upper b/modules/unictype/ctype-upper index 41a8cf9826..e277d626e6 100644 --- a/modules/unictype/ctype-upper +++ b/modules/unictype/ctype-upper @@ -12,9 +12,12 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/ctype_upper.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/ctype-upper]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_UPPER +lib_SOURCES += unictype/ctype_upper.c +endif Include: "unictype.h" diff --git a/modules/unictype/ctype-xdigit b/modules/unictype/ctype-xdigit index 6678c3995b..fdf7c96b61 100644 --- a/modules/unictype/ctype-xdigit +++ b/modules/unictype/ctype-xdigit @@ -12,9 +12,12 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/ctype_xdigit.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/ctype-xdigit]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_XDIGIT +lib_SOURCES += unictype/ctype_xdigit.c +endif Include: "unictype.h" diff --git a/modules/unictype/decimal-digit b/modules/unictype/decimal-digit index 9b1c86f8c3..4de3531e3c 100644 --- a/modules/unictype/decimal-digit +++ b/modules/unictype/decimal-digit @@ -9,9 +9,12 @@ Depends-on: unictype/base configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/decdigit.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/decimal-digit]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_DECIMAL_DIGIT +lib_SOURCES += unictype/decdigit.c +endif Include: "unictype.h" diff --git a/modules/unictype/digit b/modules/unictype/digit index 0e40ceea3b..9443b3c339 100644 --- a/modules/unictype/digit +++ b/modules/unictype/digit @@ -9,9 +9,12 @@ Depends-on: unictype/base configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/digit.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/digit]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_DIGIT +lib_SOURCES += unictype/digit.c +endif Include: "unictype.h" diff --git a/modules/unictype/mirror b/modules/unictype/mirror index c686e0667a..4d86a74969 100644 --- a/modules/unictype/mirror +++ b/modules/unictype/mirror @@ -9,9 +9,12 @@ Depends-on: unictype/base configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/mirror.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/mirror]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_MIRROR +lib_SOURCES += unictype/mirror.c +endif Include: "unictype.h" diff --git a/modules/unictype/numeric b/modules/unictype/numeric index 253665131c..4c0a5756c6 100644 --- a/modules/unictype/numeric +++ b/modules/unictype/numeric @@ -9,9 +9,12 @@ Depends-on: unictype/base configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/numeric.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/numeric]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_NUMERIC +lib_SOURCES += unictype/numeric.c +endif Include: "unictype.h" diff --git a/modules/unictype/property-alphabetic b/modules/unictype/property-alphabetic index 4c2575b944..ee8709a8f5 100644 --- a/modules/unictype/property-alphabetic +++ b/modules/unictype/property-alphabetic @@ -11,9 +11,12 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/pr_alphabetic.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/property-alphabetic]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_ALPHABETIC +lib_SOURCES += unictype/pr_alphabetic.c +endif Include: "unictype.h" diff --git a/modules/unictype/property-ascii-hex-digit b/modules/unictype/property-ascii-hex-digit index 21959da4da..363d87d42d 100644 --- a/modules/unictype/property-ascii-hex-digit +++ b/modules/unictype/property-ascii-hex-digit @@ -11,9 +11,12 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/pr_ascii_hex_digit.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/property-ascii-hex-digit]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_ASCII_HEX_DIGIT +lib_SOURCES += unictype/pr_ascii_hex_digit.c +endif Include: "unictype.h" diff --git a/modules/unictype/property-bidi-arabic-digit b/modules/unictype/property-bidi-arabic-digit index 7ef5887a99..23c9e71e41 100644 --- a/modules/unictype/property-bidi-arabic-digit +++ b/modules/unictype/property-bidi-arabic-digit @@ -12,9 +12,12 @@ unictype/bidicategory-of configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/pr_bidi_arabic_digit.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/property-bidi-arabic-digit]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_BIDI_ARABIC_DIGIT +lib_SOURCES += unictype/pr_bidi_arabic_digit.c +endif Include: "unictype.h" diff --git a/modules/unictype/property-bidi-arabic-right-to-left b/modules/unictype/property-bidi-arabic-right-to-left index 61949a5de8..f07ee760f7 100644 --- a/modules/unictype/property-bidi-arabic-right-to-left +++ b/modules/unictype/property-bidi-arabic-right-to-left @@ -12,9 +12,12 @@ unictype/bidicategory-of configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/pr_bidi_arabic_right_to_left.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/property-bidi-arabic-right-to-left]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_BIDI_ARABIC_RIGHT_TO_LEFT +lib_SOURCES += unictype/pr_bidi_arabic_right_to_left.c +endif Include: "unictype.h" diff --git a/modules/unictype/property-bidi-block-separator b/modules/unictype/property-bidi-block-separator index 2252816270..6d38c64d93 100644 --- a/modules/unictype/property-bidi-block-separator +++ b/modules/unictype/property-bidi-block-separator @@ -12,9 +12,12 @@ unictype/bidicategory-of configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/pr_bidi_block_separator.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/property-bidi-block-separator]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_BIDI_BLOCK_SEPARATOR +lib_SOURCES += unictype/pr_bidi_block_separator.c +endif Include: "unictype.h" diff --git a/modules/unictype/property-bidi-boundary-neutral b/modules/unictype/property-bidi-boundary-neutral index af9ee4ebaa..437bd8dd93 100644 --- a/modules/unictype/property-bidi-boundary-neutral +++ b/modules/unictype/property-bidi-boundary-neutral @@ -12,9 +12,12 @@ unictype/bidicategory-of configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/pr_bidi_boundary_neutral.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/property-bidi-boundary-neutral]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_BIDI_BOUNDARY_NEUTRAL +lib_SOURCES += unictype/pr_bidi_boundary_neutral.c +endif Include: "unictype.h" diff --git a/modules/unictype/property-bidi-common-separator b/modules/unictype/property-bidi-common-separator index ff7b9e5ff6..70d941549a 100644 --- a/modules/unictype/property-bidi-common-separator +++ b/modules/unictype/property-bidi-common-separator @@ -12,9 +12,12 @@ unictype/bidicategory-of configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/pr_bidi_common_separator.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/property-bidi-common-separator]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_BIDI_COMMON_SEPARATOR +lib_SOURCES += unictype/pr_bidi_common_separator.c +endif Include: "unictype.h" diff --git a/modules/unictype/property-bidi-control b/modules/unictype/property-bidi-control index 94386956a3..588790447a 100644 --- a/modules/unictype/property-bidi-control +++ b/modules/unictype/property-bidi-control @@ -12,9 +12,12 @@ unictype/bidicategory-of configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/pr_bidi_control.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/property-bidi-control]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_BIDI_CONTROL +lib_SOURCES += unictype/pr_bidi_control.c +endif Include: "unictype.h" diff --git a/modules/unictype/property-bidi-embedding-or-override b/modules/unictype/property-bidi-embedding-or-override index 8fe27d59ef..ccfad53c62 100644 --- a/modules/unictype/property-bidi-embedding-or-override +++ b/modules/unictype/property-bidi-embedding-or-override @@ -12,9 +12,12 @@ unictype/bidicategory-of configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/pr_bidi_embedding_or_override.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/property-bidi-embedding-or-override]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_BIDI_EMBEDDING_OR_OVERRIDE +lib_SOURCES += unictype/pr_bidi_embedding_or_override.c +endif Include: "unictype.h" diff --git a/modules/unictype/property-bidi-eur-num-separator b/modules/unictype/property-bidi-eur-num-separator index 10ca0f653d..7f26262a2b 100644 --- a/modules/unictype/property-bidi-eur-num-separator +++ b/modules/unictype/property-bidi-eur-num-separator @@ -12,9 +12,12 @@ unictype/bidicategory-of configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/pr_bidi_eur_num_separator.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/property-bidi-eur-num-separator]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_BIDI_EUR_NUM_SEPARATOR +lib_SOURCES += unictype/pr_bidi_eur_num_separator.c +endif Include: "unictype.h" diff --git a/modules/unictype/property-bidi-eur-num-terminator b/modules/unictype/property-bidi-eur-num-terminator index 4b445a7b23..4f7d9600fb 100644 --- a/modules/unictype/property-bidi-eur-num-terminator +++ b/modules/unictype/property-bidi-eur-num-terminator @@ -12,9 +12,12 @@ unictype/bidicategory-of configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/pr_bidi_eur_num_terminator.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/property-bidi-eur-num-terminator]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_BIDI_EUR_NUM_TERMINATOR +lib_SOURCES += unictype/pr_bidi_eur_num_terminator.c +endif Include: "unictype.h" diff --git a/modules/unictype/property-bidi-european-digit b/modules/unictype/property-bidi-european-digit index d12d8042ed..66d987abfe 100644 --- a/modules/unictype/property-bidi-european-digit +++ b/modules/unictype/property-bidi-european-digit @@ -12,9 +12,12 @@ unictype/bidicategory-of configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/pr_bidi_european_digit.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/property-bidi-european-digit]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_BIDI_EUROPEAN_DIGIT +lib_SOURCES += unictype/pr_bidi_european_digit.c +endif Include: "unictype.h" diff --git a/modules/unictype/property-bidi-hebrew-right-to-left b/modules/unictype/property-bidi-hebrew-right-to-left index 805ef8cd23..ccd33cf411 100644 --- a/modules/unictype/property-bidi-hebrew-right-to-left +++ b/modules/unictype/property-bidi-hebrew-right-to-left @@ -12,9 +12,12 @@ unictype/bidicategory-of configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/pr_bidi_hebrew_right_to_left.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/property-bidi-hebrew-right-to-left]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_BIDI_HEBREW_RIGHT_TO_LEFT +lib_SOURCES += unictype/pr_bidi_hebrew_right_to_left.c +endif Include: "unictype.h" diff --git a/modules/unictype/property-bidi-left-to-right b/modules/unictype/property-bidi-left-to-right index 3488b143fa..54640e743d 100644 --- a/modules/unictype/property-bidi-left-to-right +++ b/modules/unictype/property-bidi-left-to-right @@ -12,9 +12,12 @@ unictype/bidicategory-of configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/pr_bidi_left_to_right.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/property-bidi-left-to-right]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_BIDI_LEFT_TO_RIGHT +lib_SOURCES += unictype/pr_bidi_left_to_right.c +endif Include: "unictype.h" diff --git a/modules/unictype/property-bidi-non-spacing-mark b/modules/unictype/property-bidi-non-spacing-mark index efff6dbbd5..73ea65fe58 100644 --- a/modules/unictype/property-bidi-non-spacing-mark +++ b/modules/unictype/property-bidi-non-spacing-mark @@ -12,9 +12,12 @@ unictype/bidicategory-of configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/pr_bidi_non_spacing_mark.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/property-bidi-non-spacing-mark]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_BIDI_NON_SPACING_MARK +lib_SOURCES += unictype/pr_bidi_non_spacing_mark.c +endif Include: "unictype.h" diff --git a/modules/unictype/property-bidi-other-neutral b/modules/unictype/property-bidi-other-neutral index b6bffc53da..d6a08678ce 100644 --- a/modules/unictype/property-bidi-other-neutral +++ b/modules/unictype/property-bidi-other-neutral @@ -12,9 +12,12 @@ unictype/bidicategory-of configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/pr_bidi_other_neutral.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/property-bidi-other-neutral]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_BIDI_OTHER_NEUTRAL +lib_SOURCES += unictype/pr_bidi_other_neutral.c +endif Include: "unictype.h" diff --git a/modules/unictype/property-bidi-pdf b/modules/unictype/property-bidi-pdf index d3907e2fa4..158523f684 100644 --- a/modules/unictype/property-bidi-pdf +++ b/modules/unictype/property-bidi-pdf @@ -12,9 +12,12 @@ unictype/bidicategory-of configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/pr_bidi_pdf.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/property-bidi-pdf]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_BIDI_PDF +lib_SOURCES += unictype/pr_bidi_pdf.c +endif Include: "unictype.h" diff --git a/modules/unictype/property-bidi-segment-separator b/modules/unictype/property-bidi-segment-separator index cd5fcc0c1f..511c30c969 100644 --- a/modules/unictype/property-bidi-segment-separator +++ b/modules/unictype/property-bidi-segment-separator @@ -12,9 +12,12 @@ unictype/bidicategory-of configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/pr_bidi_segment_separator.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/property-bidi-segment-separator]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_BIDI_SEGMENT_SEPARATOR +lib_SOURCES += unictype/pr_bidi_segment_separator.c +endif Include: "unictype.h" diff --git a/modules/unictype/property-bidi-whitespace b/modules/unictype/property-bidi-whitespace index e1201df360..910acc3fa6 100644 --- a/modules/unictype/property-bidi-whitespace +++ b/modules/unictype/property-bidi-whitespace @@ -12,9 +12,12 @@ unictype/bidicategory-of configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/pr_bidi_whitespace.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/property-bidi-whitespace]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_BIDI_WHITESPACE +lib_SOURCES += unictype/pr_bidi_whitespace.c +endif Include: "unictype.h" diff --git a/modules/unictype/property-byname b/modules/unictype/property-byname index 5583177651..6264951d7f 100644 --- a/modules/unictype/property-byname +++ b/modules/unictype/property-byname @@ -89,9 +89,12 @@ unictype/property-zero-width gperf configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/pr_byname.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/property-byname]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_BYNAME +lib_SOURCES += unictype/pr_byname.c +endif unictype/pr_byname.h: unictype/pr_byname.gperf $(GPERF) -m 10 $(srcdir)/unictype/pr_byname.gperf > $(srcdir)/unictype/pr_byname.h-t diff --git a/modules/unictype/property-combining b/modules/unictype/property-combining index 7514e72b39..dadc91a8c3 100644 --- a/modules/unictype/property-combining +++ b/modules/unictype/property-combining @@ -11,9 +11,12 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/pr_combining.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/property-combining]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_COMBINING +lib_SOURCES += unictype/pr_combining.c +endif Include: "unictype.h" diff --git a/modules/unictype/property-composite b/modules/unictype/property-composite index bfdafb4883..3c0b536bcb 100644 --- a/modules/unictype/property-composite +++ b/modules/unictype/property-composite @@ -11,9 +11,12 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/pr_composite.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/property-composite]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_COMPOSITE +lib_SOURCES += unictype/pr_composite.c +endif Include: "unictype.h" diff --git a/modules/unictype/property-currency-symbol b/modules/unictype/property-currency-symbol index 1bce9dbd09..9986ba474d 100644 --- a/modules/unictype/property-currency-symbol +++ b/modules/unictype/property-currency-symbol @@ -13,9 +13,12 @@ unictype/category-Sc configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/pr_currency_symbol.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/property-currency-symbol]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_CURRENCY_SYMBOL +lib_SOURCES += unictype/pr_currency_symbol.c +endif Include: "unictype.h" diff --git a/modules/unictype/property-dash b/modules/unictype/property-dash index 323dc3e968..9004e89920 100644 --- a/modules/unictype/property-dash +++ b/modules/unictype/property-dash @@ -11,9 +11,12 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/pr_dash.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/property-dash]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_DASH +lib_SOURCES += unictype/pr_dash.c +endif Include: "unictype.h" diff --git a/modules/unictype/property-decimal-digit b/modules/unictype/property-decimal-digit index 5fccac93c6..b4ac2e5857 100644 --- a/modules/unictype/property-decimal-digit +++ b/modules/unictype/property-decimal-digit @@ -13,9 +13,12 @@ unictype/category-Nd configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/pr_decimal_digit.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/property-decimal-digit]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_DECIMAL_DIGIT +lib_SOURCES += unictype/pr_decimal_digit.c +endif Include: "unictype.h" diff --git a/modules/unictype/property-default-ignorable-code-point b/modules/unictype/property-default-ignorable-code-point index 55a360aad0..ecf9482b60 100644 --- a/modules/unictype/property-default-ignorable-code-point +++ b/modules/unictype/property-default-ignorable-code-point @@ -11,9 +11,12 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/pr_default_ignorable_code_point.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/property-default-ignorable-code-point]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_DEFAULT_IGNORABLE_CODE_POINT +lib_SOURCES += unictype/pr_default_ignorable_code_point.c +endif Include: "unictype.h" diff --git a/modules/unictype/property-deprecated b/modules/unictype/property-deprecated index f62526fbcc..6735807f16 100644 --- a/modules/unictype/property-deprecated +++ b/modules/unictype/property-deprecated @@ -11,9 +11,12 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/pr_deprecated.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/property-deprecated]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_DEPRECATED +lib_SOURCES += unictype/pr_deprecated.c +endif Include: "unictype.h" diff --git a/modules/unictype/property-diacritic b/modules/unictype/property-diacritic index ac57c98e11..60a0e922d7 100644 --- a/modules/unictype/property-diacritic +++ b/modules/unictype/property-diacritic @@ -11,9 +11,12 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/pr_diacritic.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/property-diacritic]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_DIACRITIC +lib_SOURCES += unictype/pr_diacritic.c +endif Include: "unictype.h" diff --git a/modules/unictype/property-extender b/modules/unictype/property-extender index 21f19a72d2..414c83906e 100644 --- a/modules/unictype/property-extender +++ b/modules/unictype/property-extender @@ -11,9 +11,12 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/pr_extender.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/property-extender]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_EXTENDER +lib_SOURCES += unictype/pr_extender.c +endif Include: "unictype.h" diff --git a/modules/unictype/property-format-control b/modules/unictype/property-format-control index 03a3e4b6b2..e511bf393a 100644 --- a/modules/unictype/property-format-control +++ b/modules/unictype/property-format-control @@ -11,9 +11,12 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/pr_format_control.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/property-format-control]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_FORMAT_CONTROL +lib_SOURCES += unictype/pr_format_control.c +endif Include: "unictype.h" diff --git a/modules/unictype/property-grapheme-base b/modules/unictype/property-grapheme-base index 4eafc84798..44d930bf37 100644 --- a/modules/unictype/property-grapheme-base +++ b/modules/unictype/property-grapheme-base @@ -11,9 +11,12 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/pr_grapheme_base.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/property-grapheme-base]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_GRAPHEME_BASE +lib_SOURCES += unictype/pr_grapheme_base.c +endif Include: "unictype.h" diff --git a/modules/unictype/property-grapheme-extend b/modules/unictype/property-grapheme-extend index ae3cd88a02..e5f22c2d4e 100644 --- a/modules/unictype/property-grapheme-extend +++ b/modules/unictype/property-grapheme-extend @@ -11,9 +11,12 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/pr_grapheme_extend.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/property-grapheme-extend]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_GRAPHEME_EXTEND +lib_SOURCES += unictype/pr_grapheme_extend.c +endif Include: "unictype.h" diff --git a/modules/unictype/property-grapheme-link b/modules/unictype/property-grapheme-link index ee10e256b6..cb06827fe0 100644 --- a/modules/unictype/property-grapheme-link +++ b/modules/unictype/property-grapheme-link @@ -11,9 +11,12 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/pr_grapheme_link.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/property-grapheme-link]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_GRAPHEME_LINK +lib_SOURCES += unictype/pr_grapheme_link.c +endif Include: "unictype.h" diff --git a/modules/unictype/property-hex-digit b/modules/unictype/property-hex-digit index 626ad5eea3..b4d244db34 100644 --- a/modules/unictype/property-hex-digit +++ b/modules/unictype/property-hex-digit @@ -11,9 +11,12 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/pr_hex_digit.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/property-hex-digit]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_HEX_DIGIT +lib_SOURCES += unictype/pr_hex_digit.c +endif Include: "unictype.h" diff --git a/modules/unictype/property-hyphen b/modules/unictype/property-hyphen index 78a0ab7965..0e635147e2 100644 --- a/modules/unictype/property-hyphen +++ b/modules/unictype/property-hyphen @@ -11,9 +11,12 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/pr_hyphen.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/property-hyphen]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_HYPHEN +lib_SOURCES += unictype/pr_hyphen.c +endif Include: "unictype.h" diff --git a/modules/unictype/property-id-continue b/modules/unictype/property-id-continue index 699af1ce98..a12b34e0df 100644 --- a/modules/unictype/property-id-continue +++ b/modules/unictype/property-id-continue @@ -11,9 +11,12 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/pr_id_continue.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/property-id-continue]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_ID_CONTINUE +lib_SOURCES += unictype/pr_id_continue.c +endif Include: "unictype.h" diff --git a/modules/unictype/property-id-start b/modules/unictype/property-id-start index 9f763803cc..06b945ce3f 100644 --- a/modules/unictype/property-id-start +++ b/modules/unictype/property-id-start @@ -11,9 +11,12 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/pr_id_start.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/property-id-start]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_ID_START +lib_SOURCES += unictype/pr_id_start.c +endif Include: "unictype.h" diff --git a/modules/unictype/property-ideographic b/modules/unictype/property-ideographic index 818d4af967..cacbfca40c 100644 --- a/modules/unictype/property-ideographic +++ b/modules/unictype/property-ideographic @@ -11,9 +11,12 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/pr_ideographic.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/property-ideographic]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_IDEOGRAPHIC +lib_SOURCES += unictype/pr_ideographic.c +endif Include: "unictype.h" diff --git a/modules/unictype/property-ids-binary-operator b/modules/unictype/property-ids-binary-operator index fee14c8419..d38e9611a8 100644 --- a/modules/unictype/property-ids-binary-operator +++ b/modules/unictype/property-ids-binary-operator @@ -11,9 +11,12 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/pr_ids_binary_operator.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/property-ids-binary-operator]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_IDS_BINARY_OPERATOR +lib_SOURCES += unictype/pr_ids_binary_operator.c +endif Include: "unictype.h" diff --git a/modules/unictype/property-ids-trinary-operator b/modules/unictype/property-ids-trinary-operator index cf9415c1b9..5621813dab 100644 --- a/modules/unictype/property-ids-trinary-operator +++ b/modules/unictype/property-ids-trinary-operator @@ -11,9 +11,12 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/pr_ids_trinary_operator.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/property-ids-trinary-operator]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_IDS_TRINARY_OPERATOR +lib_SOURCES += unictype/pr_ids_trinary_operator.c +endif Include: "unictype.h" diff --git a/modules/unictype/property-ignorable-control b/modules/unictype/property-ignorable-control index 48f0ae672a..bdd9995f3f 100644 --- a/modules/unictype/property-ignorable-control +++ b/modules/unictype/property-ignorable-control @@ -11,9 +11,12 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/pr_ignorable_control.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/property-ignorable-control]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_IGNORABLE_CONTROL +lib_SOURCES += unictype/pr_ignorable_control.c +endif Include: "unictype.h" diff --git a/modules/unictype/property-iso-control b/modules/unictype/property-iso-control index fb213fff62..3e2dee9652 100644 --- a/modules/unictype/property-iso-control +++ b/modules/unictype/property-iso-control @@ -13,9 +13,12 @@ unictype/category-Cc configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/pr_iso_control.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/property-iso-control]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_ISO_CONTROL +lib_SOURCES += unictype/pr_iso_control.c +endif Include: "unictype.h" diff --git a/modules/unictype/property-join-control b/modules/unictype/property-join-control index 90cec5bc00..965dfdb656 100644 --- a/modules/unictype/property-join-control +++ b/modules/unictype/property-join-control @@ -11,9 +11,12 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/pr_join_control.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/property-join-control]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_JOIN_CONTROL +lib_SOURCES += unictype/pr_join_control.c +endif Include: "unictype.h" diff --git a/modules/unictype/property-left-of-pair b/modules/unictype/property-left-of-pair index 3d88474f93..8fcdf4200c 100644 --- a/modules/unictype/property-left-of-pair +++ b/modules/unictype/property-left-of-pair @@ -11,9 +11,12 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/pr_left_of_pair.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/property-left-of-pair]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_LEFT_OF_PAIR +lib_SOURCES += unictype/pr_left_of_pair.c +endif Include: "unictype.h" diff --git a/modules/unictype/property-line-separator b/modules/unictype/property-line-separator index 7d02a1b631..beef169747 100644 --- a/modules/unictype/property-line-separator +++ b/modules/unictype/property-line-separator @@ -11,9 +11,12 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/pr_line_separator.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/property-line-separator]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_LINE_SEPARATOR +lib_SOURCES += unictype/pr_line_separator.c +endif Include: "unictype.h" diff --git a/modules/unictype/property-logical-order-exception b/modules/unictype/property-logical-order-exception index 6159a41f0b..fe494b5e70 100644 --- a/modules/unictype/property-logical-order-exception +++ b/modules/unictype/property-logical-order-exception @@ -11,9 +11,12 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/pr_logical_order_exception.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/property-logical-order-exception]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_LOGICAL_ORDER_EXCEPTION +lib_SOURCES += unictype/pr_logical_order_exception.c +endif Include: "unictype.h" diff --git a/modules/unictype/property-lowercase b/modules/unictype/property-lowercase index fd1b794405..4fa2feb732 100644 --- a/modules/unictype/property-lowercase +++ b/modules/unictype/property-lowercase @@ -11,9 +11,12 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/pr_lowercase.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/property-lowercase]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_LOWERCASE +lib_SOURCES += unictype/pr_lowercase.c +endif Include: "unictype.h" diff --git a/modules/unictype/property-math b/modules/unictype/property-math index 1068d4beef..7cf9f1fb76 100644 --- a/modules/unictype/property-math +++ b/modules/unictype/property-math @@ -11,9 +11,12 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/pr_math.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/property-math]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_MATH +lib_SOURCES += unictype/pr_math.c +endif Include: "unictype.h" diff --git a/modules/unictype/property-non-break b/modules/unictype/property-non-break index fb92d36f4d..0d3d5aa2d1 100644 --- a/modules/unictype/property-non-break +++ b/modules/unictype/property-non-break @@ -11,9 +11,12 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/pr_non_break.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/property-non-break]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_NON_BREAK +lib_SOURCES += unictype/pr_non_break.c +endif Include: "unictype.h" diff --git a/modules/unictype/property-not-a-character b/modules/unictype/property-not-a-character index 10ba80fdd8..55c2e5e5f3 100644 --- a/modules/unictype/property-not-a-character +++ b/modules/unictype/property-not-a-character @@ -11,9 +11,12 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/pr_not_a_character.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/property-not-a-character]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_NOT_A_CHARACTER +lib_SOURCES += unictype/pr_not_a_character.c +endif Include: "unictype.h" diff --git a/modules/unictype/property-numeric b/modules/unictype/property-numeric index 6aef54c1a5..2f6a75b12b 100644 --- a/modules/unictype/property-numeric +++ b/modules/unictype/property-numeric @@ -11,9 +11,12 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/pr_numeric.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/property-numeric]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_NUMERIC +lib_SOURCES += unictype/pr_numeric.c +endif Include: "unictype.h" diff --git a/modules/unictype/property-other-alphabetic b/modules/unictype/property-other-alphabetic index 058b1bc80f..11d708c358 100644 --- a/modules/unictype/property-other-alphabetic +++ b/modules/unictype/property-other-alphabetic @@ -11,9 +11,12 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/pr_other_alphabetic.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/property-other-alphabetic]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_OTHER_ALPHABETIC +lib_SOURCES += unictype/pr_other_alphabetic.c +endif Include: "unictype.h" diff --git a/modules/unictype/property-other-default-ignorable-code-point b/modules/unictype/property-other-default-ignorable-code-point index 0b2a3215d9..d31b7f81b7 100644 --- a/modules/unictype/property-other-default-ignorable-code-point +++ b/modules/unictype/property-other-default-ignorable-code-point @@ -11,9 +11,12 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/pr_other_default_ignorable_code_point.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/property-other-default-ignorable-code-point]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_OTHER_DEFAULT_IGNORABLE_CODE_POINT +lib_SOURCES += unictype/pr_other_default_ignorable_code_point.c +endif Include: "unictype.h" diff --git a/modules/unictype/property-other-grapheme-extend b/modules/unictype/property-other-grapheme-extend index 8f08e6a9f4..831f68634f 100644 --- a/modules/unictype/property-other-grapheme-extend +++ b/modules/unictype/property-other-grapheme-extend @@ -11,9 +11,12 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/pr_other_grapheme_extend.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/property-other-grapheme-extend]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_OTHER_GRAPHEME_EXTEND +lib_SOURCES += unictype/pr_other_grapheme_extend.c +endif Include: "unictype.h" diff --git a/modules/unictype/property-other-id-continue b/modules/unictype/property-other-id-continue index 87c5a24e13..00a25a87c7 100644 --- a/modules/unictype/property-other-id-continue +++ b/modules/unictype/property-other-id-continue @@ -11,9 +11,12 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/pr_other_id_continue.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/property-other-id-continue]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_OTHER_ID_CONTINUE +lib_SOURCES += unictype/pr_other_id_continue.c +endif Include: "unictype.h" diff --git a/modules/unictype/property-other-id-start b/modules/unictype/property-other-id-start index 8f9fef4a7e..74e1a8e309 100644 --- a/modules/unictype/property-other-id-start +++ b/modules/unictype/property-other-id-start @@ -11,9 +11,12 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/pr_other_id_start.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/property-other-id-start]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_OTHER_ID_START +lib_SOURCES += unictype/pr_other_id_start.c +endif Include: "unictype.h" diff --git a/modules/unictype/property-other-lowercase b/modules/unictype/property-other-lowercase index ab356b7db4..3b1e17793e 100644 --- a/modules/unictype/property-other-lowercase +++ b/modules/unictype/property-other-lowercase @@ -11,9 +11,12 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/pr_other_lowercase.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/property-other-lowercase]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_OTHER_LOWERCASE +lib_SOURCES += unictype/pr_other_lowercase.c +endif Include: "unictype.h" diff --git a/modules/unictype/property-other-math b/modules/unictype/property-other-math index b95a0e4fe5..a66cd30512 100644 --- a/modules/unictype/property-other-math +++ b/modules/unictype/property-other-math @@ -11,9 +11,12 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/pr_other_math.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/property-other-math]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_OTHER_MATH +lib_SOURCES += unictype/pr_other_math.c +endif Include: "unictype.h" diff --git a/modules/unictype/property-other-uppercase b/modules/unictype/property-other-uppercase index 7d72b3eb15..2861dd34a9 100644 --- a/modules/unictype/property-other-uppercase +++ b/modules/unictype/property-other-uppercase @@ -11,9 +11,12 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/pr_other_uppercase.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/property-other-uppercase]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_OTHER_UPPERCASE +lib_SOURCES += unictype/pr_other_uppercase.c +endif Include: "unictype.h" diff --git a/modules/unictype/property-paired-punctuation b/modules/unictype/property-paired-punctuation index c744eb9f7e..3abd2ac73e 100644 --- a/modules/unictype/property-paired-punctuation +++ b/modules/unictype/property-paired-punctuation @@ -11,9 +11,12 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/pr_paired_punctuation.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/property-paired-punctuation]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_PAIRED_PUNCTUATION +lib_SOURCES += unictype/pr_paired_punctuation.c +endif Include: "unictype.h" diff --git a/modules/unictype/property-paragraph-separator b/modules/unictype/property-paragraph-separator index b4ebaad5c6..cbce2b9bf6 100644 --- a/modules/unictype/property-paragraph-separator +++ b/modules/unictype/property-paragraph-separator @@ -11,9 +11,12 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/pr_paragraph_separator.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/property-paragraph-separator]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_PARAGRAPH_SEPARATOR +lib_SOURCES += unictype/pr_paragraph_separator.c +endif Include: "unictype.h" diff --git a/modules/unictype/property-pattern-syntax b/modules/unictype/property-pattern-syntax index 5ae77e6027..04fea204d0 100644 --- a/modules/unictype/property-pattern-syntax +++ b/modules/unictype/property-pattern-syntax @@ -11,9 +11,12 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/pr_pattern_syntax.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/property-pattern-syntax]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_PATTERN_SYNTAX +lib_SOURCES += unictype/pr_pattern_syntax.c +endif Include: "unictype.h" diff --git a/modules/unictype/property-pattern-white-space b/modules/unictype/property-pattern-white-space index fb7b5f2b8e..f38906d18d 100644 --- a/modules/unictype/property-pattern-white-space +++ b/modules/unictype/property-pattern-white-space @@ -11,9 +11,12 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/pr_pattern_white_space.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/property-pattern-white-space]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_PATTERN_WHITE_SPACE +lib_SOURCES += unictype/pr_pattern_white_space.c +endif Include: "unictype.h" diff --git a/modules/unictype/property-private-use b/modules/unictype/property-private-use index c82405dd91..8bb878e5ae 100644 --- a/modules/unictype/property-private-use +++ b/modules/unictype/property-private-use @@ -11,9 +11,12 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/pr_private_use.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/property-private-use]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_PRIVATE_USE +lib_SOURCES += unictype/pr_private_use.c +endif Include: "unictype.h" diff --git a/modules/unictype/property-punctuation b/modules/unictype/property-punctuation index 8a2b2b8457..f96dd71ae7 100644 --- a/modules/unictype/property-punctuation +++ b/modules/unictype/property-punctuation @@ -13,9 +13,12 @@ unictype/category-P configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/pr_punctuation.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/property-punctuation]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_PUNCTUATION +lib_SOURCES += unictype/pr_punctuation.c +endif Include: "unictype.h" diff --git a/modules/unictype/property-quotation-mark b/modules/unictype/property-quotation-mark index 4d1da9b1f7..1997406661 100644 --- a/modules/unictype/property-quotation-mark +++ b/modules/unictype/property-quotation-mark @@ -11,9 +11,12 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/pr_quotation_mark.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/property-quotation-mark]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_QUOTATION_MARK +lib_SOURCES += unictype/pr_quotation_mark.c +endif Include: "unictype.h" diff --git a/modules/unictype/property-radical b/modules/unictype/property-radical index de3d9ff3e8..3bcdd2c13e 100644 --- a/modules/unictype/property-radical +++ b/modules/unictype/property-radical @@ -11,9 +11,12 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/pr_radical.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/property-radical]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_RADICAL +lib_SOURCES += unictype/pr_radical.c +endif Include: "unictype.h" diff --git a/modules/unictype/property-sentence-terminal b/modules/unictype/property-sentence-terminal index c7bb2738cb..911833b377 100644 --- a/modules/unictype/property-sentence-terminal +++ b/modules/unictype/property-sentence-terminal @@ -11,9 +11,12 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/pr_sentence_terminal.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/property-sentence-terminal]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_SENTENCE_TERMINAL +lib_SOURCES += unictype/pr_sentence_terminal.c +endif Include: "unictype.h" diff --git a/modules/unictype/property-soft-dotted b/modules/unictype/property-soft-dotted index e270c5021b..a697b54fc7 100644 --- a/modules/unictype/property-soft-dotted +++ b/modules/unictype/property-soft-dotted @@ -11,9 +11,12 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/pr_soft_dotted.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/property-soft-dotted]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_SOFT_DOTTED +lib_SOURCES += unictype/pr_soft_dotted.c +endif Include: "unictype.h" diff --git a/modules/unictype/property-space b/modules/unictype/property-space index 876e1aea44..401d440ae2 100644 --- a/modules/unictype/property-space +++ b/modules/unictype/property-space @@ -13,9 +13,12 @@ unictype/category-Zs configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/pr_space.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/property-space]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_SPACE +lib_SOURCES += unictype/pr_space.c +endif Include: "unictype.h" diff --git a/modules/unictype/property-terminal-punctuation b/modules/unictype/property-terminal-punctuation index 89cba27127..a75acecb8d 100644 --- a/modules/unictype/property-terminal-punctuation +++ b/modules/unictype/property-terminal-punctuation @@ -11,9 +11,12 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/pr_terminal_punctuation.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/property-terminal-punctuation]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_TERMINAL_PUNCTUATION +lib_SOURCES += unictype/pr_terminal_punctuation.c +endif Include: "unictype.h" diff --git a/modules/unictype/property-test b/modules/unictype/property-test index cdd99671ec..75f3599c22 100644 --- a/modules/unictype/property-test +++ b/modules/unictype/property-test @@ -8,9 +8,12 @@ Depends-on: unictype/base configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/pr_test.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/property-test]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_TEST +lib_SOURCES += unictype/pr_test.c +endif Include: "unictype.h" diff --git a/modules/unictype/property-titlecase b/modules/unictype/property-titlecase index b26cd8456f..5dd8ef1f54 100644 --- a/modules/unictype/property-titlecase +++ b/modules/unictype/property-titlecase @@ -13,9 +13,12 @@ unictype/category-Lt configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/pr_titlecase.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/property-titlecase]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_TITLECASE +lib_SOURCES += unictype/pr_titlecase.c +endif Include: "unictype.h" diff --git a/modules/unictype/property-unassigned-code-value b/modules/unictype/property-unassigned-code-value index f4e949d563..cccf4d2255 100644 --- a/modules/unictype/property-unassigned-code-value +++ b/modules/unictype/property-unassigned-code-value @@ -11,9 +11,12 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/pr_unassigned_code_value.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/property-unassigned-code-value]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_UNASSIGNED_CODE_VALUE +lib_SOURCES += unictype/pr_unassigned_code_value.c +endif Include: "unictype.h" diff --git a/modules/unictype/property-unified-ideograph b/modules/unictype/property-unified-ideograph index 3ef59d4ac5..50c3965597 100644 --- a/modules/unictype/property-unified-ideograph +++ b/modules/unictype/property-unified-ideograph @@ -11,9 +11,12 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/pr_unified_ideograph.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/property-unified-ideograph]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_UNIFIED_IDEOGRAPH +lib_SOURCES += unictype/pr_unified_ideograph.c +endif Include: "unictype.h" diff --git a/modules/unictype/property-uppercase b/modules/unictype/property-uppercase index 3e6368caf6..95edaf7f07 100644 --- a/modules/unictype/property-uppercase +++ b/modules/unictype/property-uppercase @@ -11,9 +11,12 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/pr_uppercase.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/property-uppercase]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_UPPERCASE +lib_SOURCES += unictype/pr_uppercase.c +endif Include: "unictype.h" diff --git a/modules/unictype/property-variation-selector b/modules/unictype/property-variation-selector index 1a1182ded2..d7ebc69d7e 100644 --- a/modules/unictype/property-variation-selector +++ b/modules/unictype/property-variation-selector @@ -11,9 +11,12 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/pr_variation_selector.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/property-variation-selector]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_VARIATION_SELECTOR +lib_SOURCES += unictype/pr_variation_selector.c +endif Include: "unictype.h" diff --git a/modules/unictype/property-white-space b/modules/unictype/property-white-space index 1a5b7d6271..632903bd8a 100644 --- a/modules/unictype/property-white-space +++ b/modules/unictype/property-white-space @@ -11,9 +11,12 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/pr_white_space.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/property-white-space]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_WHITE_SPACE +lib_SOURCES += unictype/pr_white_space.c +endif Include: "unictype.h" diff --git a/modules/unictype/property-xid-continue b/modules/unictype/property-xid-continue index 0e1071c131..3c786545f3 100644 --- a/modules/unictype/property-xid-continue +++ b/modules/unictype/property-xid-continue @@ -11,9 +11,12 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/pr_xid_continue.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/property-xid-continue]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_XID_CONTINUE +lib_SOURCES += unictype/pr_xid_continue.c +endif Include: "unictype.h" diff --git a/modules/unictype/property-xid-start b/modules/unictype/property-xid-start index 922d28e9c9..a75e5fb921 100644 --- a/modules/unictype/property-xid-start +++ b/modules/unictype/property-xid-start @@ -11,9 +11,12 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/pr_xid_start.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/property-xid-start]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_XID_START +lib_SOURCES += unictype/pr_xid_start.c +endif Include: "unictype.h" diff --git a/modules/unictype/property-zero-width b/modules/unictype/property-zero-width index d1e693eb52..d725603558 100644 --- a/modules/unictype/property-zero-width +++ b/modules/unictype/property-zero-width @@ -11,9 +11,12 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/pr_zero_width.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/property-zero-width]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_ZERO_WIDTH +lib_SOURCES += unictype/pr_zero_width.c +endif Include: "unictype.h" diff --git a/modules/unictype/scripts b/modules/unictype/scripts index b12752dd2b..056b846770 100644 --- a/modules/unictype/scripts +++ b/modules/unictype/scripts @@ -11,9 +11,12 @@ unictype/base gperf configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/scripts.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/scripts]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_SCRIPTS +lib_SOURCES += unictype/scripts.c +endif unictype/scripts_byname.h: unictype/scripts_byname.gperf $(GPERF) -m 10 $(srcdir)/unictype/scripts_byname.gperf > $(srcdir)/unictype/scripts_byname.h-t diff --git a/modules/unictype/syntax-c-ident b/modules/unictype/syntax-c-ident index 94e15bdcf7..05bac915ce 100644 --- a/modules/unictype/syntax-c-ident +++ b/modules/unictype/syntax-c-ident @@ -11,9 +11,12 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/sy_c_ident.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/syntax-c-ident]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_SYNTAX_C_IDENT +lib_SOURCES += unictype/sy_c_ident.c +endif Include: "unictype.h" diff --git a/modules/unictype/syntax-c-whitespace b/modules/unictype/syntax-c-whitespace index 1067650478..f6bd3a7a99 100644 --- a/modules/unictype/syntax-c-whitespace +++ b/modules/unictype/syntax-c-whitespace @@ -8,9 +8,12 @@ Depends-on: unictype/base configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/sy_c_whitespace.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/syntax-c-whitespace]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_SYNTAX_C_WHITESPACE +lib_SOURCES += unictype/sy_c_whitespace.c +endif Include: "unictype.h" diff --git a/modules/unictype/syntax-java-ident b/modules/unictype/syntax-java-ident index 71cdda2f98..d28b2e0f74 100644 --- a/modules/unictype/syntax-java-ident +++ b/modules/unictype/syntax-java-ident @@ -11,9 +11,12 @@ unictype/base configure.ac: AC_REQUIRE([AC_C_INLINE]) -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/sy_java_ident.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/syntax-java-ident]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_SYNTAX_JAVA_IDENT +lib_SOURCES += unictype/sy_java_ident.c +endif Include: "unictype.h" diff --git a/modules/unictype/syntax-java-whitespace b/modules/unictype/syntax-java-whitespace index 168ed3907a..85d4bdb9c9 100644 --- a/modules/unictype/syntax-java-whitespace +++ b/modules/unictype/syntax-java-whitespace @@ -8,9 +8,12 @@ Depends-on: unictype/base configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unictype/sy_java_whitespace.c]) +gl_LIBUNISTRING_MODULE([0.9], [unictype/syntax-java-whitespace]) Makefile.am: +if LIBUNISTRING_COMPILE_UNICTYPE_SYNTAX_JAVA_WHITESPACE +lib_SOURCES += unictype/sy_java_whitespace.c +endif Include: "unictype.h" diff --git a/modules/unilbrk/u16-possible-linebreaks b/modules/unilbrk/u16-possible-linebreaks index 0f740c1831..b0516e5c82 100644 --- a/modules/unilbrk/u16-possible-linebreaks +++ b/modules/unilbrk/u16-possible-linebreaks @@ -12,9 +12,12 @@ unistr/u16-mbtouc-unsafe streq configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unilbrk/u16-possible-linebreaks.c]) +gl_LIBUNISTRING_MODULE([0.9], [unilbrk/u16-possible-linebreaks]) Makefile.am: +if LIBUNISTRING_COMPILE_UNILBRK_U16_POSSIBLE_LINEBREAKS +lib_SOURCES += unilbrk/u16-possible-linebreaks.c +endif Include: "unilbrk.h" diff --git a/modules/unilbrk/u16-width-linebreaks b/modules/unilbrk/u16-width-linebreaks index bdc4d4b7e1..928e838a3b 100644 --- a/modules/unilbrk/u16-width-linebreaks +++ b/modules/unilbrk/u16-width-linebreaks @@ -11,9 +11,12 @@ uniwidth/width unistr/u16-mbtouc-unsafe configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unilbrk/u16-width-linebreaks.c]) +gl_LIBUNISTRING_MODULE([0.9], [unilbrk/u16-width-linebreaks]) Makefile.am: +if LIBUNISTRING_COMPILE_UNILBRK_U16_WIDTH_LINEBREAKS +lib_SOURCES += unilbrk/u16-width-linebreaks.c +endif Include: "unilbrk.h" diff --git a/modules/unilbrk/u32-possible-linebreaks b/modules/unilbrk/u32-possible-linebreaks index e51d251495..38d4726ea4 100644 --- a/modules/unilbrk/u32-possible-linebreaks +++ b/modules/unilbrk/u32-possible-linebreaks @@ -11,9 +11,12 @@ unilbrk/tables streq configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unilbrk/u32-possible-linebreaks.c]) +gl_LIBUNISTRING_MODULE([0.9], [unilbrk/u32-possible-linebreaks]) Makefile.am: +if LIBUNISTRING_COMPILE_UNILBRK_U32_POSSIBLE_LINEBREAKS +lib_SOURCES += unilbrk/u32-possible-linebreaks.c +endif Include: "unilbrk.h" diff --git a/modules/unilbrk/u32-width-linebreaks b/modules/unilbrk/u32-width-linebreaks index c0217fa101..db08fc7c2d 100644 --- a/modules/unilbrk/u32-width-linebreaks +++ b/modules/unilbrk/u32-width-linebreaks @@ -10,9 +10,12 @@ unilbrk/u32-possible-linebreaks uniwidth/width configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unilbrk/u32-width-linebreaks.c]) +gl_LIBUNISTRING_MODULE([0.9], [unilbrk/u32-width-linebreaks]) Makefile.am: +if LIBUNISTRING_COMPILE_UNILBRK_U32_WIDTH_LINEBREAKS +lib_SOURCES += unilbrk/u32-width-linebreaks.c +endif Include: "unilbrk.h" diff --git a/modules/unilbrk/u8-possible-linebreaks b/modules/unilbrk/u8-possible-linebreaks index c628f36b70..49353eb500 100644 --- a/modules/unilbrk/u8-possible-linebreaks +++ b/modules/unilbrk/u8-possible-linebreaks @@ -12,9 +12,12 @@ unistr/u8-mbtouc-unsafe streq configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unilbrk/u8-possible-linebreaks.c]) +gl_LIBUNISTRING_MODULE([0.9], [unilbrk/u8-possible-linebreaks]) Makefile.am: +if LIBUNISTRING_COMPILE_UNILBRK_U8_POSSIBLE_LINEBREAKS +lib_SOURCES += unilbrk/u8-possible-linebreaks.c +endif Include: "unilbrk.h" diff --git a/modules/unilbrk/u8-width-linebreaks b/modules/unilbrk/u8-width-linebreaks index 904b6d52f9..917a96faa0 100644 --- a/modules/unilbrk/u8-width-linebreaks +++ b/modules/unilbrk/u8-width-linebreaks @@ -11,9 +11,12 @@ uniwidth/width unistr/u8-mbtouc-unsafe configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unilbrk/u8-width-linebreaks.c]) +gl_LIBUNISTRING_MODULE([0.9], [unilbrk/u8-width-linebreaks]) Makefile.am: +if LIBUNISTRING_COMPILE_UNILBRK_U8_WIDTH_LINEBREAKS +lib_SOURCES += unilbrk/u8-width-linebreaks.c +endif Include: "unilbrk.h" diff --git a/modules/unilbrk/ulc-possible-linebreaks b/modules/unilbrk/ulc-possible-linebreaks index 915e8c79a1..5c9a28d945 100644 --- a/modules/unilbrk/ulc-possible-linebreaks +++ b/modules/unilbrk/ulc-possible-linebreaks @@ -12,9 +12,12 @@ uniconv/u8-conv-from-enc c-ctype configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unilbrk/ulc-possible-linebreaks.c]) +gl_LIBUNISTRING_MODULE([0.9], [unilbrk/ulc-possible-linebreaks]) Makefile.am: +if LIBUNISTRING_COMPILE_UNILBRK_ULC_POSSIBLE_LINEBREAKS +lib_SOURCES += unilbrk/ulc-possible-linebreaks.c +endif Include: "unilbrk.h" diff --git a/modules/unilbrk/ulc-width-linebreaks b/modules/unilbrk/ulc-width-linebreaks index d41187f598..5983124a13 100644 --- a/modules/unilbrk/ulc-width-linebreaks +++ b/modules/unilbrk/ulc-width-linebreaks @@ -12,9 +12,12 @@ uniconv/u8-conv-from-enc c-ctype configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unilbrk/ulc-width-linebreaks.c]) +gl_LIBUNISTRING_MODULE([0.9], [unilbrk/ulc-width-linebreaks]) Makefile.am: +if LIBUNISTRING_COMPILE_UNILBRK_ULC_WIDTH_LINEBREAKS +lib_SOURCES += unilbrk/ulc-width-linebreaks.c +endif Include: "unilbrk.h" diff --git a/modules/uniname/uniname b/modules/uniname/uniname index 8bf501b741..deb5d1500a 100644 --- a/modules/uniname/uniname +++ b/modules/uniname/uniname @@ -11,9 +11,12 @@ uniname/base memcmp configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [uniname/uniname.c]) +gl_LIBUNISTRING_MODULE([0.9], [uniname/uniname]) Makefile.am: +if LIBUNISTRING_COMPILE_UNINAME_UNINAME +lib_SOURCES += uniname/uniname.c +endif Include: "uniname.h" diff --git a/modules/uninorm/canonical-decomposition b/modules/uninorm/canonical-decomposition index 0b5b1b3e67..700e08ca6f 100644 --- a/modules/uninorm/canonical-decomposition +++ b/modules/uninorm/canonical-decomposition @@ -9,9 +9,12 @@ uninorm/base uninorm/decomposition-table configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [uninorm/canonical-decomposition.c]) +gl_LIBUNISTRING_MODULE([0.9], [uninorm/canonical-decomposition]) Makefile.am: +if LIBUNISTRING_COMPILE_UNINORM_CANONICAL_DECOMPOSITION +lib_SOURCES += uninorm/canonical-decomposition.c +endif Include: "uninorm.h" diff --git a/modules/uninorm/composition b/modules/uninorm/composition index d3887c1071..dde25008b6 100644 --- a/modules/uninorm/composition +++ b/modules/uninorm/composition @@ -10,9 +10,12 @@ uninorm/base gperf configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [uninorm/composition.c]) +gl_LIBUNISTRING_MODULE([0.9], [uninorm/composition]) Makefile.am: +if LIBUNISTRING_COMPILE_UNINORM_COMPOSITION +lib_SOURCES += uninorm/composition.c +endif uninorm/composition-table.h: $(srcdir)/uninorm/composition-table.gperf $(GPERF) -m 1 $(srcdir)/uninorm/composition-table.gperf > $(srcdir)/uninorm/composition-table.h-t diff --git a/modules/uninorm/decomposing-form b/modules/uninorm/decomposing-form index 14a3db77de..6a8db019b6 100644 --- a/modules/uninorm/decomposing-form +++ b/modules/uninorm/decomposing-form @@ -9,9 +9,12 @@ Depends-on: uninorm/base configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [uninorm/decomposing-form.c]) +gl_LIBUNISTRING_MODULE([0.9], [uninorm/decomposing-form]) Makefile.am: +if LIBUNISTRING_COMPILE_UNINORM_DECOMPOSING_FORM +lib_SOURCES += uninorm/decomposing-form.c +endif Include: "uninorm.h" diff --git a/modules/uninorm/decomposition b/modules/uninorm/decomposition index 8107eeff5e..ec54b05c8f 100644 --- a/modules/uninorm/decomposition +++ b/modules/uninorm/decomposition @@ -9,9 +9,12 @@ uninorm/base uninorm/decomposition-table configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [uninorm/decomposition.c]) +gl_LIBUNISTRING_MODULE([0.9], [uninorm/decomposition]) Makefile.am: +if LIBUNISTRING_COMPILE_UNINORM_DECOMPOSITION +lib_SOURCES += uninorm/decomposition.c +endif Include: "uninorm.h" diff --git a/modules/uninorm/filter b/modules/uninorm/filter index b748225350..e2c659826f 100644 --- a/modules/uninorm/filter +++ b/modules/uninorm/filter @@ -12,9 +12,12 @@ uninorm/decompose-internal malloc-posix configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [uninorm/uninorm-filter.c]) +gl_LIBUNISTRING_MODULE([0.9], [uninorm/filter]) Makefile.am: +if LIBUNISTRING_COMPILE_UNINORM_FILTER +lib_SOURCES += uninorm/uninorm-filter.c +endif Include: "uninorm.h" diff --git a/modules/uninorm/nfc b/modules/uninorm/nfc index 5b1f4ba61c..c05a13ef78 100644 --- a/modules/uninorm/nfc +++ b/modules/uninorm/nfc @@ -12,9 +12,12 @@ uninorm/composition uninorm/nfd configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [uninorm/nfc.c]) +gl_LIBUNISTRING_MODULE([0.9], [uninorm/nfc]) Makefile.am: +if LIBUNISTRING_COMPILE_UNINORM_NFC +lib_SOURCES += uninorm/nfc.c +endif Include: "uninorm.h" diff --git a/modules/uninorm/nfd b/modules/uninorm/nfd index d00cc3cb1c..02e7bbe0a6 100644 --- a/modules/uninorm/nfd +++ b/modules/uninorm/nfd @@ -10,9 +10,12 @@ uninorm/base uninorm/canonical-decomposition configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [uninorm/nfd.c]) +gl_LIBUNISTRING_MODULE([0.9], [uninorm/nfd]) Makefile.am: +if LIBUNISTRING_COMPILE_UNINORM_NFD +lib_SOURCES += uninorm/nfd.c +endif Include: "uninorm.h" diff --git a/modules/uninorm/nfkc b/modules/uninorm/nfkc index 1e6296bd1a..136a2321a3 100644 --- a/modules/uninorm/nfkc +++ b/modules/uninorm/nfkc @@ -12,9 +12,12 @@ uninorm/composition uninorm/nfkd configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [uninorm/nfkc.c]) +gl_LIBUNISTRING_MODULE([0.9], [uninorm/nfkc]) Makefile.am: +if LIBUNISTRING_COMPILE_UNINORM_NFKC +lib_SOURCES += uninorm/nfkc.c +endif Include: "uninorm.h" diff --git a/modules/uninorm/nfkd b/modules/uninorm/nfkd index 9727c5ea1c..bbe7a33bbd 100644 --- a/modules/uninorm/nfkd +++ b/modules/uninorm/nfkd @@ -10,9 +10,12 @@ uninorm/base uninorm/compat-decomposition configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [uninorm/nfkd.c]) +gl_LIBUNISTRING_MODULE([0.9], [uninorm/nfkd]) Makefile.am: +if LIBUNISTRING_COMPILE_UNINORM_NFKD +lib_SOURCES += uninorm/nfkd.c +endif Include: "uninorm.h" diff --git a/modules/uninorm/u16-normalize b/modules/uninorm/u16-normalize index 4a30bce3d6..9936665f06 100644 --- a/modules/uninorm/u16-normalize +++ b/modules/uninorm/u16-normalize @@ -16,9 +16,12 @@ uninorm/decompose-internal configure.ac: gl_MODULE_INDICATOR_FOR_TESTS([uninorm/u16-normalize]) -gl_LIBUNISTRING_LIBSOURCE([0.9], [uninorm/u16-normalize.c]) +gl_LIBUNISTRING_MODULE([0.9], [uninorm/u16-normalize]) Makefile.am: +if LIBUNISTRING_COMPILE_UNINORM_U16_NORMALIZE +lib_SOURCES += uninorm/u16-normalize.c +endif Include: "uninorm.h" diff --git a/modules/uninorm/u16-normcmp b/modules/uninorm/u16-normcmp index 464b98a3ff..cbb0006695 100644 --- a/modules/uninorm/u16-normcmp +++ b/modules/uninorm/u16-normcmp @@ -12,9 +12,12 @@ unistr/u16-cmp2 minmax configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [uninorm/u16-normcmp.c]) +gl_LIBUNISTRING_MODULE([0.9], [uninorm/u16-normcmp]) Makefile.am: +if LIBUNISTRING_COMPILE_UNINORM_U16_NORMCMP +lib_SOURCES += uninorm/u16-normcmp.c +endif Include: "uninorm.h" diff --git a/modules/uninorm/u16-normcoll b/modules/uninorm/u16-normcoll index c155eb6865..59815bfd36 100644 --- a/modules/uninorm/u16-normcoll +++ b/modules/uninorm/u16-normcoll @@ -11,9 +11,12 @@ uninorm/u16-normxfrm memcmp2 configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [uninorm/u16-normcoll.c]) +gl_LIBUNISTRING_MODULE([0.9], [uninorm/u16-normcoll]) Makefile.am: +if LIBUNISTRING_COMPILE_UNINORM_U16_NORMCOLL +lib_SOURCES += uninorm/u16-normcoll.c +endif Include: "uninorm.h" diff --git a/modules/uninorm/u16-normxfrm b/modules/uninorm/u16-normxfrm index 18ef013f64..9305b55e4a 100644 --- a/modules/uninorm/u16-normxfrm +++ b/modules/uninorm/u16-normxfrm @@ -13,9 +13,12 @@ localcharset memxfrm configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [uninorm/u16-normxfrm.c]) +gl_LIBUNISTRING_MODULE([0.9], [uninorm/u16-normxfrm]) Makefile.am: +if LIBUNISTRING_COMPILE_UNINORM_U16_NORMXFRM +lib_SOURCES += uninorm/u16-normxfrm.c +endif Include: "uninorm.h" diff --git a/modules/uninorm/u32-normalize b/modules/uninorm/u32-normalize index 5e6d1dfd5b..2c7e5cdcf9 100644 --- a/modules/uninorm/u32-normalize +++ b/modules/uninorm/u32-normalize @@ -16,9 +16,12 @@ uninorm/decompose-internal configure.ac: gl_MODULE_INDICATOR_FOR_TESTS([uninorm/u32-normalize]) -gl_LIBUNISTRING_LIBSOURCE([0.9], [uninorm/u32-normalize.c]) +gl_LIBUNISTRING_MODULE([0.9], [uninorm/u32-normalize]) Makefile.am: +if LIBUNISTRING_COMPILE_UNINORM_U32_NORMALIZE +lib_SOURCES += uninorm/u32-normalize.c +endif Include: "uninorm.h" diff --git a/modules/uninorm/u32-normcmp b/modules/uninorm/u32-normcmp index 2adbe1434d..593e068aa7 100644 --- a/modules/uninorm/u32-normcmp +++ b/modules/uninorm/u32-normcmp @@ -12,9 +12,12 @@ unistr/u32-cmp2 minmax configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [uninorm/u32-normcmp.c]) +gl_LIBUNISTRING_MODULE([0.9], [uninorm/u32-normcmp]) Makefile.am: +if LIBUNISTRING_COMPILE_UNINORM_U32_NORMCMP +lib_SOURCES += uninorm/u32-normcmp.c +endif Include: "uninorm.h" diff --git a/modules/uninorm/u32-normcoll b/modules/uninorm/u32-normcoll index 45281da23b..b356fc7dc5 100644 --- a/modules/uninorm/u32-normcoll +++ b/modules/uninorm/u32-normcoll @@ -11,9 +11,12 @@ uninorm/u32-normxfrm memcmp2 configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [uninorm/u32-normcoll.c]) +gl_LIBUNISTRING_MODULE([0.9], [uninorm/u32-normcoll]) Makefile.am: +if LIBUNISTRING_COMPILE_UNINORM_U32_NORMCOLL +lib_SOURCES += uninorm/u32-normcoll.c +endif Include: "uninorm.h" diff --git a/modules/uninorm/u32-normxfrm b/modules/uninorm/u32-normxfrm index 2b127568de..9cb06413e9 100644 --- a/modules/uninorm/u32-normxfrm +++ b/modules/uninorm/u32-normxfrm @@ -13,9 +13,12 @@ localcharset memxfrm configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [uninorm/u32-normxfrm.c]) +gl_LIBUNISTRING_MODULE([0.9], [uninorm/u32-normxfrm]) Makefile.am: +if LIBUNISTRING_COMPILE_UNINORM_U32_NORMXFRM +lib_SOURCES += uninorm/u32-normxfrm.c +endif Include: "uninorm.h" diff --git a/modules/uninorm/u8-normalize b/modules/uninorm/u8-normalize index 8d28dd349b..cbf764af47 100644 --- a/modules/uninorm/u8-normalize +++ b/modules/uninorm/u8-normalize @@ -16,9 +16,12 @@ uninorm/decompose-internal configure.ac: gl_MODULE_INDICATOR_FOR_TESTS([uninorm/u8-normalize]) -gl_LIBUNISTRING_LIBSOURCE([0.9], [uninorm/u8-normalize.c]) +gl_LIBUNISTRING_MODULE([0.9], [uninorm/u8-normalize]) Makefile.am: +if LIBUNISTRING_COMPILE_UNINORM_U8_NORMALIZE +lib_SOURCES += uninorm/u8-normalize.c +endif Include: "uninorm.h" diff --git a/modules/uninorm/u8-normcmp b/modules/uninorm/u8-normcmp index 83f2c2b5b3..ab13ff6e46 100644 --- a/modules/uninorm/u8-normcmp +++ b/modules/uninorm/u8-normcmp @@ -12,9 +12,12 @@ unistr/u8-cmp2 minmax configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [uninorm/u8-normcmp.c]) +gl_LIBUNISTRING_MODULE([0.9], [uninorm/u8-normcmp]) Makefile.am: +if LIBUNISTRING_COMPILE_UNINORM_U8_NORMCMP +lib_SOURCES += uninorm/u8-normcmp.c +endif Include: "uninorm.h" diff --git a/modules/uninorm/u8-normcoll b/modules/uninorm/u8-normcoll index a1144062a8..6dfa0ed288 100644 --- a/modules/uninorm/u8-normcoll +++ b/modules/uninorm/u8-normcoll @@ -11,9 +11,12 @@ uninorm/u8-normxfrm memcmp2 configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [uninorm/u8-normcoll.c]) +gl_LIBUNISTRING_MODULE([0.9], [uninorm/u8-normcoll]) Makefile.am: +if LIBUNISTRING_COMPILE_UNINORM_U8_NORMCOLL +lib_SOURCES += uninorm/u8-normcoll.c +endif Include: "uninorm.h" diff --git a/modules/uninorm/u8-normxfrm b/modules/uninorm/u8-normxfrm index 9cd2234e7a..123d1a7a1a 100644 --- a/modules/uninorm/u8-normxfrm +++ b/modules/uninorm/u8-normxfrm @@ -13,9 +13,12 @@ localcharset memxfrm configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [uninorm/u8-normxfrm.c]) +gl_LIBUNISTRING_MODULE([0.9], [uninorm/u8-normxfrm]) Makefile.am: +if LIBUNISTRING_COMPILE_UNINORM_U8_NORMXFRM +lib_SOURCES += uninorm/u8-normxfrm.c +endif Include: "uninorm.h" diff --git a/modules/unistdio/u16-asnprintf b/modules/unistdio/u16-asnprintf index 8b420de3cd..ef5eb6ee4b 100644 --- a/modules/unistdio/u16-asnprintf +++ b/modules/unistdio/u16-asnprintf @@ -11,9 +11,12 @@ unistdio/base unistdio/u16-vasnprintf configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistdio/u16-asnprintf.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistdio/u16-asnprintf]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTDIO_U16_ASNPRINTF +lib_SOURCES += unistdio/u16-asnprintf.c +endif Include: "unistdio.h" diff --git a/modules/unistdio/u16-asprintf b/modules/unistdio/u16-asprintf index d9bd7460e8..c567b9fce8 100644 --- a/modules/unistdio/u16-asprintf +++ b/modules/unistdio/u16-asprintf @@ -10,9 +10,12 @@ unistdio/base unistdio/u16-vasprintf configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistdio/u16-asprintf.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistdio/u16-asprintf]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTDIO_U16_ASPRINTF +lib_SOURCES += unistdio/u16-asprintf.c +endif Include: "unistdio.h" diff --git a/modules/unistdio/u16-snprintf b/modules/unistdio/u16-snprintf index c4d00238fa..4a6a1d9939 100644 --- a/modules/unistdio/u16-snprintf +++ b/modules/unistdio/u16-snprintf @@ -10,9 +10,12 @@ unistdio/base unistdio/u16-vsnprintf configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistdio/u16-snprintf.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistdio/u16-snprintf]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTDIO_U16_SNPRINTF +lib_SOURCES += unistdio/u16-snprintf.c +endif Include: "unistdio.h" diff --git a/modules/unistdio/u16-sprintf b/modules/unistdio/u16-sprintf index 6681e2bb4a..f5e25a56cb 100644 --- a/modules/unistdio/u16-sprintf +++ b/modules/unistdio/u16-sprintf @@ -10,9 +10,12 @@ unistdio/base unistdio/u16-vsprintf configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistdio/u16-sprintf.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistdio/u16-sprintf]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTDIO_U16_SPRINTF +lib_SOURCES += unistdio/u16-sprintf.c +endif Include: "unistdio.h" diff --git a/modules/unistdio/u16-u16-asnprintf b/modules/unistdio/u16-u16-asnprintf index 8447fa4ef0..9bbe4b63a6 100644 --- a/modules/unistdio/u16-u16-asnprintf +++ b/modules/unistdio/u16-u16-asnprintf @@ -11,9 +11,12 @@ unistdio/base unistdio/u16-u16-vasnprintf configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistdio/u16-u16-asnprintf.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistdio/u16-u16-asnprintf]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTDIO_U16_U16_ASNPRINTF +lib_SOURCES += unistdio/u16-u16-asnprintf.c +endif Include: "unistdio.h" diff --git a/modules/unistdio/u16-u16-asprintf b/modules/unistdio/u16-u16-asprintf index 2f51e904b0..0d9ad0157e 100644 --- a/modules/unistdio/u16-u16-asprintf +++ b/modules/unistdio/u16-u16-asprintf @@ -10,9 +10,12 @@ unistdio/base unistdio/u16-u16-vasprintf configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistdio/u16-u16-asprintf.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistdio/u16-u16-asprintf]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTDIO_U16_U16_ASPRINTF +lib_SOURCES += unistdio/u16-u16-asprintf.c +endif Include: "unistdio.h" diff --git a/modules/unistdio/u16-u16-snprintf b/modules/unistdio/u16-u16-snprintf index 54790a450d..96d84ec50d 100644 --- a/modules/unistdio/u16-u16-snprintf +++ b/modules/unistdio/u16-u16-snprintf @@ -10,9 +10,12 @@ unistdio/base unistdio/u16-u16-vsnprintf configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistdio/u16-u16-snprintf.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistdio/u16-u16-snprintf]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTDIO_U16_U16_SNPRINTF +lib_SOURCES += unistdio/u16-u16-snprintf.c +endif Include: "unistdio.h" diff --git a/modules/unistdio/u16-u16-sprintf b/modules/unistdio/u16-u16-sprintf index 8fdefd38b2..98b4c05a60 100644 --- a/modules/unistdio/u16-u16-sprintf +++ b/modules/unistdio/u16-u16-sprintf @@ -10,9 +10,12 @@ unistdio/base unistdio/u16-u16-vsprintf configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistdio/u16-u16-sprintf.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistdio/u16-u16-sprintf]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTDIO_U16_U16_SPRINTF +lib_SOURCES += unistdio/u16-u16-sprintf.c +endif Include: "unistdio.h" diff --git a/modules/unistdio/u16-u16-vasnprintf b/modules/unistdio/u16-u16-vasnprintf index ddaf19e47e..eabd37d09a 100644 --- a/modules/unistdio/u16-u16-vasnprintf +++ b/modules/unistdio/u16-u16-vasnprintf @@ -47,9 +47,12 @@ multiarch configure.ac: gl_PREREQ_VASNPRINTF_WITH_EXTRAS -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistdio/u16-u16-vasnprintf.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistdio/u16-u16-vasnprintf]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTDIO_U16_U16_VASNPRINTF +lib_SOURCES += unistdio/u16-u16-vasnprintf.c +endif Include: "unistdio.h" diff --git a/modules/unistdio/u16-u16-vasprintf b/modules/unistdio/u16-u16-vasprintf index 82952c5abc..326667d8fa 100644 --- a/modules/unistdio/u16-u16-vasprintf +++ b/modules/unistdio/u16-u16-vasprintf @@ -11,9 +11,12 @@ unistdio/u16-u16-vasnprintf errno configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistdio/u16-u16-vasprintf.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistdio/u16-u16-vasprintf]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTDIO_U16_U16_VASPRINTF +lib_SOURCES += unistdio/u16-u16-vasprintf.c +endif Include: "unistdio.h" diff --git a/modules/unistdio/u16-u16-vsnprintf b/modules/unistdio/u16-u16-vsnprintf index 5b2a3775ab..7abfdd1e1e 100644 --- a/modules/unistdio/u16-u16-vsnprintf +++ b/modules/unistdio/u16-u16-vsnprintf @@ -12,9 +12,12 @@ unistr/u16-cpy errno configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistdio/u16-u16-vsnprintf.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistdio/u16-u16-vsnprintf]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTDIO_U16_U16_VSNPRINTF +lib_SOURCES += unistdio/u16-u16-vsnprintf.c +endif Include: "unistdio.h" diff --git a/modules/unistdio/u16-u16-vsprintf b/modules/unistdio/u16-u16-vsprintf index aaf2c02e37..90b038797e 100644 --- a/modules/unistdio/u16-u16-vsprintf +++ b/modules/unistdio/u16-u16-vsprintf @@ -12,9 +12,12 @@ stdint errno configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistdio/u16-u16-vsprintf.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistdio/u16-u16-vsprintf]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTDIO_U16_U16_VSPRINTF +lib_SOURCES += unistdio/u16-u16-vsprintf.c +endif Include: "unistdio.h" diff --git a/modules/unistdio/u16-vasnprintf b/modules/unistdio/u16-vasnprintf index e72803993d..f71a120b66 100644 --- a/modules/unistdio/u16-vasnprintf +++ b/modules/unistdio/u16-vasnprintf @@ -47,9 +47,12 @@ multiarch configure.ac: gl_PREREQ_VASNPRINTF_WITH_EXTRAS -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistdio/u16-vasnprintf.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistdio/u16-vasnprintf]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTDIO_U16_VASNPRINTF +lib_SOURCES += unistdio/u16-vasnprintf.c +endif Include: "unistdio.h" diff --git a/modules/unistdio/u16-vasprintf b/modules/unistdio/u16-vasprintf index d6abf04ecd..788afa2e3e 100644 --- a/modules/unistdio/u16-vasprintf +++ b/modules/unistdio/u16-vasprintf @@ -11,9 +11,12 @@ unistdio/u16-vasnprintf errno configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistdio/u16-vasprintf.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistdio/u16-vasprintf]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTDIO_U16_VASPRINTF +lib_SOURCES += unistdio/u16-vasprintf.c +endif Include: "unistdio.h" diff --git a/modules/unistdio/u16-vsnprintf b/modules/unistdio/u16-vsnprintf index 7257c461c2..94c8f4d224 100644 --- a/modules/unistdio/u16-vsnprintf +++ b/modules/unistdio/u16-vsnprintf @@ -12,9 +12,12 @@ unistr/u16-cpy errno configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistdio/u16-vsnprintf.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistdio/u16-vsnprintf]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTDIO_U16_VSNPRINTF +lib_SOURCES += unistdio/u16-vsnprintf.c +endif Include: "unistdio.h" diff --git a/modules/unistdio/u16-vsprintf b/modules/unistdio/u16-vsprintf index 06314cca80..f829923d3e 100644 --- a/modules/unistdio/u16-vsprintf +++ b/modules/unistdio/u16-vsprintf @@ -12,9 +12,12 @@ stdint errno configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistdio/u16-vsprintf.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistdio/u16-vsprintf]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTDIO_U16_VSPRINTF +lib_SOURCES += unistdio/u16-vsprintf.c +endif Include: "unistdio.h" diff --git a/modules/unistdio/u32-asnprintf b/modules/unistdio/u32-asnprintf index 37c72a3ef4..ec49e1a2e8 100644 --- a/modules/unistdio/u32-asnprintf +++ b/modules/unistdio/u32-asnprintf @@ -11,9 +11,12 @@ unistdio/base unistdio/u32-vasnprintf configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistdio/u32-asnprintf.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistdio/u32-asnprintf]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTDIO_U32_ASNPRINTF +lib_SOURCES += unistdio/u32-asnprintf.c +endif Include: "unistdio.h" diff --git a/modules/unistdio/u32-asprintf b/modules/unistdio/u32-asprintf index a3e12c3bd5..4bcaaa2bbc 100644 --- a/modules/unistdio/u32-asprintf +++ b/modules/unistdio/u32-asprintf @@ -10,9 +10,12 @@ unistdio/base unistdio/u32-vasprintf configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistdio/u32-asprintf.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistdio/u32-asprintf]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTDIO_U32_ASPRINTF +lib_SOURCES += unistdio/u32-asprintf.c +endif Include: "unistdio.h" diff --git a/modules/unistdio/u32-snprintf b/modules/unistdio/u32-snprintf index d5a59206fc..7e0796645b 100644 --- a/modules/unistdio/u32-snprintf +++ b/modules/unistdio/u32-snprintf @@ -10,9 +10,12 @@ unistdio/base unistdio/u32-vsnprintf configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistdio/u32-snprintf.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistdio/u32-snprintf]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTDIO_U32_SNPRINTF +lib_SOURCES += unistdio/u32-snprintf.c +endif Include: "unistdio.h" diff --git a/modules/unistdio/u32-sprintf b/modules/unistdio/u32-sprintf index e385ac885d..e31d6f12bc 100644 --- a/modules/unistdio/u32-sprintf +++ b/modules/unistdio/u32-sprintf @@ -10,9 +10,12 @@ unistdio/base unistdio/u32-vsprintf configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistdio/u32-sprintf.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistdio/u32-sprintf]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTDIO_U32_SPRINTF +lib_SOURCES += unistdio/u32-sprintf.c +endif Include: "unistdio.h" diff --git a/modules/unistdio/u32-u32-asnprintf b/modules/unistdio/u32-u32-asnprintf index 13f9421194..1b14370192 100644 --- a/modules/unistdio/u32-u32-asnprintf +++ b/modules/unistdio/u32-u32-asnprintf @@ -11,9 +11,12 @@ unistdio/base unistdio/u32-u32-vasnprintf configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistdio/u32-u32-asnprintf.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistdio/u32-u32-asnprintf]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTDIO_U32_U32_ASNPRINTF +lib_SOURCES += unistdio/u32-u32-asnprintf.c +endif Include: "unistdio.h" diff --git a/modules/unistdio/u32-u32-asprintf b/modules/unistdio/u32-u32-asprintf index a7178804ef..a9de899ce0 100644 --- a/modules/unistdio/u32-u32-asprintf +++ b/modules/unistdio/u32-u32-asprintf @@ -10,9 +10,12 @@ unistdio/base unistdio/u32-u32-vasprintf configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistdio/u32-u32-asprintf.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistdio/u32-u32-asprintf]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTDIO_U32_U32_ASPRINTF +lib_SOURCES += unistdio/u32-u32-asprintf.c +endif Include: "unistdio.h" diff --git a/modules/unistdio/u32-u32-snprintf b/modules/unistdio/u32-u32-snprintf index b27e8e3a45..a429b37f13 100644 --- a/modules/unistdio/u32-u32-snprintf +++ b/modules/unistdio/u32-u32-snprintf @@ -10,9 +10,12 @@ unistdio/base unistdio/u32-u32-vsnprintf configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistdio/u32-u32-snprintf.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistdio/u32-u32-snprintf]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTDIO_U32_U32_SNPRINTF +lib_SOURCES += unistdio/u32-u32-snprintf.c +endif Include: "unistdio.h" diff --git a/modules/unistdio/u32-u32-sprintf b/modules/unistdio/u32-u32-sprintf index cd670845bf..2a13ba9034 100644 --- a/modules/unistdio/u32-u32-sprintf +++ b/modules/unistdio/u32-u32-sprintf @@ -10,9 +10,12 @@ unistdio/base unistdio/u32-u32-vsprintf configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistdio/u32-u32-sprintf.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistdio/u32-u32-sprintf]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTDIO_U32_U32_SPRINTF +lib_SOURCES += unistdio/u32-u32-sprintf.c +endif Include: "unistdio.h" diff --git a/modules/unistdio/u32-u32-vasnprintf b/modules/unistdio/u32-u32-vasnprintf index 45ae559d79..0b83fa81b3 100644 --- a/modules/unistdio/u32-u32-vasnprintf +++ b/modules/unistdio/u32-u32-vasnprintf @@ -47,9 +47,12 @@ multiarch configure.ac: gl_PREREQ_VASNPRINTF_WITH_EXTRAS -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistdio/u32-u32-vasnprintf.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistdio/u32-u32-vasnprintf]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTDIO_U32_U32_VASNPRINTF +lib_SOURCES += unistdio/u32-u32-vasnprintf.c +endif Include: "unistdio.h" diff --git a/modules/unistdio/u32-u32-vasprintf b/modules/unistdio/u32-u32-vasprintf index e6e508bb1b..5c49c8b01c 100644 --- a/modules/unistdio/u32-u32-vasprintf +++ b/modules/unistdio/u32-u32-vasprintf @@ -11,9 +11,12 @@ unistdio/u32-u32-vasnprintf errno configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistdio/u32-u32-vasprintf.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistdio/u32-u32-vasprintf]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTDIO_U32_U32_VASPRINTF +lib_SOURCES += unistdio/u32-u32-vasprintf.c +endif Include: "unistdio.h" diff --git a/modules/unistdio/u32-u32-vsnprintf b/modules/unistdio/u32-u32-vsnprintf index 1f39e2143a..9422ba6c75 100644 --- a/modules/unistdio/u32-u32-vsnprintf +++ b/modules/unistdio/u32-u32-vsnprintf @@ -12,9 +12,12 @@ unistr/u32-cpy errno configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistdio/u32-u32-vsnprintf.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistdio/u32-u32-vsnprintf]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTDIO_U32_U32_VSNPRINTF +lib_SOURCES += unistdio/u32-u32-vsnprintf.c +endif Include: "unistdio.h" diff --git a/modules/unistdio/u32-u32-vsprintf b/modules/unistdio/u32-u32-vsprintf index 774ca5eef3..32a8284bf9 100644 --- a/modules/unistdio/u32-u32-vsprintf +++ b/modules/unistdio/u32-u32-vsprintf @@ -12,9 +12,12 @@ stdint errno configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistdio/u32-u32-vsprintf.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistdio/u32-u32-vsprintf]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTDIO_U32_U32_VSPRINTF +lib_SOURCES += unistdio/u32-u32-vsprintf.c +endif Include: "unistdio.h" diff --git a/modules/unistdio/u32-vasnprintf b/modules/unistdio/u32-vasnprintf index 8ea35d9a9c..1a81597493 100644 --- a/modules/unistdio/u32-vasnprintf +++ b/modules/unistdio/u32-vasnprintf @@ -47,9 +47,12 @@ multiarch configure.ac: gl_PREREQ_VASNPRINTF_WITH_EXTRAS -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistdio/u32-vasnprintf.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistdio/u32-vasnprintf]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTDIO_U32_VASNPRINTF +lib_SOURCES += unistdio/u32-vasnprintf.c +endif Include: "unistdio.h" diff --git a/modules/unistdio/u32-vasprintf b/modules/unistdio/u32-vasprintf index 8dbe7988fd..a906ac98ee 100644 --- a/modules/unistdio/u32-vasprintf +++ b/modules/unistdio/u32-vasprintf @@ -11,9 +11,12 @@ unistdio/u32-vasnprintf errno configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistdio/u32-vasprintf.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistdio/u32-vasprintf]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTDIO_U32_VASPRINTF +lib_SOURCES += unistdio/u32-vasprintf.c +endif Include: "unistdio.h" diff --git a/modules/unistdio/u32-vsnprintf b/modules/unistdio/u32-vsnprintf index 3c4232ff28..26d2add61b 100644 --- a/modules/unistdio/u32-vsnprintf +++ b/modules/unistdio/u32-vsnprintf @@ -12,9 +12,12 @@ unistr/u32-cpy errno configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistdio/u32-vsnprintf.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistdio/u32-vsnprintf]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTDIO_U32_VSNPRINTF +lib_SOURCES += unistdio/u32-vsnprintf.c +endif Include: "unistdio.h" diff --git a/modules/unistdio/u32-vsprintf b/modules/unistdio/u32-vsprintf index 4f4525b18b..72c3d7bb36 100644 --- a/modules/unistdio/u32-vsprintf +++ b/modules/unistdio/u32-vsprintf @@ -12,9 +12,12 @@ stdint errno configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistdio/u32-vsprintf.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistdio/u32-vsprintf]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTDIO_U32_VSPRINTF +lib_SOURCES += unistdio/u32-vsprintf.c +endif Include: "unistdio.h" diff --git a/modules/unistdio/u8-asnprintf b/modules/unistdio/u8-asnprintf index c024248129..b1ea0b0e95 100644 --- a/modules/unistdio/u8-asnprintf +++ b/modules/unistdio/u8-asnprintf @@ -11,9 +11,12 @@ unistdio/base unistdio/u8-vasnprintf configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistdio/u8-asnprintf.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistdio/u8-asnprintf]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTDIO_U8_ASNPRINTF +lib_SOURCES += unistdio/u8-asnprintf.c +endif Include: "unistdio.h" diff --git a/modules/unistdio/u8-asprintf b/modules/unistdio/u8-asprintf index 1a87550416..d8eb3095e6 100644 --- a/modules/unistdio/u8-asprintf +++ b/modules/unistdio/u8-asprintf @@ -10,9 +10,12 @@ unistdio/base unistdio/u8-vasprintf configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistdio/u8-asprintf.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistdio/u8-asprintf]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTDIO_U8_ASPRINTF +lib_SOURCES += unistdio/u8-asprintf.c +endif Include: "unistdio.h" diff --git a/modules/unistdio/u8-snprintf b/modules/unistdio/u8-snprintf index 68f034d12c..0512890d56 100644 --- a/modules/unistdio/u8-snprintf +++ b/modules/unistdio/u8-snprintf @@ -10,9 +10,12 @@ unistdio/base unistdio/u8-vsnprintf configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistdio/u8-snprintf.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistdio/u8-snprintf]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTDIO_U8_SNPRINTF +lib_SOURCES += unistdio/u8-snprintf.c +endif Include: "unistdio.h" diff --git a/modules/unistdio/u8-sprintf b/modules/unistdio/u8-sprintf index c293c9aa60..20d8d302c7 100644 --- a/modules/unistdio/u8-sprintf +++ b/modules/unistdio/u8-sprintf @@ -10,9 +10,12 @@ unistdio/base unistdio/u8-vsprintf configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistdio/u8-sprintf.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistdio/u8-sprintf]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTDIO_U8_SPRINTF +lib_SOURCES += unistdio/u8-sprintf.c +endif Include: "unistdio.h" diff --git a/modules/unistdio/u8-u8-asnprintf b/modules/unistdio/u8-u8-asnprintf index eeb555fe19..5d9e674478 100644 --- a/modules/unistdio/u8-u8-asnprintf +++ b/modules/unistdio/u8-u8-asnprintf @@ -11,9 +11,12 @@ unistdio/base unistdio/u8-u8-vasnprintf configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistdio/u8-u8-asnprintf.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistdio/u8-u8-asnprintf]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTDIO_U8_U8_ASNPRINTF +lib_SOURCES += unistdio/u8-u8-asnprintf.c +endif Include: "unistdio.h" diff --git a/modules/unistdio/u8-u8-asprintf b/modules/unistdio/u8-u8-asprintf index 7707037aee..e87d525907 100644 --- a/modules/unistdio/u8-u8-asprintf +++ b/modules/unistdio/u8-u8-asprintf @@ -10,9 +10,12 @@ unistdio/base unistdio/u8-u8-vasprintf configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistdio/u8-u8-asprintf.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistdio/u8-u8-asprintf]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTDIO_U8_U8_ASPRINTF +lib_SOURCES += unistdio/u8-u8-asprintf.c +endif Include: "unistdio.h" diff --git a/modules/unistdio/u8-u8-snprintf b/modules/unistdio/u8-u8-snprintf index dbca0c8f3f..4e19f4b78d 100644 --- a/modules/unistdio/u8-u8-snprintf +++ b/modules/unistdio/u8-u8-snprintf @@ -10,9 +10,12 @@ unistdio/base unistdio/u8-u8-vsnprintf configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistdio/u8-u8-snprintf.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistdio/u8-u8-snprintf]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTDIO_U8_U8_SNPRINTF +lib_SOURCES += unistdio/u8-u8-snprintf.c +endif Include: "unistdio.h" diff --git a/modules/unistdio/u8-u8-sprintf b/modules/unistdio/u8-u8-sprintf index 17e71f292e..3b4e58ecda 100644 --- a/modules/unistdio/u8-u8-sprintf +++ b/modules/unistdio/u8-u8-sprintf @@ -10,9 +10,12 @@ unistdio/base unistdio/u8-u8-vsprintf configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistdio/u8-u8-sprintf.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistdio/u8-u8-sprintf]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTDIO_U8_U8_SPRINTF +lib_SOURCES += unistdio/u8-u8-sprintf.c +endif Include: "unistdio.h" diff --git a/modules/unistdio/u8-u8-vasnprintf b/modules/unistdio/u8-u8-vasnprintf index f4fef35fa7..612901ed62 100644 --- a/modules/unistdio/u8-u8-vasnprintf +++ b/modules/unistdio/u8-u8-vasnprintf @@ -47,9 +47,12 @@ multiarch configure.ac: gl_PREREQ_VASNPRINTF_WITH_EXTRAS -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistdio/u8-u8-vasnprintf.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistdio/u8-u8-vasnprintf]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTDIO_U8_U8_VASNPRINTF +lib_SOURCES += unistdio/u8-u8-vasnprintf.c +endif Include: "unistdio.h" diff --git a/modules/unistdio/u8-u8-vasprintf b/modules/unistdio/u8-u8-vasprintf index f4caa69e8d..35dbce9064 100644 --- a/modules/unistdio/u8-u8-vasprintf +++ b/modules/unistdio/u8-u8-vasprintf @@ -11,9 +11,12 @@ unistdio/u8-u8-vasnprintf errno configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistdio/u8-u8-vasprintf.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistdio/u8-u8-vasprintf]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTDIO_U8_U8_VASPRINTF +lib_SOURCES += unistdio/u8-u8-vasprintf.c +endif Include: "unistdio.h" diff --git a/modules/unistdio/u8-u8-vsnprintf b/modules/unistdio/u8-u8-vsnprintf index a3ba6ccc96..eef04cff2f 100644 --- a/modules/unistdio/u8-u8-vsnprintf +++ b/modules/unistdio/u8-u8-vsnprintf @@ -12,9 +12,12 @@ unistr/u8-cpy errno configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistdio/u8-u8-vsnprintf.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistdio/u8-u8-vsnprintf]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTDIO_U8_U8_VSNPRINTF +lib_SOURCES += unistdio/u8-u8-vsnprintf.c +endif Include: "unistdio.h" diff --git a/modules/unistdio/u8-u8-vsprintf b/modules/unistdio/u8-u8-vsprintf index 967ee70e06..05c5278417 100644 --- a/modules/unistdio/u8-u8-vsprintf +++ b/modules/unistdio/u8-u8-vsprintf @@ -12,9 +12,12 @@ stdint errno configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistdio/u8-u8-vsprintf.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistdio/u8-u8-vsprintf]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTDIO_U8_U8_VSPRINTF +lib_SOURCES += unistdio/u8-u8-vsprintf.c +endif Include: "unistdio.h" diff --git a/modules/unistdio/u8-vasnprintf b/modules/unistdio/u8-vasnprintf index b41d4e156a..6e651bb5d7 100644 --- a/modules/unistdio/u8-vasnprintf +++ b/modules/unistdio/u8-vasnprintf @@ -47,9 +47,12 @@ multiarch configure.ac: gl_PREREQ_VASNPRINTF_WITH_EXTRAS -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistdio/u8-vasnprintf.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistdio/u8-vasnprintf]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTDIO_U8_VASNPRINTF +lib_SOURCES += unistdio/u8-vasnprintf.c +endif Include: "unistdio.h" diff --git a/modules/unistdio/u8-vasprintf b/modules/unistdio/u8-vasprintf index 3fc1d5dde0..5fb1a5520e 100644 --- a/modules/unistdio/u8-vasprintf +++ b/modules/unistdio/u8-vasprintf @@ -11,9 +11,12 @@ unistdio/u8-vasnprintf errno configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistdio/u8-vasprintf.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistdio/u8-vasprintf]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTDIO_U8_VASPRINTF +lib_SOURCES += unistdio/u8-vasprintf.c +endif Include: "unistdio.h" diff --git a/modules/unistdio/u8-vsnprintf b/modules/unistdio/u8-vsnprintf index acf838ff54..ba2db32cee 100644 --- a/modules/unistdio/u8-vsnprintf +++ b/modules/unistdio/u8-vsnprintf @@ -12,9 +12,12 @@ unistr/u8-cpy errno configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistdio/u8-vsnprintf.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistdio/u8-vsnprintf]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTDIO_U8_VSNPRINTF +lib_SOURCES += unistdio/u8-vsnprintf.c +endif Include: "unistdio.h" diff --git a/modules/unistdio/u8-vsprintf b/modules/unistdio/u8-vsprintf index 3afb735945..a05a6edd4a 100644 --- a/modules/unistdio/u8-vsprintf +++ b/modules/unistdio/u8-vsprintf @@ -12,9 +12,12 @@ stdint errno configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistdio/u8-vsprintf.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistdio/u8-vsprintf]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTDIO_U8_VSPRINTF +lib_SOURCES += unistdio/u8-vsprintf.c +endif Include: "unistdio.h" diff --git a/modules/unistdio/ulc-asnprintf b/modules/unistdio/ulc-asnprintf index 534766e07b..4fd8ef6dba 100644 --- a/modules/unistdio/ulc-asnprintf +++ b/modules/unistdio/ulc-asnprintf @@ -11,9 +11,12 @@ unistdio/base unistdio/ulc-vasnprintf configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistdio/ulc-asnprintf.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistdio/ulc-asnprintf]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTDIO_ULC_ASNPRINTF +lib_SOURCES += unistdio/ulc-asnprintf.c +endif Include: "unistdio.h" diff --git a/modules/unistdio/ulc-asprintf b/modules/unistdio/ulc-asprintf index 040a89a6c5..9b6120725c 100644 --- a/modules/unistdio/ulc-asprintf +++ b/modules/unistdio/ulc-asprintf @@ -10,9 +10,12 @@ unistdio/base unistdio/ulc-vasprintf configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistdio/ulc-asprintf.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistdio/ulc-asprintf]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTDIO_ULC_ASPRINTF +lib_SOURCES += unistdio/ulc-asprintf.c +endif Include: "unistdio.h" diff --git a/modules/unistdio/ulc-fprintf b/modules/unistdio/ulc-fprintf index 3040638def..1044a34ecc 100644 --- a/modules/unistdio/ulc-fprintf +++ b/modules/unistdio/ulc-fprintf @@ -11,9 +11,12 @@ fseterr errno configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistdio/ulc-fprintf.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistdio/ulc-fprintf]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTDIO_ULC_FPRINTF +lib_SOURCES += unistdio/ulc-fprintf.c +endif Include: "unistdio.h" diff --git a/modules/unistdio/ulc-snprintf b/modules/unistdio/ulc-snprintf index 1e6fc32e18..a0f76167b3 100644 --- a/modules/unistdio/ulc-snprintf +++ b/modules/unistdio/ulc-snprintf @@ -10,9 +10,12 @@ unistdio/base unistdio/ulc-vsnprintf configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistdio/ulc-snprintf.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistdio/ulc-snprintf]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTDIO_ULC_SNPRINTF +lib_SOURCES += unistdio/ulc-snprintf.c +endif Include: "unistdio.h" diff --git a/modules/unistdio/ulc-sprintf b/modules/unistdio/ulc-sprintf index 0b3ede2fa3..892798ec2a 100644 --- a/modules/unistdio/ulc-sprintf +++ b/modules/unistdio/ulc-sprintf @@ -10,9 +10,12 @@ unistdio/base unistdio/ulc-vsprintf configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistdio/ulc-sprintf.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistdio/ulc-sprintf]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTDIO_ULC_SPRINTF +lib_SOURCES += unistdio/ulc-sprintf.c +endif Include: "unistdio.h" diff --git a/modules/unistdio/ulc-vasnprintf b/modules/unistdio/ulc-vasnprintf index 7126d2b745..8a6f2fc68f 100644 --- a/modules/unistdio/ulc-vasnprintf +++ b/modules/unistdio/ulc-vasnprintf @@ -45,9 +45,12 @@ multiarch configure.ac: gl_PREREQ_VASNPRINTF_WITH_EXTRAS -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistdio/ulc-vasnprintf.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistdio/ulc-vasnprintf]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTDIO_ULC_VASNPRINTF +lib_SOURCES += unistdio/ulc-vasnprintf.c +endif Include: "unistdio.h" diff --git a/modules/unistdio/ulc-vasprintf b/modules/unistdio/ulc-vasprintf index 91c93f6899..582ed80289 100644 --- a/modules/unistdio/ulc-vasprintf +++ b/modules/unistdio/ulc-vasprintf @@ -11,9 +11,12 @@ unistdio/ulc-vasnprintf errno configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistdio/ulc-vasprintf.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistdio/ulc-vasprintf]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTDIO_ULC_VASPRINTF +lib_SOURCES += unistdio/ulc-vasprintf.c +endif Include: "unistdio.h" diff --git a/modules/unistdio/ulc-vfprintf b/modules/unistdio/ulc-vfprintf index 317f95b442..5d9bf3ff20 100644 --- a/modules/unistdio/ulc-vfprintf +++ b/modules/unistdio/ulc-vfprintf @@ -11,9 +11,12 @@ fseterr errno configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistdio/ulc-vfprintf.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistdio/ulc-vfprintf]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTDIO_ULC_VFPRINTF +lib_SOURCES += unistdio/ulc-vfprintf.c +endif Include: "unistdio.h" diff --git a/modules/unistdio/ulc-vsnprintf b/modules/unistdio/ulc-vsnprintf index 8d7c0d7317..d577809b0b 100644 --- a/modules/unistdio/ulc-vsnprintf +++ b/modules/unistdio/ulc-vsnprintf @@ -11,9 +11,12 @@ unistdio/ulc-vasnprintf errno configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistdio/ulc-vsnprintf.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistdio/ulc-vsnprintf]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTDIO_ULC_VSNPRINTF +lib_SOURCES += unistdio/ulc-vsnprintf.c +endif Include: "unistdio.h" diff --git a/modules/unistdio/ulc-vsprintf b/modules/unistdio/ulc-vsprintf index 93346fa10f..c0ecacbb0d 100644 --- a/modules/unistdio/ulc-vsprintf +++ b/modules/unistdio/ulc-vsprintf @@ -12,9 +12,12 @@ stdint errno configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistdio/ulc-vsprintf.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistdio/ulc-vsprintf]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTDIO_ULC_VSPRINTF +lib_SOURCES += unistdio/ulc-vsprintf.c +endif Include: "unistdio.h" diff --git a/modules/unistr/u16-check b/modules/unistr/u16-check index d413b9699b..ff016a3b87 100644 --- a/modules/unistr/u16-check +++ b/modules/unistr/u16-check @@ -8,9 +8,12 @@ Depends-on: unistr/base configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistr/u16-check.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistr/u16-check]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTR_U16_CHECK +lib_SOURCES += unistr/u16-check.c +endif Include: "unistr.h" diff --git a/modules/unistr/u16-chr b/modules/unistr/u16-chr index 4de89e9dd8..d8d83ea796 100644 --- a/modules/unistr/u16-chr +++ b/modules/unistr/u16-chr @@ -9,9 +9,12 @@ unistr/base unistr/u16-uctomb configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistr/u16-chr.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistr/u16-chr]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTR_U16_CHR +lib_SOURCES += unistr/u16-chr.c +endif Include: "unistr.h" diff --git a/modules/unistr/u16-cmp b/modules/unistr/u16-cmp index 78cd1576d2..565ccdd65f 100644 --- a/modules/unistr/u16-cmp +++ b/modules/unistr/u16-cmp @@ -8,9 +8,12 @@ Depends-on: unistr/base configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistr/u16-cmp.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistr/u16-cmp]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTR_U16_CMP +lib_SOURCES += unistr/u16-cmp.c +endif Include: "unistr.h" diff --git a/modules/unistr/u16-cmp2 b/modules/unistr/u16-cmp2 index 38b1729ddb..16dba16879 100644 --- a/modules/unistr/u16-cmp2 +++ b/modules/unistr/u16-cmp2 @@ -11,9 +11,12 @@ unistr/u16-cmp minmax configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistr/u16-cmp2.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistr/u16-cmp2]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTR_U16_CMP2 +lib_SOURCES += unistr/u16-cmp2.c +endif Include: "unistr.h" diff --git a/modules/unistr/u16-cpy b/modules/unistr/u16-cpy index 5466951e2d..a673aab5cd 100644 --- a/modules/unistr/u16-cpy +++ b/modules/unistr/u16-cpy @@ -9,9 +9,12 @@ Depends-on: unistr/base configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistr/u16-cpy.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistr/u16-cpy]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTR_U16_CPY +lib_SOURCES += unistr/u16-cpy.c +endif Include: "unistr.h" diff --git a/modules/unistr/u16-cpy-alloc b/modules/unistr/u16-cpy-alloc index 52de6f85f7..e077da5eac 100644 --- a/modules/unistr/u16-cpy-alloc +++ b/modules/unistr/u16-cpy-alloc @@ -10,9 +10,12 @@ unistr/base malloc-posix configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistr/u16-cpy-alloc.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistr/u16-cpy-alloc]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTR_U16_CPY_ALLOC +lib_SOURCES += unistr/u16-cpy-alloc.c +endif Include: "unistr.h" diff --git a/modules/unistr/u16-endswith b/modules/unistr/u16-endswith index 7d6e7fbcee..46c5566e01 100644 --- a/modules/unistr/u16-endswith +++ b/modules/unistr/u16-endswith @@ -11,9 +11,12 @@ unistr/u16-strlen unistr/u16-cmp configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistr/u16-endswith.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistr/u16-endswith]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTR_U16_ENDSWITH +lib_SOURCES += unistr/u16-endswith.c +endif Include: "unistr.h" diff --git a/modules/unistr/u16-mblen b/modules/unistr/u16-mblen index dc381fb5e5..43a5ddb083 100644 --- a/modules/unistr/u16-mblen +++ b/modules/unistr/u16-mblen @@ -8,9 +8,12 @@ Depends-on: unistr/base configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistr/u16-mblen.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistr/u16-mblen]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTR_U16_MBLEN +lib_SOURCES += unistr/u16-mblen.c +endif Include: "unistr.h" diff --git a/modules/unistr/u16-mbsnlen b/modules/unistr/u16-mbsnlen index 7eb8812c24..161c68749f 100644 --- a/modules/unistr/u16-mbsnlen +++ b/modules/unistr/u16-mbsnlen @@ -9,9 +9,12 @@ unistr/base unistr/u16-mbtoucr configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistr/u16-mbsnlen.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistr/u16-mbsnlen]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTR_U16_MBSNLEN +lib_SOURCES += unistr/u16-mbsnlen.c +endif Include: "unistr.h" diff --git a/modules/unistr/u16-mbtouc b/modules/unistr/u16-mbtouc index 287fb8b803..a6ba2b0b74 100644 --- a/modules/unistr/u16-mbtouc +++ b/modules/unistr/u16-mbtouc @@ -10,9 +10,12 @@ unistr/base configure.ac: gl_MODULE_INDICATOR([unistr/u16-mbtouc]) -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistr/u16-mbtouc.c unistr/u16-mbtouc-aux.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistr/u16-mbtouc]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTR_U16_MBTOUC +lib_SOURCES += unistr/u16-mbtouc.c unistr/u16-mbtouc-aux.c +endif Include: "unistr.h" diff --git a/modules/unistr/u16-mbtouc-unsafe b/modules/unistr/u16-mbtouc-unsafe index d443b7fa43..d6c4f469e9 100644 --- a/modules/unistr/u16-mbtouc-unsafe +++ b/modules/unistr/u16-mbtouc-unsafe @@ -10,9 +10,12 @@ unistr/base configure.ac: gl_MODULE_INDICATOR([unistr/u16-mbtouc-unsafe]) -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistr/u16-mbtouc-unsafe.c unistr/u16-mbtouc-unsafe-aux.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistr/u16-mbtouc-unsafe]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTR_U16_MBTOUC_UNSAFE +lib_SOURCES += unistr/u16-mbtouc-unsafe.c unistr/u16-mbtouc-unsafe-aux.c +endif Include: "unistr.h" diff --git a/modules/unistr/u16-mbtoucr b/modules/unistr/u16-mbtoucr index ac2f559bfb..fd55889350 100644 --- a/modules/unistr/u16-mbtoucr +++ b/modules/unistr/u16-mbtoucr @@ -9,9 +9,12 @@ unistr/base configure.ac: gl_MODULE_INDICATOR([unistr/u16-mbtoucr]) -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistr/u16-mbtoucr.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistr/u16-mbtoucr]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTR_U16_MBTOUCR +lib_SOURCES += unistr/u16-mbtoucr.c +endif Include: "unistr.h" diff --git a/modules/unistr/u16-move b/modules/unistr/u16-move index a99ff6c70e..86a03e3a06 100644 --- a/modules/unistr/u16-move +++ b/modules/unistr/u16-move @@ -10,9 +10,12 @@ unistr/base memmove configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistr/u16-move.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistr/u16-move]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTR_U16_MOVE +lib_SOURCES += unistr/u16-move.c +endif Include: "unistr.h" diff --git a/modules/unistr/u16-next b/modules/unistr/u16-next index 92d61bf63a..becf428eb6 100644 --- a/modules/unistr/u16-next +++ b/modules/unistr/u16-next @@ -9,9 +9,12 @@ unistr/base unistr/u16-strmbtouc configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistr/u16-next.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistr/u16-next]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTR_U16_NEXT +lib_SOURCES += unistr/u16-next.c +endif Include: "unistr.h" diff --git a/modules/unistr/u16-prev b/modules/unistr/u16-prev index 91e2315d3b..af739f72f2 100644 --- a/modules/unistr/u16-prev +++ b/modules/unistr/u16-prev @@ -8,9 +8,12 @@ Depends-on: unistr/base configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistr/u16-prev.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistr/u16-prev]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTR_U16_PREV +lib_SOURCES += unistr/u16-prev.c +endif Include: "unistr.h" diff --git a/modules/unistr/u16-set b/modules/unistr/u16-set index bcd5a72f6a..d205937ccf 100644 --- a/modules/unistr/u16-set +++ b/modules/unistr/u16-set @@ -9,9 +9,12 @@ Depends-on: unistr/base configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistr/u16-set.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistr/u16-set]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTR_U16_SET +lib_SOURCES += unistr/u16-set.c +endif Include: "unistr.h" diff --git a/modules/unistr/u16-startswith b/modules/unistr/u16-startswith index 9274381224..03eb357834 100644 --- a/modules/unistr/u16-startswith +++ b/modules/unistr/u16-startswith @@ -9,9 +9,12 @@ Depends-on: unistr/base configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistr/u16-startswith.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistr/u16-startswith]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTR_U16_STARTSWITH +lib_SOURCES += unistr/u16-startswith.c +endif Include: "unistr.h" diff --git a/modules/unistr/u16-stpcpy b/modules/unistr/u16-stpcpy index c1313c3ea3..108cbd2c72 100644 --- a/modules/unistr/u16-stpcpy +++ b/modules/unistr/u16-stpcpy @@ -9,9 +9,12 @@ Depends-on: unistr/base configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistr/u16-stpcpy.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistr/u16-stpcpy]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTR_U16_STPCPY +lib_SOURCES += unistr/u16-stpcpy.c +endif Include: "unistr.h" diff --git a/modules/unistr/u16-stpncpy b/modules/unistr/u16-stpncpy index 89c1997b1e..96ae82191f 100644 --- a/modules/unistr/u16-stpncpy +++ b/modules/unistr/u16-stpncpy @@ -9,9 +9,12 @@ Depends-on: unistr/base configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9.3], [unistr/u16-stpncpy.c]) +gl_LIBUNISTRING_MODULE([0.9.3], [unistr/u16-stpncpy]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTR_U16_STPNCPY +lib_SOURCES += unistr/u16-stpncpy.c +endif Include: "unistr.h" diff --git a/modules/unistr/u16-strcat b/modules/unistr/u16-strcat index e7ee6ec75e..f2f13643e7 100644 --- a/modules/unistr/u16-strcat +++ b/modules/unistr/u16-strcat @@ -10,9 +10,12 @@ unistr/base unistr/u16-strlen configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistr/u16-strcat.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistr/u16-strcat]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTR_U16_STRCAT +lib_SOURCES += unistr/u16-strcat.c +endif Include: "unistr.h" diff --git a/modules/unistr/u16-strchr b/modules/unistr/u16-strchr index 8416ae749a..d38fa748c2 100644 --- a/modules/unistr/u16-strchr +++ b/modules/unistr/u16-strchr @@ -9,9 +9,12 @@ unistr/base unistr/u16-uctomb configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistr/u16-strchr.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistr/u16-strchr]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTR_U16_STRCHR +lib_SOURCES += unistr/u16-strchr.c +endif Include: "unistr.h" diff --git a/modules/unistr/u16-strcmp b/modules/unistr/u16-strcmp index 031d171839..25b9f871c3 100644 --- a/modules/unistr/u16-strcmp +++ b/modules/unistr/u16-strcmp @@ -8,9 +8,12 @@ Depends-on: unistr/base configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistr/u16-strcmp.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistr/u16-strcmp]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTR_U16_STRCMP +lib_SOURCES += unistr/u16-strcmp.c +endif Include: "unistr.h" diff --git a/modules/unistr/u16-strcoll b/modules/unistr/u16-strcoll index d364454f68..137c7faf67 100644 --- a/modules/unistr/u16-strcoll +++ b/modules/unistr/u16-strcoll @@ -12,9 +12,12 @@ uniconv/u16-strconv-to-enc localcharset configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9.4], [unistr/u16-strcoll.c]) +gl_LIBUNISTRING_MODULE([0.9.4], [unistr/u16-strcoll]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTR_U16_STRCOLL +lib_SOURCES += unistr/u16-strcoll.c +endif Include: "unistr.h" diff --git a/modules/unistr/u16-strcpy b/modules/unistr/u16-strcpy index 1c4eae1f0a..94480d89c8 100644 --- a/modules/unistr/u16-strcpy +++ b/modules/unistr/u16-strcpy @@ -9,9 +9,12 @@ Depends-on: unistr/base configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistr/u16-strcpy.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistr/u16-strcpy]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTR_U16_STRCPY +lib_SOURCES += unistr/u16-strcpy.c +endif Include: "unistr.h" diff --git a/modules/unistr/u16-strcspn b/modules/unistr/u16-strcspn index af67982ea2..763264c7c9 100644 --- a/modules/unistr/u16-strcspn +++ b/modules/unistr/u16-strcspn @@ -12,9 +12,12 @@ unistr/u16-strmbtouc unistr/u16-strchr configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistr/u16-strcspn.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistr/u16-strcspn]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTR_U16_STRCSPN +lib_SOURCES += unistr/u16-strcspn.c +endif Include: "unistr.h" diff --git a/modules/unistr/u16-strdup b/modules/unistr/u16-strdup index cf452c78bb..d6dbc8ef85 100644 --- a/modules/unistr/u16-strdup +++ b/modules/unistr/u16-strdup @@ -10,9 +10,12 @@ unistr/base unistr/u16-strlen configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistr/u16-strdup.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistr/u16-strdup]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTR_U16_STRDUP +lib_SOURCES += unistr/u16-strdup.c +endif Include: "unistr.h" diff --git a/modules/unistr/u16-strlen b/modules/unistr/u16-strlen index 978a19b554..cbe680d2f5 100644 --- a/modules/unistr/u16-strlen +++ b/modules/unistr/u16-strlen @@ -9,9 +9,12 @@ Depends-on: unistr/base configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistr/u16-strlen.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistr/u16-strlen]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTR_U16_STRLEN +lib_SOURCES += unistr/u16-strlen.c +endif Include: "unistr.h" diff --git a/modules/unistr/u16-strmblen b/modules/unistr/u16-strmblen index e5f97481e1..dfba8a4756 100644 --- a/modules/unistr/u16-strmblen +++ b/modules/unistr/u16-strmblen @@ -8,9 +8,12 @@ Depends-on: unistr/base configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistr/u16-strmblen.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistr/u16-strmblen]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTR_U16_STRMBLEN +lib_SOURCES += unistr/u16-strmblen.c +endif Include: "unistr.h" diff --git a/modules/unistr/u16-strmbtouc b/modules/unistr/u16-strmbtouc index 03375a88f3..c7e2fa03fe 100644 --- a/modules/unistr/u16-strmbtouc +++ b/modules/unistr/u16-strmbtouc @@ -8,9 +8,12 @@ Depends-on: unistr/base configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistr/u16-strmbtouc.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistr/u16-strmbtouc]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTR_U16_STRMBTOUC +lib_SOURCES += unistr/u16-strmbtouc.c +endif Include: "unistr.h" diff --git a/modules/unistr/u16-strncat b/modules/unistr/u16-strncat index 829b2cb3d2..d76bfa7ae9 100644 --- a/modules/unistr/u16-strncat +++ b/modules/unistr/u16-strncat @@ -10,9 +10,12 @@ unistr/base unistr/u16-strlen configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistr/u16-strncat.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistr/u16-strncat]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTR_U16_STRNCAT +lib_SOURCES += unistr/u16-strncat.c +endif Include: "unistr.h" diff --git a/modules/unistr/u16-strncmp b/modules/unistr/u16-strncmp index c846bf5176..6a177761c0 100644 --- a/modules/unistr/u16-strncmp +++ b/modules/unistr/u16-strncmp @@ -8,9 +8,12 @@ Depends-on: unistr/base configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistr/u16-strncmp.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistr/u16-strncmp]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTR_U16_STRNCMP +lib_SOURCES += unistr/u16-strncmp.c +endif Include: "unistr.h" diff --git a/modules/unistr/u16-strncpy b/modules/unistr/u16-strncpy index 5057598f88..cbcc636536 100644 --- a/modules/unistr/u16-strncpy +++ b/modules/unistr/u16-strncpy @@ -9,9 +9,12 @@ Depends-on: unistr/base configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistr/u16-strncpy.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistr/u16-strncpy]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTR_U16_STRNCPY +lib_SOURCES += unistr/u16-strncpy.c +endif Include: "unistr.h" diff --git a/modules/unistr/u16-strnlen b/modules/unistr/u16-strnlen index 3526faa3b2..9ab2b94826 100644 --- a/modules/unistr/u16-strnlen +++ b/modules/unistr/u16-strnlen @@ -9,9 +9,12 @@ Depends-on: unistr/base configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistr/u16-strnlen.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistr/u16-strnlen]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTR_U16_STRNLEN +lib_SOURCES += unistr/u16-strnlen.c +endif Include: "unistr.h" diff --git a/modules/unistr/u16-strpbrk b/modules/unistr/u16-strpbrk index fcb3ff364c..077c643baa 100644 --- a/modules/unistr/u16-strpbrk +++ b/modules/unistr/u16-strpbrk @@ -11,9 +11,12 @@ unistr/u16-strmbtouc unistr/u16-strchr configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistr/u16-strpbrk.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistr/u16-strpbrk]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTR_U16_STRPBRK +lib_SOURCES += unistr/u16-strpbrk.c +endif Include: "unistr.h" diff --git a/modules/unistr/u16-strrchr b/modules/unistr/u16-strrchr index db5802d833..ff6062fb88 100644 --- a/modules/unistr/u16-strrchr +++ b/modules/unistr/u16-strrchr @@ -9,9 +9,12 @@ unistr/base unistr/u16-uctomb configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistr/u16-strrchr.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistr/u16-strrchr]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTR_U16_STRRCHR +lib_SOURCES += unistr/u16-strrchr.c +endif Include: "unistr.h" diff --git a/modules/unistr/u16-strspn b/modules/unistr/u16-strspn index a8bf6349bd..4527eaf43c 100644 --- a/modules/unistr/u16-strspn +++ b/modules/unistr/u16-strspn @@ -13,9 +13,12 @@ unistr/u16-cmp unistr/u16-strchr configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistr/u16-strspn.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistr/u16-strspn]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTR_U16_STRSPN +lib_SOURCES += unistr/u16-strspn.c +endif Include: "unistr.h" diff --git a/modules/unistr/u16-strstr b/modules/unistr/u16-strstr index 087712125e..4f3b894faf 100644 --- a/modules/unistr/u16-strstr +++ b/modules/unistr/u16-strstr @@ -9,9 +9,12 @@ Depends-on: unistr/base configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistr/u16-strstr.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistr/u16-strstr]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTR_U16_STRSTR +lib_SOURCES += unistr/u16-strstr.c +endif Include: "unistr.h" diff --git a/modules/unistr/u16-strtok b/modules/unistr/u16-strtok index af4c3f8c7c..ae90fc1651 100644 --- a/modules/unistr/u16-strtok +++ b/modules/unistr/u16-strtok @@ -11,9 +11,12 @@ unistr/u16-strspn unistr/u16-strpbrk configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistr/u16-strtok.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistr/u16-strtok]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTR_U16_STRTOK +lib_SOURCES += unistr/u16-strtok.c +endif Include: "unistr.h" diff --git a/modules/unistr/u16-to-u32 b/modules/unistr/u16-to-u32 index eac9173a8d..2827704b5b 100644 --- a/modules/unistr/u16-to-u32 +++ b/modules/unistr/u16-to-u32 @@ -9,9 +9,12 @@ unistr/base unistr/u16-mbtoucr configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9.3], [unistr/u16-to-u32.c]) +gl_LIBUNISTRING_MODULE([0.9.3], [unistr/u16-to-u32]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTR_U16_TO_U32 +lib_SOURCES += unistr/u16-to-u32.c +endif Include: "unistr.h" diff --git a/modules/unistr/u16-to-u8 b/modules/unistr/u16-to-u8 index 14147059dc..6753ce36bb 100644 --- a/modules/unistr/u16-to-u8 +++ b/modules/unistr/u16-to-u8 @@ -10,9 +10,12 @@ unistr/u16-mbtoucr unistr/u8-uctomb configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9.3], [unistr/u16-to-u8.c]) +gl_LIBUNISTRING_MODULE([0.9.3], [unistr/u16-to-u8]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTR_U16_TO_U8 +lib_SOURCES += unistr/u16-to-u8.c +endif Include: "unistr.h" diff --git a/modules/unistr/u16-uctomb b/modules/unistr/u16-uctomb index 5c5eef21c1..8ffcd63ccb 100644 --- a/modules/unistr/u16-uctomb +++ b/modules/unistr/u16-uctomb @@ -10,9 +10,12 @@ unistr/base configure.ac: gl_MODULE_INDICATOR([unistr/u16-uctomb]) -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistr/u16-uctomb.c unistr/u16-uctomb-aux.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistr/u16-uctomb]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTR_U16_UCTOMB +lib_SOURCES += unistr/u16-uctomb.c unistr/u16-uctomb-aux.c +endif Include: "unistr.h" diff --git a/modules/unistr/u32-check b/modules/unistr/u32-check index 909c8da698..67ba98b8f5 100644 --- a/modules/unistr/u32-check +++ b/modules/unistr/u32-check @@ -8,9 +8,12 @@ Depends-on: unistr/base configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistr/u32-check.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistr/u32-check]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTR_U32_CHECK +lib_SOURCES += unistr/u32-check.c +endif Include: "unistr.h" diff --git a/modules/unistr/u32-chr b/modules/unistr/u32-chr index e38ce9fd65..5e2133b39c 100644 --- a/modules/unistr/u32-chr +++ b/modules/unistr/u32-chr @@ -8,9 +8,12 @@ Depends-on: unistr/base configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistr/u32-chr.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistr/u32-chr]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTR_U32_CHR +lib_SOURCES += unistr/u32-chr.c +endif Include: "unistr.h" diff --git a/modules/unistr/u32-cmp b/modules/unistr/u32-cmp index e9a0f0daa4..829ec31202 100644 --- a/modules/unistr/u32-cmp +++ b/modules/unistr/u32-cmp @@ -8,9 +8,12 @@ Depends-on: unistr/base configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistr/u32-cmp.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistr/u32-cmp]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTR_U32_CMP +lib_SOURCES += unistr/u32-cmp.c +endif Include: "unistr.h" diff --git a/modules/unistr/u32-cmp2 b/modules/unistr/u32-cmp2 index 9c70de6e43..4b44a9783c 100644 --- a/modules/unistr/u32-cmp2 +++ b/modules/unistr/u32-cmp2 @@ -11,9 +11,12 @@ unistr/u32-cmp minmax configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistr/u32-cmp2.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistr/u32-cmp2]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTR_U32_CMP2 +lib_SOURCES += unistr/u32-cmp2.c +endif Include: "unistr.h" diff --git a/modules/unistr/u32-cpy b/modules/unistr/u32-cpy index 2c58a7df83..1b2c1bcbc3 100644 --- a/modules/unistr/u32-cpy +++ b/modules/unistr/u32-cpy @@ -9,9 +9,12 @@ Depends-on: unistr/base configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistr/u32-cpy.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistr/u32-cpy]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTR_U32_CPY +lib_SOURCES += unistr/u32-cpy.c +endif Include: "unistr.h" diff --git a/modules/unistr/u32-cpy-alloc b/modules/unistr/u32-cpy-alloc index 30d680c1a7..9ca49acdf2 100644 --- a/modules/unistr/u32-cpy-alloc +++ b/modules/unistr/u32-cpy-alloc @@ -10,9 +10,12 @@ unistr/base malloc-posix configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistr/u32-cpy-alloc.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistr/u32-cpy-alloc]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTR_U32_CPY_ALLOC +lib_SOURCES += unistr/u32-cpy-alloc.c +endif Include: "unistr.h" diff --git a/modules/unistr/u32-endswith b/modules/unistr/u32-endswith index 6e30868eaf..14155d31be 100644 --- a/modules/unistr/u32-endswith +++ b/modules/unistr/u32-endswith @@ -11,9 +11,12 @@ unistr/u32-strlen unistr/u32-cmp configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistr/u32-endswith.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistr/u32-endswith]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTR_U32_ENDSWITH +lib_SOURCES += unistr/u32-endswith.c +endif Include: "unistr.h" diff --git a/modules/unistr/u32-mblen b/modules/unistr/u32-mblen index 8d2d5b4347..7508b4d09a 100644 --- a/modules/unistr/u32-mblen +++ b/modules/unistr/u32-mblen @@ -8,9 +8,12 @@ Depends-on: unistr/base configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistr/u32-mblen.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistr/u32-mblen]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTR_U32_MBLEN +lib_SOURCES += unistr/u32-mblen.c +endif Include: "unistr.h" diff --git a/modules/unistr/u32-mbsnlen b/modules/unistr/u32-mbsnlen index 07c91d0694..53423066c5 100644 --- a/modules/unistr/u32-mbsnlen +++ b/modules/unistr/u32-mbsnlen @@ -8,9 +8,12 @@ Depends-on: unistr/base configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistr/u32-mbsnlen.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistr/u32-mbsnlen]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTR_U32_MBSNLEN +lib_SOURCES += unistr/u32-mbsnlen.c +endif Include: "unistr.h" diff --git a/modules/unistr/u32-mbtouc b/modules/unistr/u32-mbtouc index 649c5e5241..939a240b54 100644 --- a/modules/unistr/u32-mbtouc +++ b/modules/unistr/u32-mbtouc @@ -9,9 +9,12 @@ unistr/base configure.ac: gl_MODULE_INDICATOR([unistr/u32-mbtouc]) -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistr/u32-mbtouc.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistr/u32-mbtouc]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTR_U32_MBTOUC +lib_SOURCES += unistr/u32-mbtouc.c +endif Include: "unistr.h" diff --git a/modules/unistr/u32-mbtouc-unsafe b/modules/unistr/u32-mbtouc-unsafe index aa5d1de68f..062f575445 100644 --- a/modules/unistr/u32-mbtouc-unsafe +++ b/modules/unistr/u32-mbtouc-unsafe @@ -9,9 +9,12 @@ unistr/base configure.ac: gl_MODULE_INDICATOR([unistr/u32-mbtouc-unsafe]) -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistr/u32-mbtouc-unsafe.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistr/u32-mbtouc-unsafe]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTR_U32_MBTOUC_UNSAFE +lib_SOURCES += unistr/u32-mbtouc-unsafe.c +endif Include: "unistr.h" diff --git a/modules/unistr/u32-mbtoucr b/modules/unistr/u32-mbtoucr index a86596d408..2b86019103 100644 --- a/modules/unistr/u32-mbtoucr +++ b/modules/unistr/u32-mbtoucr @@ -9,9 +9,12 @@ unistr/base configure.ac: gl_MODULE_INDICATOR([unistr/u32-mbtoucr]) -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistr/u32-mbtoucr.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistr/u32-mbtoucr]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTR_U32_MBTOUCR +lib_SOURCES += unistr/u32-mbtoucr.c +endif Include: "unistr.h" diff --git a/modules/unistr/u32-move b/modules/unistr/u32-move index 63d656ed87..f5a629c018 100644 --- a/modules/unistr/u32-move +++ b/modules/unistr/u32-move @@ -10,9 +10,12 @@ unistr/base memmove configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistr/u32-move.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistr/u32-move]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTR_U32_MOVE +lib_SOURCES += unistr/u32-move.c +endif Include: "unistr.h" diff --git a/modules/unistr/u32-next b/modules/unistr/u32-next index 9760e94ba7..57d242edac 100644 --- a/modules/unistr/u32-next +++ b/modules/unistr/u32-next @@ -9,9 +9,12 @@ unistr/base unistr/u32-strmbtouc configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistr/u32-next.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistr/u32-next]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTR_U32_NEXT +lib_SOURCES += unistr/u32-next.c +endif Include: "unistr.h" diff --git a/modules/unistr/u32-prev b/modules/unistr/u32-prev index 6e97db1cf9..f9b266f44f 100644 --- a/modules/unistr/u32-prev +++ b/modules/unistr/u32-prev @@ -8,9 +8,12 @@ Depends-on: unistr/base configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistr/u32-prev.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistr/u32-prev]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTR_U32_PREV +lib_SOURCES += unistr/u32-prev.c +endif Include: "unistr.h" diff --git a/modules/unistr/u32-set b/modules/unistr/u32-set index 2c02d350fe..4415660c3b 100644 --- a/modules/unistr/u32-set +++ b/modules/unistr/u32-set @@ -9,9 +9,12 @@ Depends-on: unistr/base configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistr/u32-set.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistr/u32-set]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTR_U32_SET +lib_SOURCES += unistr/u32-set.c +endif Include: "unistr.h" diff --git a/modules/unistr/u32-startswith b/modules/unistr/u32-startswith index 3e53da685c..867308f434 100644 --- a/modules/unistr/u32-startswith +++ b/modules/unistr/u32-startswith @@ -9,9 +9,12 @@ Depends-on: unistr/base configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistr/u32-startswith.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistr/u32-startswith]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTR_U32_STARTSWITH +lib_SOURCES += unistr/u32-startswith.c +endif Include: "unistr.h" diff --git a/modules/unistr/u32-stpcpy b/modules/unistr/u32-stpcpy index 56ad1cf569..b6b0f43f40 100644 --- a/modules/unistr/u32-stpcpy +++ b/modules/unistr/u32-stpcpy @@ -9,9 +9,12 @@ Depends-on: unistr/base configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistr/u32-stpcpy.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistr/u32-stpcpy]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTR_U32_STPCPY +lib_SOURCES += unistr/u32-stpcpy.c +endif Include: "unistr.h" diff --git a/modules/unistr/u32-stpncpy b/modules/unistr/u32-stpncpy index e2cf6b2502..0399174f73 100644 --- a/modules/unistr/u32-stpncpy +++ b/modules/unistr/u32-stpncpy @@ -9,9 +9,12 @@ Depends-on: unistr/base configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9.3], [unistr/u32-stpncpy.c]) +gl_LIBUNISTRING_MODULE([0.9.3], [unistr/u32-stpncpy]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTR_U32_STPNCPY +lib_SOURCES += unistr/u32-stpncpy.c +endif Include: "unistr.h" diff --git a/modules/unistr/u32-strcat b/modules/unistr/u32-strcat index e08f8791bb..0156d0450e 100644 --- a/modules/unistr/u32-strcat +++ b/modules/unistr/u32-strcat @@ -10,9 +10,12 @@ unistr/base unistr/u32-strlen configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistr/u32-strcat.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistr/u32-strcat]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTR_U32_STRCAT +lib_SOURCES += unistr/u32-strcat.c +endif Include: "unistr.h" diff --git a/modules/unistr/u32-strchr b/modules/unistr/u32-strchr index 62e3250e49..2b2a115a8d 100644 --- a/modules/unistr/u32-strchr +++ b/modules/unistr/u32-strchr @@ -8,9 +8,12 @@ Depends-on: unistr/base configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistr/u32-strchr.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistr/u32-strchr]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTR_U32_STRCHR +lib_SOURCES += unistr/u32-strchr.c +endif Include: "unistr.h" diff --git a/modules/unistr/u32-strcmp b/modules/unistr/u32-strcmp index 260cca3089..979b966d9c 100644 --- a/modules/unistr/u32-strcmp +++ b/modules/unistr/u32-strcmp @@ -8,9 +8,12 @@ Depends-on: unistr/base configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistr/u32-strcmp.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistr/u32-strcmp]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTR_U32_STRCMP +lib_SOURCES += unistr/u32-strcmp.c +endif Include: "unistr.h" diff --git a/modules/unistr/u32-strcoll b/modules/unistr/u32-strcoll index 1cdd595232..c4dea59e28 100644 --- a/modules/unistr/u32-strcoll +++ b/modules/unistr/u32-strcoll @@ -12,9 +12,12 @@ uniconv/u32-strconv-to-enc localcharset configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9.4], [unistr/u32-strcoll.c]) +gl_LIBUNISTRING_MODULE([0.9.4], [unistr/u32-strcoll]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTR_U32_STRCOLL +lib_SOURCES += unistr/u32-strcoll.c +endif Include: "unistr.h" diff --git a/modules/unistr/u32-strcpy b/modules/unistr/u32-strcpy index 58570be76e..b55d9c6fbd 100644 --- a/modules/unistr/u32-strcpy +++ b/modules/unistr/u32-strcpy @@ -9,9 +9,12 @@ Depends-on: unistr/base configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistr/u32-strcpy.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistr/u32-strcpy]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTR_U32_STRCPY +lib_SOURCES += unistr/u32-strcpy.c +endif Include: "unistr.h" diff --git a/modules/unistr/u32-strcspn b/modules/unistr/u32-strcspn index d4fa97b457..6d34f5e93a 100644 --- a/modules/unistr/u32-strcspn +++ b/modules/unistr/u32-strcspn @@ -10,9 +10,12 @@ unistr/u32-strlen unistr/u32-strchr configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistr/u32-strcspn.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistr/u32-strcspn]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTR_U32_STRCSPN +lib_SOURCES += unistr/u32-strcspn.c +endif Include: "unistr.h" diff --git a/modules/unistr/u32-strdup b/modules/unistr/u32-strdup index c785462835..4e807f6a61 100644 --- a/modules/unistr/u32-strdup +++ b/modules/unistr/u32-strdup @@ -10,9 +10,12 @@ unistr/base unistr/u32-strlen configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistr/u32-strdup.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistr/u32-strdup]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTR_U32_STRDUP +lib_SOURCES += unistr/u32-strdup.c +endif Include: "unistr.h" diff --git a/modules/unistr/u32-strlen b/modules/unistr/u32-strlen index d8f73cc70f..35892d0a3d 100644 --- a/modules/unistr/u32-strlen +++ b/modules/unistr/u32-strlen @@ -9,9 +9,12 @@ Depends-on: unistr/base configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistr/u32-strlen.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistr/u32-strlen]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTR_U32_STRLEN +lib_SOURCES += unistr/u32-strlen.c +endif Include: "unistr.h" diff --git a/modules/unistr/u32-strmblen b/modules/unistr/u32-strmblen index 6dd56337c4..c9e31fe5fb 100644 --- a/modules/unistr/u32-strmblen +++ b/modules/unistr/u32-strmblen @@ -8,9 +8,12 @@ Depends-on: unistr/base configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistr/u32-strmblen.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistr/u32-strmblen]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTR_U32_STRMBLEN +lib_SOURCES += unistr/u32-strmblen.c +endif Include: "unistr.h" diff --git a/modules/unistr/u32-strmbtouc b/modules/unistr/u32-strmbtouc index ee01aae1c4..c16086a7d4 100644 --- a/modules/unistr/u32-strmbtouc +++ b/modules/unistr/u32-strmbtouc @@ -8,9 +8,12 @@ Depends-on: unistr/base configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistr/u32-strmbtouc.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistr/u32-strmbtouc]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTR_U32_STRMBTOUC +lib_SOURCES += unistr/u32-strmbtouc.c +endif Include: "unistr.h" diff --git a/modules/unistr/u32-strncat b/modules/unistr/u32-strncat index 69e53e7c26..9d746a5170 100644 --- a/modules/unistr/u32-strncat +++ b/modules/unistr/u32-strncat @@ -10,9 +10,12 @@ unistr/base unistr/u32-strlen configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistr/u32-strncat.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistr/u32-strncat]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTR_U32_STRNCAT +lib_SOURCES += unistr/u32-strncat.c +endif Include: "unistr.h" diff --git a/modules/unistr/u32-strncmp b/modules/unistr/u32-strncmp index d139f0b63d..26ecc5a90a 100644 --- a/modules/unistr/u32-strncmp +++ b/modules/unistr/u32-strncmp @@ -8,9 +8,12 @@ Depends-on: unistr/base configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistr/u32-strncmp.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistr/u32-strncmp]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTR_U32_STRNCMP +lib_SOURCES += unistr/u32-strncmp.c +endif Include: "unistr.h" diff --git a/modules/unistr/u32-strncpy b/modules/unistr/u32-strncpy index 342ce2133d..a5670cf1bf 100644 --- a/modules/unistr/u32-strncpy +++ b/modules/unistr/u32-strncpy @@ -9,9 +9,12 @@ Depends-on: unistr/base configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistr/u32-strncpy.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistr/u32-strncpy]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTR_U32_STRNCPY +lib_SOURCES += unistr/u32-strncpy.c +endif Include: "unistr.h" diff --git a/modules/unistr/u32-strnlen b/modules/unistr/u32-strnlen index 8d5c0e4461..83bb7ce484 100644 --- a/modules/unistr/u32-strnlen +++ b/modules/unistr/u32-strnlen @@ -9,9 +9,12 @@ Depends-on: unistr/base configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistr/u32-strnlen.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistr/u32-strnlen]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTR_U32_STRNLEN +lib_SOURCES += unistr/u32-strnlen.c +endif Include: "unistr.h" diff --git a/modules/unistr/u32-strpbrk b/modules/unistr/u32-strpbrk index 79809e4cf3..42b2189c00 100644 --- a/modules/unistr/u32-strpbrk +++ b/modules/unistr/u32-strpbrk @@ -9,9 +9,12 @@ unistr/base unistr/u32-strchr configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistr/u32-strpbrk.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistr/u32-strpbrk]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTR_U32_STRPBRK +lib_SOURCES += unistr/u32-strpbrk.c +endif Include: "unistr.h" diff --git a/modules/unistr/u32-strrchr b/modules/unistr/u32-strrchr index d64066afc8..6bdac46563 100644 --- a/modules/unistr/u32-strrchr +++ b/modules/unistr/u32-strrchr @@ -8,9 +8,12 @@ Depends-on: unistr/base configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistr/u32-strrchr.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistr/u32-strrchr]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTR_U32_STRRCHR +lib_SOURCES += unistr/u32-strrchr.c +endif Include: "unistr.h" diff --git a/modules/unistr/u32-strspn b/modules/unistr/u32-strspn index e30497df4c..f3a257a3b7 100644 --- a/modules/unistr/u32-strspn +++ b/modules/unistr/u32-strspn @@ -9,9 +9,12 @@ unistr/base unistr/u32-strchr configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistr/u32-strspn.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistr/u32-strspn]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTR_U32_STRSPN +lib_SOURCES += unistr/u32-strspn.c +endif Include: "unistr.h" diff --git a/modules/unistr/u32-strstr b/modules/unistr/u32-strstr index e3223c2943..3ca816f261 100644 --- a/modules/unistr/u32-strstr +++ b/modules/unistr/u32-strstr @@ -9,9 +9,12 @@ Depends-on: unistr/base configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistr/u32-strstr.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistr/u32-strstr]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTR_U32_STRSTR +lib_SOURCES += unistr/u32-strstr.c +endif Include: "unistr.h" diff --git a/modules/unistr/u32-strtok b/modules/unistr/u32-strtok index d0b5d6a5ee..b8863a2fc5 100644 --- a/modules/unistr/u32-strtok +++ b/modules/unistr/u32-strtok @@ -11,9 +11,12 @@ unistr/u32-strspn unistr/u32-strpbrk configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistr/u32-strtok.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistr/u32-strtok]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTR_U32_STRTOK +lib_SOURCES += unistr/u32-strtok.c +endif Include: "unistr.h" diff --git a/modules/unistr/u32-to-u16 b/modules/unistr/u32-to-u16 index 7588128e72..69de5427b7 100644 --- a/modules/unistr/u32-to-u16 +++ b/modules/unistr/u32-to-u16 @@ -9,9 +9,12 @@ unistr/base unistr/u16-uctomb configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistr/u32-to-u16.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistr/u32-to-u16]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTR_U32_TO_U16 +lib_SOURCES += unistr/u32-to-u16.c +endif Include: "unistr.h" diff --git a/modules/unistr/u32-to-u8 b/modules/unistr/u32-to-u8 index 07a4a6239c..4c8deb4b6a 100644 --- a/modules/unistr/u32-to-u8 +++ b/modules/unistr/u32-to-u8 @@ -9,9 +9,12 @@ unistr/base unistr/u8-uctomb configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistr/u32-to-u8.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistr/u32-to-u8]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTR_U32_TO_U8 +lib_SOURCES += unistr/u32-to-u8.c +endif Include: "unistr.h" diff --git a/modules/unistr/u32-uctomb b/modules/unistr/u32-uctomb index de751c4c36..86e7c3592a 100644 --- a/modules/unistr/u32-uctomb +++ b/modules/unistr/u32-uctomb @@ -9,9 +9,12 @@ unistr/base configure.ac: gl_MODULE_INDICATOR([unistr/u32-uctomb]) -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistr/u32-uctomb.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistr/u32-uctomb]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTR_U32_UCTOMB +lib_SOURCES += unistr/u32-uctomb.c +endif Include: "unistr.h" diff --git a/modules/unistr/u8-check b/modules/unistr/u8-check index 755d4155ba..dd6ce6115b 100644 --- a/modules/unistr/u8-check +++ b/modules/unistr/u8-check @@ -8,9 +8,12 @@ Depends-on: unistr/base configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistr/u8-check.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistr/u8-check]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTR_U8_CHECK +lib_SOURCES += unistr/u8-check.c +endif Include: "unistr.h" diff --git a/modules/unistr/u8-chr b/modules/unistr/u8-chr index 2e04f56860..6f5de6c721 100644 --- a/modules/unistr/u8-chr +++ b/modules/unistr/u8-chr @@ -9,9 +9,12 @@ unistr/base unistr/u8-uctomb configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistr/u8-chr.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistr/u8-chr]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTR_U8_CHR +lib_SOURCES += unistr/u8-chr.c +endif Include: "unistr.h" diff --git a/modules/unistr/u8-cmp b/modules/unistr/u8-cmp index 8b8bc4de4a..0c5bc513b7 100644 --- a/modules/unistr/u8-cmp +++ b/modules/unistr/u8-cmp @@ -9,9 +9,12 @@ unistr/base memcmp configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistr/u8-cmp.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistr/u8-cmp]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTR_U8_CMP +lib_SOURCES += unistr/u8-cmp.c +endif Include: "unistr.h" diff --git a/modules/unistr/u8-cmp2 b/modules/unistr/u8-cmp2 index a010d553f1..f6d3147757 100644 --- a/modules/unistr/u8-cmp2 +++ b/modules/unistr/u8-cmp2 @@ -11,9 +11,12 @@ unistr/u8-cmp minmax configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistr/u8-cmp2.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistr/u8-cmp2]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTR_U8_CMP2 +lib_SOURCES += unistr/u8-cmp2.c +endif Include: "unistr.h" diff --git a/modules/unistr/u8-cpy b/modules/unistr/u8-cpy index 05c0970788..f4bdde8605 100644 --- a/modules/unistr/u8-cpy +++ b/modules/unistr/u8-cpy @@ -9,9 +9,12 @@ Depends-on: unistr/base configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistr/u8-cpy.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistr/u8-cpy]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTR_U8_CPY +lib_SOURCES += unistr/u8-cpy.c +endif Include: "unistr.h" diff --git a/modules/unistr/u8-cpy-alloc b/modules/unistr/u8-cpy-alloc index ea0140cfb7..094348172c 100644 --- a/modules/unistr/u8-cpy-alloc +++ b/modules/unistr/u8-cpy-alloc @@ -10,9 +10,12 @@ unistr/base malloc-posix configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistr/u8-cpy-alloc.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistr/u8-cpy-alloc]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTR_U8_CPY_ALLOC +lib_SOURCES += unistr/u8-cpy-alloc.c +endif Include: "unistr.h" diff --git a/modules/unistr/u8-endswith b/modules/unistr/u8-endswith index 2725983ed4..be1fa9c7a2 100644 --- a/modules/unistr/u8-endswith +++ b/modules/unistr/u8-endswith @@ -11,9 +11,12 @@ unistr/u8-strlen unistr/u8-cmp configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistr/u8-endswith.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistr/u8-endswith]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTR_U8_ENDSWITH +lib_SOURCES += unistr/u8-endswith.c +endif Include: "unistr.h" diff --git a/modules/unistr/u8-mblen b/modules/unistr/u8-mblen index a3c2288890..e770c80c85 100644 --- a/modules/unistr/u8-mblen +++ b/modules/unistr/u8-mblen @@ -8,9 +8,12 @@ Depends-on: unistr/base configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistr/u8-mblen.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistr/u8-mblen]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTR_U8_MBLEN +lib_SOURCES += unistr/u8-mblen.c +endif Include: "unistr.h" diff --git a/modules/unistr/u8-mbsnlen b/modules/unistr/u8-mbsnlen index 83e5817a22..bc5c60cd6d 100644 --- a/modules/unistr/u8-mbsnlen +++ b/modules/unistr/u8-mbsnlen @@ -9,9 +9,12 @@ unistr/base unistr/u8-mbtoucr configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9.3], [unistr/u8-mbsnlen.c]) +gl_LIBUNISTRING_MODULE([0.9.3], [unistr/u8-mbsnlen]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTR_U8_MBSNLEN +lib_SOURCES += unistr/u8-mbsnlen.c +endif Include: "unistr.h" diff --git a/modules/unistr/u8-mbtouc b/modules/unistr/u8-mbtouc index fb340460fc..d64acf7d43 100644 --- a/modules/unistr/u8-mbtouc +++ b/modules/unistr/u8-mbtouc @@ -10,9 +10,12 @@ unistr/base configure.ac: gl_MODULE_INDICATOR([unistr/u8-mbtouc]) -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistr/u8-mbtouc.c unistr/u8-mbtouc-aux.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistr/u8-mbtouc]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTR_U8_MBTOUC +lib_SOURCES += unistr/u8-mbtouc.c unistr/u8-mbtouc-aux.c +endif Include: "unistr.h" diff --git a/modules/unistr/u8-mbtouc-unsafe b/modules/unistr/u8-mbtouc-unsafe index daec9920e1..e083a86815 100644 --- a/modules/unistr/u8-mbtouc-unsafe +++ b/modules/unistr/u8-mbtouc-unsafe @@ -10,9 +10,12 @@ unistr/base configure.ac: gl_MODULE_INDICATOR([unistr/u8-mbtouc-unsafe]) -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistr/u8-mbtouc-unsafe.c unistr/u8-mbtouc-unsafe-aux.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistr/u8-mbtouc-unsafe]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTR_U8_MBTOUC_UNSAFE +lib_SOURCES += unistr/u8-mbtouc-unsafe.c unistr/u8-mbtouc-unsafe-aux.c +endif Include: "unistr.h" diff --git a/modules/unistr/u8-mbtoucr b/modules/unistr/u8-mbtoucr index 65c418a0cd..ebfb7ab5df 100644 --- a/modules/unistr/u8-mbtoucr +++ b/modules/unistr/u8-mbtoucr @@ -9,9 +9,12 @@ unistr/base configure.ac: gl_MODULE_INDICATOR([unistr/u8-mbtoucr]) -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistr/u8-mbtoucr.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistr/u8-mbtoucr]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTR_U8_MBTOUCR +lib_SOURCES += unistr/u8-mbtoucr.c +endif Include: "unistr.h" diff --git a/modules/unistr/u8-move b/modules/unistr/u8-move index 79e0709659..4351275d86 100644 --- a/modules/unistr/u8-move +++ b/modules/unistr/u8-move @@ -10,9 +10,12 @@ unistr/base memmove configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistr/u8-move.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistr/u8-move]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTR_U8_MOVE +lib_SOURCES += unistr/u8-move.c +endif Include: "unistr.h" diff --git a/modules/unistr/u8-next b/modules/unistr/u8-next index 68ca3a498e..6f9ab0e193 100644 --- a/modules/unistr/u8-next +++ b/modules/unistr/u8-next @@ -9,9 +9,12 @@ unistr/base unistr/u8-strmbtouc configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistr/u8-next.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistr/u8-next]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTR_U8_NEXT +lib_SOURCES += unistr/u8-next.c +endif Include: "unistr.h" diff --git a/modules/unistr/u8-prev b/modules/unistr/u8-prev index 8d1f7e8856..6b8839af0e 100644 --- a/modules/unistr/u8-prev +++ b/modules/unistr/u8-prev @@ -8,9 +8,12 @@ Depends-on: unistr/base configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistr/u8-prev.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistr/u8-prev]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTR_U8_PREV +lib_SOURCES += unistr/u8-prev.c +endif Include: "unistr.h" diff --git a/modules/unistr/u8-set b/modules/unistr/u8-set index b992324ce6..e3193c189b 100644 --- a/modules/unistr/u8-set +++ b/modules/unistr/u8-set @@ -8,9 +8,12 @@ Depends-on: unistr/base configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistr/u8-set.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistr/u8-set]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTR_U8_SET +lib_SOURCES += unistr/u8-set.c +endif Include: "unistr.h" diff --git a/modules/unistr/u8-startswith b/modules/unistr/u8-startswith index 195bc2a1bd..142262ab14 100644 --- a/modules/unistr/u8-startswith +++ b/modules/unistr/u8-startswith @@ -9,9 +9,12 @@ Depends-on: unistr/base configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistr/u8-startswith.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistr/u8-startswith]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTR_U8_STARTSWITH +lib_SOURCES += unistr/u8-startswith.c +endif Include: "unistr.h" diff --git a/modules/unistr/u8-stpcpy b/modules/unistr/u8-stpcpy index 3c3ea19a04..ed9cd4f64b 100644 --- a/modules/unistr/u8-stpcpy +++ b/modules/unistr/u8-stpcpy @@ -10,9 +10,12 @@ unistr/base configure.ac: AC_CHECK_FUNCS_ONCE([stpcpy]) -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistr/u8-stpcpy.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistr/u8-stpcpy]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTR_U8_STPCPY +lib_SOURCES += unistr/u8-stpcpy.c +endif Include: "unistr.h" diff --git a/modules/unistr/u8-stpncpy b/modules/unistr/u8-stpncpy index 74e2bfb24a..1f525e5d4e 100644 --- a/modules/unistr/u8-stpncpy +++ b/modules/unistr/u8-stpncpy @@ -9,9 +9,12 @@ Depends-on: unistr/base configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9.3], [unistr/u8-stpncpy.c]) +gl_LIBUNISTRING_MODULE([0.9.3], [unistr/u8-stpncpy]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTR_U8_STPNCPY +lib_SOURCES += unistr/u8-stpncpy.c +endif Include: "unistr.h" diff --git a/modules/unistr/u8-strcat b/modules/unistr/u8-strcat index b8d4b5e9f4..39763bb847 100644 --- a/modules/unistr/u8-strcat +++ b/modules/unistr/u8-strcat @@ -8,9 +8,12 @@ Depends-on: unistr/base configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistr/u8-strcat.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistr/u8-strcat]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTR_U8_STRCAT +lib_SOURCES += unistr/u8-strcat.c +endif Include: "unistr.h" diff --git a/modules/unistr/u8-strchr b/modules/unistr/u8-strchr index 12734c233a..da486e3c9f 100644 --- a/modules/unistr/u8-strchr +++ b/modules/unistr/u8-strchr @@ -9,9 +9,12 @@ unistr/base unistr/u8-uctomb configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistr/u8-strchr.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistr/u8-strchr]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTR_U8_STRCHR +lib_SOURCES += unistr/u8-strchr.c +endif Include: "unistr.h" diff --git a/modules/unistr/u8-strcmp b/modules/unistr/u8-strcmp index e05d8de368..32ea95beb9 100644 --- a/modules/unistr/u8-strcmp +++ b/modules/unistr/u8-strcmp @@ -8,9 +8,12 @@ Depends-on: unistr/base configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistr/u8-strcmp.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistr/u8-strcmp]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTR_U8_STRCMP +lib_SOURCES += unistr/u8-strcmp.c +endif Include: "unistr.h" diff --git a/modules/unistr/u8-strcoll b/modules/unistr/u8-strcoll index 45d563f556..9f4c354105 100644 --- a/modules/unistr/u8-strcoll +++ b/modules/unistr/u8-strcoll @@ -12,9 +12,12 @@ uniconv/u8-strconv-to-enc localcharset configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9.4], [unistr/u8-strcoll.c]) +gl_LIBUNISTRING_MODULE([0.9.4], [unistr/u8-strcoll]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTR_U8_STRCOLL +lib_SOURCES += unistr/u8-strcoll.c +endif Include: "unistr.h" diff --git a/modules/unistr/u8-strcpy b/modules/unistr/u8-strcpy index cd506a62b8..208820027c 100644 --- a/modules/unistr/u8-strcpy +++ b/modules/unistr/u8-strcpy @@ -8,9 +8,12 @@ Depends-on: unistr/base configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistr/u8-strcpy.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistr/u8-strcpy]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTR_U8_STRCPY +lib_SOURCES += unistr/u8-strcpy.c +endif Include: "unistr.h" diff --git a/modules/unistr/u8-strcspn b/modules/unistr/u8-strcspn index a6912e4217..d876be2fe6 100644 --- a/modules/unistr/u8-strcspn +++ b/modules/unistr/u8-strcspn @@ -12,9 +12,12 @@ unistr/u8-strmbtouc unistr/u8-strchr configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistr/u8-strcspn.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistr/u8-strcspn]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTR_U8_STRCSPN +lib_SOURCES += unistr/u8-strcspn.c +endif Include: "unistr.h" diff --git a/modules/unistr/u8-strdup b/modules/unistr/u8-strdup index a81c94e598..e634effcaa 100644 --- a/modules/unistr/u8-strdup +++ b/modules/unistr/u8-strdup @@ -11,9 +11,12 @@ unistr/u8-strlen configure.ac: AC_CHECK_FUNCS_ONCE([strdup]) -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistr/u8-strdup.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistr/u8-strdup]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTR_U8_STRDUP +lib_SOURCES += unistr/u8-strdup.c +endif Include: "unistr.h" diff --git a/modules/unistr/u8-strlen b/modules/unistr/u8-strlen index 01272e7512..c48b26cdfe 100644 --- a/modules/unistr/u8-strlen +++ b/modules/unistr/u8-strlen @@ -8,9 +8,12 @@ Depends-on: unistr/base configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistr/u8-strlen.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistr/u8-strlen]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTR_U8_STRLEN +lib_SOURCES += unistr/u8-strlen.c +endif Include: "unistr.h" diff --git a/modules/unistr/u8-strmblen b/modules/unistr/u8-strmblen index 06434ee1bd..77c1a769f0 100644 --- a/modules/unistr/u8-strmblen +++ b/modules/unistr/u8-strmblen @@ -8,9 +8,12 @@ Depends-on: unistr/base configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistr/u8-strmblen.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistr/u8-strmblen]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTR_U8_STRMBLEN +lib_SOURCES += unistr/u8-strmblen.c +endif Include: "unistr.h" diff --git a/modules/unistr/u8-strmbtouc b/modules/unistr/u8-strmbtouc index 5a72adffb4..e76dc732ff 100644 --- a/modules/unistr/u8-strmbtouc +++ b/modules/unistr/u8-strmbtouc @@ -8,9 +8,12 @@ Depends-on: unistr/base configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistr/u8-strmbtouc.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistr/u8-strmbtouc]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTR_U8_STRMBTOUC +lib_SOURCES += unistr/u8-strmbtouc.c +endif Include: "unistr.h" diff --git a/modules/unistr/u8-strncat b/modules/unistr/u8-strncat index 6921cea77a..a1e8398b26 100644 --- a/modules/unistr/u8-strncat +++ b/modules/unistr/u8-strncat @@ -9,9 +9,12 @@ unistr/base strncat configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistr/u8-strncat.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistr/u8-strncat]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTR_U8_STRNCAT +lib_SOURCES += unistr/u8-strncat.c +endif Include: "unistr.h" diff --git a/modules/unistr/u8-strncmp b/modules/unistr/u8-strncmp index f55db2ce9d..04d696a9d8 100644 --- a/modules/unistr/u8-strncmp +++ b/modules/unistr/u8-strncmp @@ -8,9 +8,12 @@ Depends-on: unistr/base configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistr/u8-strncmp.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistr/u8-strncmp]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTR_U8_STRNCMP +lib_SOURCES += unistr/u8-strncmp.c +endif Include: "unistr.h" diff --git a/modules/unistr/u8-strncpy b/modules/unistr/u8-strncpy index 02e16de71c..cc4af9b666 100644 --- a/modules/unistr/u8-strncpy +++ b/modules/unistr/u8-strncpy @@ -8,9 +8,12 @@ Depends-on: unistr/base configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistr/u8-strncpy.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistr/u8-strncpy]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTR_U8_STRNCPY +lib_SOURCES += unistr/u8-strncpy.c +endif Include: "unistr.h" diff --git a/modules/unistr/u8-strnlen b/modules/unistr/u8-strnlen index 6ac9529469..a976e617bf 100644 --- a/modules/unistr/u8-strnlen +++ b/modules/unistr/u8-strnlen @@ -9,9 +9,12 @@ Depends-on: unistr/base configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistr/u8-strnlen.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistr/u8-strnlen]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTR_U8_STRNLEN +lib_SOURCES += unistr/u8-strnlen.c +endif Include: "unistr.h" diff --git a/modules/unistr/u8-strpbrk b/modules/unistr/u8-strpbrk index 54aca5aa39..db6d74b2d3 100644 --- a/modules/unistr/u8-strpbrk +++ b/modules/unistr/u8-strpbrk @@ -11,9 +11,12 @@ unistr/u8-strmbtouc unistr/u8-strchr configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistr/u8-strpbrk.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistr/u8-strpbrk]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTR_U8_STRPBRK +lib_SOURCES += unistr/u8-strpbrk.c +endif Include: "unistr.h" diff --git a/modules/unistr/u8-strrchr b/modules/unistr/u8-strrchr index faf88007ff..ef87b474af 100644 --- a/modules/unistr/u8-strrchr +++ b/modules/unistr/u8-strrchr @@ -9,9 +9,12 @@ unistr/base unistr/u8-uctomb configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistr/u8-strrchr.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistr/u8-strrchr]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTR_U8_STRRCHR +lib_SOURCES += unistr/u8-strrchr.c +endif Include: "unistr.h" diff --git a/modules/unistr/u8-strspn b/modules/unistr/u8-strspn index 9e0ec36b46..c397b66d23 100644 --- a/modules/unistr/u8-strspn +++ b/modules/unistr/u8-strspn @@ -13,9 +13,12 @@ unistr/u8-cmp unistr/u8-strchr configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistr/u8-strspn.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistr/u8-strspn]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTR_U8_STRSPN +lib_SOURCES += unistr/u8-strspn.c +endif Include: "unistr.h" diff --git a/modules/unistr/u8-strstr b/modules/unistr/u8-strstr index 10a32f92e7..599691733e 100644 --- a/modules/unistr/u8-strstr +++ b/modules/unistr/u8-strstr @@ -9,9 +9,12 @@ Depends-on: unistr/base configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistr/u8-strstr.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistr/u8-strstr]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTR_U8_STRSTR +lib_SOURCES += unistr/u8-strstr.c +endif Include: "unistr.h" diff --git a/modules/unistr/u8-strtok b/modules/unistr/u8-strtok index 0d98b32cf0..ecd15992bf 100644 --- a/modules/unistr/u8-strtok +++ b/modules/unistr/u8-strtok @@ -11,9 +11,12 @@ unistr/u8-strspn unistr/u8-strpbrk configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistr/u8-strtok.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistr/u8-strtok]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTR_U8_STRTOK +lib_SOURCES += unistr/u8-strtok.c +endif Include: "unistr.h" diff --git a/modules/unistr/u8-to-u16 b/modules/unistr/u8-to-u16 index 67576b4b29..83b9472df8 100644 --- a/modules/unistr/u8-to-u16 +++ b/modules/unistr/u8-to-u16 @@ -10,9 +10,12 @@ unistr/u8-mbtoucr unistr/u16-uctomb configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9.3], [unistr/u8-to-u16.c]) +gl_LIBUNISTRING_MODULE([0.9.3], [unistr/u8-to-u16]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTR_U8_TO_U16 +lib_SOURCES += unistr/u8-to-u16.c +endif Include: "unistr.h" diff --git a/modules/unistr/u8-to-u32 b/modules/unistr/u8-to-u32 index 72c86d4ab9..d4d7911989 100644 --- a/modules/unistr/u8-to-u32 +++ b/modules/unistr/u8-to-u32 @@ -9,9 +9,12 @@ unistr/base unistr/u8-mbtoucr configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9.3], [unistr/u8-to-u32.c]) +gl_LIBUNISTRING_MODULE([0.9.3], [unistr/u8-to-u32]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTR_U8_TO_U32 +lib_SOURCES += unistr/u8-to-u32.c +endif Include: "unistr.h" diff --git a/modules/unistr/u8-uctomb b/modules/unistr/u8-uctomb index 0acca721e6..018be5b62e 100644 --- a/modules/unistr/u8-uctomb +++ b/modules/unistr/u8-uctomb @@ -10,9 +10,12 @@ unistr/base configure.ac: gl_MODULE_INDICATOR([unistr/u8-uctomb]) -gl_LIBUNISTRING_LIBSOURCE([0.9], [unistr/u8-uctomb.c unistr/u8-uctomb-aux.c]) +gl_LIBUNISTRING_MODULE([0.9], [unistr/u8-uctomb]) Makefile.am: +if LIBUNISTRING_COMPILE_UNISTR_U8_UCTOMB +lib_SOURCES += unistr/u8-uctomb.c unistr/u8-uctomb-aux.c +endif Include: "unistr.h" diff --git a/modules/uniwbrk/u16-wordbreaks b/modules/uniwbrk/u16-wordbreaks index a5b29de71c..80651b4470 100644 --- a/modules/uniwbrk/u16-wordbreaks +++ b/modules/uniwbrk/u16-wordbreaks @@ -12,9 +12,12 @@ uniwbrk/table unistr/u16-mbtouc-unsafe configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [uniwbrk/u16-wordbreaks.c]) +gl_LIBUNISTRING_MODULE([0.9], [uniwbrk/u16-wordbreaks]) Makefile.am: +if LIBUNISTRING_COMPILE_UNIWBRK_U16_WORDBREAKS +lib_SOURCES += uniwbrk/u16-wordbreaks.c +endif Include: "uniwbrk.h" diff --git a/modules/uniwbrk/u32-wordbreaks b/modules/uniwbrk/u32-wordbreaks index 20f39c389f..c929fd0353 100644 --- a/modules/uniwbrk/u32-wordbreaks +++ b/modules/uniwbrk/u32-wordbreaks @@ -12,9 +12,12 @@ uniwbrk/table unistr/u32-mbtouc-unsafe configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [uniwbrk/u32-wordbreaks.c]) +gl_LIBUNISTRING_MODULE([0.9], [uniwbrk/u32-wordbreaks]) Makefile.am: +if LIBUNISTRING_COMPILE_UNIWBRK_U32_WORDBREAKS +lib_SOURCES += uniwbrk/u32-wordbreaks.c +endif Include: "uniwbrk.h" diff --git a/modules/uniwbrk/u8-wordbreaks b/modules/uniwbrk/u8-wordbreaks index e38bd417c6..6695b03630 100644 --- a/modules/uniwbrk/u8-wordbreaks +++ b/modules/uniwbrk/u8-wordbreaks @@ -12,9 +12,12 @@ uniwbrk/table unistr/u8-mbtouc-unsafe configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [uniwbrk/u8-wordbreaks.c]) +gl_LIBUNISTRING_MODULE([0.9], [uniwbrk/u8-wordbreaks]) Makefile.am: +if LIBUNISTRING_COMPILE_UNIWBRK_U8_WORDBREAKS +lib_SOURCES += uniwbrk/u8-wordbreaks.c +endif Include: "uniwbrk.h" diff --git a/modules/uniwbrk/ulc-wordbreaks b/modules/uniwbrk/ulc-wordbreaks index 228944fd3d..b8bde56859 100644 --- a/modules/uniwbrk/ulc-wordbreaks +++ b/modules/uniwbrk/ulc-wordbreaks @@ -13,9 +13,12 @@ c-ctype localcharset configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [uniwbrk/ulc-wordbreaks.c]) +gl_LIBUNISTRING_MODULE([0.9], [uniwbrk/ulc-wordbreaks]) Makefile.am: +if LIBUNISTRING_COMPILE_UNIWBRK_ULC_WORDBREAKS +lib_SOURCES += uniwbrk/ulc-wordbreaks.c +endif Include: "uniwbrk.h" diff --git a/modules/uniwbrk/wordbreak-property b/modules/uniwbrk/wordbreak-property index 4e7eb783df..d09487229e 100644 --- a/modules/uniwbrk/wordbreak-property +++ b/modules/uniwbrk/wordbreak-property @@ -9,9 +9,12 @@ Depends-on: uniwbrk/base configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [uniwbrk/wordbreak-property.c]) +gl_LIBUNISTRING_MODULE([0.9], [uniwbrk/wordbreak-property]) Makefile.am: +if LIBUNISTRING_COMPILE_UNIWBRK_WORDBREAK_PROPERTY +lib_SOURCES += uniwbrk/wordbreak-property.c +endif Include: "uniwbrk.h" diff --git a/modules/uniwidth/u16-strwidth b/modules/uniwidth/u16-strwidth index d5e626bdb3..1c42fca133 100644 --- a/modules/uniwidth/u16-strwidth +++ b/modules/uniwidth/u16-strwidth @@ -10,9 +10,12 @@ uniwidth/u16-width unistr/u16-strlen configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [uniwidth/u16-strwidth.c]) +gl_LIBUNISTRING_MODULE([0.9], [uniwidth/u16-strwidth]) Makefile.am: +if LIBUNISTRING_COMPILE_UNIWIDTH_U16_STRWIDTH +lib_SOURCES += uniwidth/u16-strwidth.c +endif Include: "uniwidth.h" diff --git a/modules/uniwidth/u16-width b/modules/uniwidth/u16-width index 4b34d3bee0..d27af5a22c 100644 --- a/modules/uniwidth/u16-width +++ b/modules/uniwidth/u16-width @@ -10,9 +10,12 @@ uniwidth/width unistr/u16-mbtouc-unsafe configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [uniwidth/u16-width.c]) +gl_LIBUNISTRING_MODULE([0.9], [uniwidth/u16-width]) Makefile.am: +if LIBUNISTRING_COMPILE_UNIWIDTH_U16_WIDTH +lib_SOURCES += uniwidth/u16-width.c +endif Include: "uniwidth.h" diff --git a/modules/uniwidth/u32-strwidth b/modules/uniwidth/u32-strwidth index 2769fed472..19df962e9c 100644 --- a/modules/uniwidth/u32-strwidth +++ b/modules/uniwidth/u32-strwidth @@ -10,9 +10,12 @@ uniwidth/u32-width unistr/u32-strlen configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [uniwidth/u32-strwidth.c]) +gl_LIBUNISTRING_MODULE([0.9], [uniwidth/u32-strwidth]) Makefile.am: +if LIBUNISTRING_COMPILE_UNIWIDTH_U32_STRWIDTH +lib_SOURCES += uniwidth/u32-strwidth.c +endif Include: "uniwidth.h" diff --git a/modules/uniwidth/u32-width b/modules/uniwidth/u32-width index 55e00161b4..95dd0f1621 100644 --- a/modules/uniwidth/u32-width +++ b/modules/uniwidth/u32-width @@ -9,9 +9,12 @@ uniwidth/base uniwidth/width configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [uniwidth/u32-width.c]) +gl_LIBUNISTRING_MODULE([0.9], [uniwidth/u32-width]) Makefile.am: +if LIBUNISTRING_COMPILE_UNIWIDTH_U32_WIDTH +lib_SOURCES += uniwidth/u32-width.c +endif Include: "uniwidth.h" diff --git a/modules/uniwidth/u8-strwidth b/modules/uniwidth/u8-strwidth index 5d7d14824a..fa9509de5e 100644 --- a/modules/uniwidth/u8-strwidth +++ b/modules/uniwidth/u8-strwidth @@ -10,9 +10,12 @@ uniwidth/u8-width unistr/u8-strlen configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [uniwidth/u8-strwidth.c]) +gl_LIBUNISTRING_MODULE([0.9], [uniwidth/u8-strwidth]) Makefile.am: +if LIBUNISTRING_COMPILE_UNIWIDTH_U8_STRWIDTH +lib_SOURCES += uniwidth/u8-strwidth.c +endif Include: "uniwidth.h" diff --git a/modules/uniwidth/u8-width b/modules/uniwidth/u8-width index a4d1ebef3a..eda0ad61ec 100644 --- a/modules/uniwidth/u8-width +++ b/modules/uniwidth/u8-width @@ -10,9 +10,12 @@ uniwidth/width unistr/u8-mbtouc-unsafe configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [uniwidth/u8-width.c]) +gl_LIBUNISTRING_MODULE([0.9], [uniwidth/u8-width]) Makefile.am: +if LIBUNISTRING_COMPILE_UNIWIDTH_U8_WIDTH +lib_SOURCES += uniwidth/u8-width.c +endif Include: "uniwidth.h" diff --git a/modules/uniwidth/width b/modules/uniwidth/width index 50a427c5c2..cc43c79a4e 100644 --- a/modules/uniwidth/width +++ b/modules/uniwidth/width @@ -10,9 +10,12 @@ uniwidth/base streq configure.ac: -gl_LIBUNISTRING_LIBSOURCE([0.9], [uniwidth/width.c]) +gl_LIBUNISTRING_MODULE([0.9], [uniwidth/width]) Makefile.am: +if LIBUNISTRING_COMPILE_UNIWIDTH_WIDTH +lib_SOURCES += uniwidth/width.c +endif Include: "uniwidth.h"