Don't use AC_LIBOBJ with file names in subdirectories.

ChangeLog

@@ -1,3 +1,15 @@
+2010-06-03  Bruno Haible  <bruno@clisp.org>
+
+	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  <bruno@clisp.org>
 
 	Simplify gl_LIBUNISTRING_VERSION_CMP expansion.

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

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.

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])
 

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"

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"

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

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"