Merge branch 'stable'

[gnulib.git] / modules / unistr / u16-strcoll

diff --git a/modules/unistr/u16-strcoll b/modules/unistr/u16-strcoll
index 718f7d9..137c7fa 100644 (file)
--- a/modules/unistr/u16-strcoll
+++ b/modules/unistr/u16-strcoll
@@ -8,12 +8,16 @@ lib/unistr/u-strcoll.h
 Depends-on:
 unistr/base
 unistr/u16-strcmp
-uniconv/u16-strconv-to-locale
+uniconv/u16-strconv-to-enc
+localcharset
 
 configure.ac:
-gl_LIBUNISTRING_LIBSOURCE([0.9.3], [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"