Merge tag 'upstream/0.9.7'

Upstream version 0.9.7

1 files changed, 197 insertions, 158 deletions

diff --git a/lib/Makefile.in b/lib/Makefile.in
index 175b875..b6f9ae5 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -14,7 +14,7 @@
 
 @SET_MAKE@
 
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2016 Free Software Foundation, Inc.
 #
 # This file is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -608,6 +608,9 @@ am__aclocal_m4_deps = $(top_srcdir)/gnulib-m4/00gnulib.m4 \
 	$(top_srcdir)/gnulib-m4/btowc.m4 \
 	$(top_srcdir)/gnulib-m4/codeset.m4 \
 	$(top_srcdir)/gnulib-m4/configmake.m4 \
+	$(top_srcdir)/gnulib-m4/ctype.m4 \
+	$(top_srcdir)/gnulib-m4/dirname.m4 \
+	$(top_srcdir)/gnulib-m4/double-slash-root.m4 \
 	$(top_srcdir)/gnulib-m4/eealloc.m4 \
 	$(top_srcdir)/gnulib-m4/environ.m4 \
 	$(top_srcdir)/gnulib-m4/errno_h.m4 \
@@ -619,15 +622,18 @@ am__aclocal_m4_deps = $(top_srcdir)/gnulib-m4/00gnulib.m4 \
 	$(top_srcdir)/gnulib-m4/extern-inline.m4 \
 	$(top_srcdir)/gnulib-m4/fcntl-o.m4 \
 	$(top_srcdir)/gnulib-m4/fdopen.m4 \
+	$(top_srcdir)/gnulib-m4/flexmember.m4 \
 	$(top_srcdir)/gnulib-m4/float_h.m4 \
 	$(top_srcdir)/gnulib-m4/fpieee.m4 \
 	$(top_srcdir)/gnulib-m4/frexp.m4 \
 	$(top_srcdir)/gnulib-m4/frexpl.m4 \
 	$(top_srcdir)/gnulib-m4/fseterr.m4 \
 	$(top_srcdir)/gnulib-m4/getpagesize.m4 \
+	$(top_srcdir)/gnulib-m4/getprogname.m4 \
 	$(top_srcdir)/gnulib-m4/glibc21.m4 \
 	$(top_srcdir)/gnulib-m4/gnulib-common.m4 \
 	$(top_srcdir)/gnulib-m4/gnulib-comp.m4 \
+	$(top_srcdir)/gnulib-m4/hard-locale.m4 \
 	$(top_srcdir)/gnulib-m4/iconv.m4 \
 	$(top_srcdir)/gnulib-m4/iconv_h.m4 \
 	$(top_srcdir)/gnulib-m4/iconv_open.m4 \
@@ -649,6 +655,7 @@ am__aclocal_m4_deps = $(top_srcdir)/gnulib-m4/00gnulib.m4 \
 	$(top_srcdir)/gnulib-m4/lib-link.m4 \
 	$(top_srcdir)/gnulib-m4/lib-prefix.m4 \
 	$(top_srcdir)/gnulib-m4/libunistring-base.m4 \
+	$(top_srcdir)/gnulib-m4/limits-h.m4 \
 	$(top_srcdir)/gnulib-m4/localcharset.m4 \
 	$(top_srcdir)/gnulib-m4/locale-ar.m4 \
 	$(top_srcdir)/gnulib-m4/locale-fr.m4 \
@@ -761,12 +768,12 @@ LTLIBRARIES = $(lib_LTLIBRARIES)
 am__DEPENDENCIES_1 =
 @WOE32_TRUE@am__DEPENDENCIES_2 = libunistring.res.lo
 am__libunistring_la_SOURCES_DIST = amemxfrm.c c-ctype.h c-ctype.c \
-	c-strcase.h c-strcasecmp.c c-strncasecmp.c localcharset.h \
-	localcharset.c localename.c glthread/lock.h glthread/lock.c \
-	malloca.c math.c mbchar.c mbiter.h mbiter.c mbsnlen.c \
-	memcmp2.c minmax.h printf-frexp.c printf-frexpl.c size_max.h \
-	striconveh.h striconveh.c striconveha.h striconveha.c \
-	glthread/threadlib.c unicase/cased.c \
+	c-strcase.h c-strcasecmp.c c-strncasecmp.c hard-locale.c \
+	localcharset.h localcharset.c localename.c glthread/lock.h \
+	glthread/lock.c malloca.c math.c mbchar.c mbiter.h mbiter.c \
+	mbsnlen.c memcmp2.c minmax.h printf-frexp.c printf-frexpl.c \
+	size_max.h striconveh.h striconveh.c striconveha.h \
+	striconveha.c glthread/threadlib.c unicase/cased.c \
 	unicase/empty-prefix-context.c unicase/empty-suffix-context.c \
 	unicase/ignorable.c unicase/locale-language.c \
 	unicase/special-casing.c unicase/tocasefold.c \
@@ -1539,7 +1546,7 @@ am__dirstamp = $(am__leading_dot)dirstamp
 @LIBUNISTRING_COMPILE_UNIWIDTH_WIDTH_TRUE@	uniwidth/width.lo
 @WOE32DLL_TRUE@am__objects_485 = ../woe32dll/unistring-exports.lo
 am_libunistring_la_OBJECTS = amemxfrm.lo c-ctype.lo c-strcasecmp.lo \
-	c-strncasecmp.lo localcharset.lo localename.lo \
+	c-strncasecmp.lo hard-locale.lo localcharset.lo localename.lo \
 	glthread/lock.lo malloca.lo math.lo mbchar.lo mbiter.lo \
 	mbsnlen.lo memcmp2.lo printf-frexp.lo printf-frexpl.lo \
 	striconveh.lo striconveha.lo glthread/threadlib.lo \
@@ -1949,6 +1956,7 @@ GNULIB_ILOGBL = @GNULIB_ILOGBL@
 GNULIB_IMAXABS = @GNULIB_IMAXABS@
 GNULIB_IMAXDIV = @GNULIB_IMAXDIV@
 GNULIB_ISATTY = @GNULIB_ISATTY@
+GNULIB_ISBLANK = @GNULIB_ISBLANK@
 GNULIB_ISFINITE = @GNULIB_ISFINITE@
 GNULIB_ISINF = @GNULIB_ISINF@
 GNULIB_ISNAN = @GNULIB_ISNAN@
@@ -2169,6 +2177,7 @@ HAVE_ATANF = @HAVE_ATANF@
 HAVE_ATANL = @HAVE_ATANL@
 HAVE_ATOLL = @HAVE_ATOLL@
 HAVE_BTOWC = @HAVE_BTOWC@
+HAVE_C99_STDINT_H = @HAVE_C99_STDINT_H@
 HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@
 HAVE_CBRT = @HAVE_CBRT@
 HAVE_CBRTF = @HAVE_CBRTF@
@@ -2292,6 +2301,7 @@ HAVE_ILOGB = @HAVE_ILOGB@
 HAVE_ILOGBF = @HAVE_ILOGBF@
 HAVE_ILOGBL = @HAVE_ILOGBL@
 HAVE_INTTYPES_H = @HAVE_INTTYPES_H@
+HAVE_ISBLANK = @HAVE_ISBLANK@
 HAVE_ISNAND = @HAVE_ISNAND@
 HAVE_ISNANF = @HAVE_ISNANF@
 HAVE_ISNANL = @HAVE_ISNANL@
@@ -2345,6 +2355,7 @@ HAVE_PREAD = @HAVE_PREAD@
 HAVE_PTSNAME = @HAVE_PTSNAME@
 HAVE_PTSNAME_R = @HAVE_PTSNAME_R@
 HAVE_PWRITE = @HAVE_PWRITE@
+HAVE_QSORT_R = @HAVE_QSORT_R@
 HAVE_RANDOM = @HAVE_RANDOM@
 HAVE_RANDOM_H = @HAVE_RANDOM_H@
 HAVE_RANDOM_R = @HAVE_RANDOM_R@
@@ -2478,6 +2489,7 @@ LIBUNISTRING_UNISTR_H = @LIBUNISTRING_UNISTR_H@
 LIBUNISTRING_UNITYPES_H = @LIBUNISTRING_UNITYPES_H@
 LIBUNISTRING_UNIWBRK_H = @LIBUNISTRING_UNIWBRK_H@
 LIBUNISTRING_UNIWIDTH_H = @LIBUNISTRING_UNIWIDTH_H@
+LIMITS_H = @LIMITS_H@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LOCALCHARSET_TESTS_ENVIRONMENT = @LOCALCHARSET_TESTS_ENVIRONMENT@
@@ -2497,11 +2509,13 @@ MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 NAMESPACING = @NAMESPACING@
+NEXT_AS_FIRST_DIRECTIVE_CTYPE_H = @NEXT_AS_FIRST_DIRECTIVE_CTYPE_H@
 NEXT_AS_FIRST_DIRECTIVE_ERRNO_H = @NEXT_AS_FIRST_DIRECTIVE_ERRNO_H@
 NEXT_AS_FIRST_DIRECTIVE_FLOAT_H = @NEXT_AS_FIRST_DIRECTIVE_FLOAT_H@
 NEXT_AS_FIRST_DIRECTIVE_ICONV_H = @NEXT_AS_FIRST_DIRECTIVE_ICONV_H@
 NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H = @NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H@
 NEXT_AS_FIRST_DIRECTIVE_LANGINFO_H = @NEXT_AS_FIRST_DIRECTIVE_LANGINFO_H@
+NEXT_AS_FIRST_DIRECTIVE_LIMITS_H = @NEXT_AS_FIRST_DIRECTIVE_LIMITS_H@
 NEXT_AS_FIRST_DIRECTIVE_LOCALE_H = @NEXT_AS_FIRST_DIRECTIVE_LOCALE_H@
 NEXT_AS_FIRST_DIRECTIVE_MATH_H = @NEXT_AS_FIRST_DIRECTIVE_MATH_H@
 NEXT_AS_FIRST_DIRECTIVE_STDDEF_H = @NEXT_AS_FIRST_DIRECTIVE_STDDEF_H@
@@ -2513,11 +2527,13 @@ NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H@
 NEXT_AS_FIRST_DIRECTIVE_UNISTD_H = @NEXT_AS_FIRST_DIRECTIVE_UNISTD_H@
 NEXT_AS_FIRST_DIRECTIVE_WCHAR_H = @NEXT_AS_FIRST_DIRECTIVE_WCHAR_H@
 NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H = @NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H@
+NEXT_CTYPE_H = @NEXT_CTYPE_H@
 NEXT_ERRNO_H = @NEXT_ERRNO_H@
 NEXT_FLOAT_H = @NEXT_FLOAT_H@
 NEXT_ICONV_H = @NEXT_ICONV_H@
 NEXT_INTTYPES_H = @NEXT_INTTYPES_H@
 NEXT_LANGINFO_H = @NEXT_LANGINFO_H@
+NEXT_LIMITS_H = @NEXT_LIMITS_H@
 NEXT_LOCALE_H = @NEXT_LOCALE_H@
 NEXT_MATH_H = @NEXT_MATH_H@
 NEXT_STDDEF_H = @NEXT_STDDEF_H@
@@ -2820,9 +2836,9 @@ AUTOMAKE_OPTIONS = 1.5 gnits subdir-objects no-dependencies
 
 # Version information according to Woe32 conventions.
 EXTRA_DIST = alloca.in.h amemxfrm.h array-mergesort.h c-strcaseeq.h \
-	errno.in.h float.c float.in.h itold.c fpucw.h frexp.c frexp.c \
-	frexpl.c fseterr.c fseterr.h stdio-impl.h \
-	$(top_srcdir)/build-aux/config.rpath iconv.in.h \
+	errno.in.h flexmember.h float.c float.in.h itold.c fpucw.h \
+	frexp.c frexp.c frexpl.c fseterr.c fseterr.h stdio-impl.h \
+	hard-locale.h $(top_srcdir)/build-aux/config.rpath iconv.in.h \
 	iconv_open-aix.h iconv_open-hpux.h iconv_open-irix.h \
 	iconv_open-osf.h iconv_open-solaris.h iconv.c iconv_close.c \
 	iconv_open-aix.gperf iconv_open-hpux.gperf \
@@ -2830,12 +2846,13 @@ EXTRA_DIST = alloca.in.h amemxfrm.h array-mergesort.h c-strcaseeq.h \
 	iconv_open-solaris.gperf iconv_open.c float+.h isnan.c \
 	isnand-nolibm.h isnand.c float+.h isnan.c isnanf-nolibm.h \
 	isnanf.c float+.h isnan.c isnanl-nolibm.h isnanl.c iswblank.c \
-	langinfo.in.h config.charset ref-add.sin ref-del.sin \
-	localename.h malloc.c malloca.h malloca.valgrind math.in.h \
-	mbchar.h mbrtowc.c mbsinit.c memchr.c memchr.valgrind \
-	memcmp2.h printf-frexp.h printf-frexp.c printf-frexpl.h \
-	relocatable.c relocatable.h float+.h signbitd.c signbitf.c \
-	signbitl.c $(top_srcdir)/build-aux/snippet/_Noreturn.h \
+	langinfo.in.h limits.in.h config.charset ref-add.sin \
+	ref-del.sin localename.h malloc.c malloca.h malloca.valgrind \
+	math.in.h mbchar.h mbrtowc.c mbsinit.c memchr.c \
+	memchr.valgrind memcmp2.h printf-frexp.h printf-frexp.c \
+	printf-frexpl.h relocatable.c relocatable.h float+.h \
+	signbitd.c signbitf.c signbitl.c \
+	$(top_srcdir)/build-aux/snippet/_Noreturn.h \
 	$(top_srcdir)/build-aux/snippet/arg-nonnull.h \
 	$(top_srcdir)/build-aux/snippet/c++defs.h \
 	$(top_srcdir)/build-aux/snippet/unused-parameter.h \
@@ -3092,13 +3109,13 @@ EXTRA_DIST = alloca.in.h amemxfrm.h array-mergesort.h c-strcaseeq.h \
 BUILT_SOURCES = $(ALLOCA_H) configmake.h $(ERRNO_H) $(FLOAT_H) \
 	$(ICONV_H) iconv_open-aix.h iconv_open-hpux.h \
 	iconv_open-irix.h iconv_open-osf.h iconv_open-solaris.h \
-	langinfo.h math.h arg-nonnull.h c++defs.h unused-parameter.h \
-	warn-on-use.h $(STDBOOL_H) $(STDDEF_H) $(STDINT_H) stdlib.h \
-	string.h sys/types.h $(LIBUNISTRING_UNICASE_H) \
-	unicase/locale-languages.h unicase/special-casing-table.h \
-	$(LIBUNISTRING_UNICONV_H) $(LIBUNISTRING_UNICTYPE_H) \
-	unictype/bidi_byname.h unictype/categ_byname.h \
-	unictype/combiningclass_byname.h \
+	langinfo.h $(LIMITS_H) math.h arg-nonnull.h c++defs.h \
+	unused-parameter.h warn-on-use.h $(STDBOOL_H) $(STDDEF_H) \
+	$(STDINT_H) stdlib.h string.h sys/types.h \
+	$(LIBUNISTRING_UNICASE_H) unicase/locale-languages.h \
+	unicase/special-casing-table.h $(LIBUNISTRING_UNICONV_H) \
+	$(LIBUNISTRING_UNICTYPE_H) unictype/bidi_byname.h \
+	unictype/categ_byname.h unictype/combiningclass_byname.h \
 	unictype/joininggroup_byname.h unictype/joiningtype_byname.h \
 	unictype/pr_byname.h unictype/scripts_byname.h \
 	$(LIBUNISTRING_UNIGBRK_H) $(LIBUNISTRING_UNILBRK_H) \
@@ -3114,15 +3131,16 @@ MOSTLYCLEANFILES = core *.stackdump core *.stackdump alloca.h \
 	alloca.h-t errno.h errno.h-t float.h float.h-t iconv.h \
 	iconv.h-t iconv_open-aix.h-t iconv_open-hpux.h-t \
 	iconv_open-irix.h-t iconv_open-osf.h-t iconv_open-solaris.h-t \
-	langinfo.h langinfo.h-t math.h math.h-t arg-nonnull.h \
-	arg-nonnull.h-t c++defs.h c++defs.h-t unused-parameter.h \
-	unused-parameter.h-t warn-on-use.h warn-on-use.h-t stdbool.h \
-	stdbool.h-t stddef.h stddef.h-t stdint.h stdint.h-t stdlib.h \
-	stdlib.h-t string.h string.h-t sys/types.h sys/types.h-t \
-	unicase.h unicase.h-t unicase/locale-languages.h-t \
-	unicase/special-casing-table.h-t uniconv.h uniconv.h-t \
-	unictype.h unictype.h-t unictype/bidi_byname.h-t \
-	unictype/categ_byname.h-t unictype/combiningclass_byname.h-t \
+	langinfo.h langinfo.h-t limits.h limits.h-t math.h math.h-t \
+	arg-nonnull.h arg-nonnull.h-t c++defs.h c++defs.h-t \
+	unused-parameter.h unused-parameter.h-t warn-on-use.h \
+	warn-on-use.h-t stdbool.h stdbool.h-t stddef.h stddef.h-t \
+	stdint.h stdint.h-t stdlib.h stdlib.h-t string.h string.h-t \
+	sys/types.h sys/types.h-t unicase.h unicase.h-t \
+	unicase/locale-languages.h-t unicase/special-casing-table.h-t \
+	uniconv.h uniconv.h-t unictype.h unictype.h-t \
+	unictype/bidi_byname.h-t unictype/categ_byname.h-t \
+	unictype/combiningclass_byname.h-t \
 	unictype/joininggroup_byname.h-t \
 	unictype/joiningtype_byname.h-t unictype/pr_byname.h-t \
 	unictype/scripts_byname.h-t unigbrk.h unigbrk.h-t unilbrk.h \
@@ -3176,116 +3194,116 @@ AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_builddir) -I$(top_srcdir) \
 
 # Additional source files.
 libunistring_la_SOURCES = amemxfrm.c c-ctype.h c-ctype.c c-strcase.h \
-	c-strcasecmp.c c-strncasecmp.c localcharset.h localcharset.c \
-	localename.c glthread/lock.h glthread/lock.c malloca.c math.c \
-	mbchar.c mbiter.h mbiter.c mbsnlen.c memcmp2.c minmax.h \
-	printf-frexp.c printf-frexpl.c size_max.h striconveh.h \
-	striconveh.c striconveha.h striconveha.c glthread/threadlib.c \
-	unicase/cased.c $(am__append_2) $(am__append_3) \
-	unicase/ignorable.c $(am__append_4) unicase/special-casing.c \
-	unicase/tocasefold.c $(am__append_5) $(am__append_6) \
-	$(am__append_7) $(am__append_8) $(am__append_9) \
-	$(am__append_10) unicase/u16-casemap.c $(am__append_11) \
-	$(am__append_12) $(am__append_13) $(am__append_14) \
-	$(am__append_15) $(am__append_16) $(am__append_17) \
-	unicase/u16-is-invariant.c $(am__append_18) $(am__append_19) \
-	$(am__append_20) $(am__append_21) $(am__append_22) \
-	$(am__append_23) $(am__append_24) $(am__append_25) \
-	$(am__append_26) unicase/u32-casemap.c $(am__append_27) \
-	$(am__append_28) $(am__append_29) $(am__append_30) \
-	$(am__append_31) $(am__append_32) $(am__append_33) \
-	unicase/u32-is-invariant.c $(am__append_34) $(am__append_35) \
-	$(am__append_36) $(am__append_37) $(am__append_38) \
-	$(am__append_39) $(am__append_40) $(am__append_41) \
-	$(am__append_42) unicase/u8-casemap.c $(am__append_43) \
-	$(am__append_44) $(am__append_45) $(am__append_46) \
-	$(am__append_47) $(am__append_48) $(am__append_49) \
-	unicase/u8-is-invariant.c $(am__append_50) $(am__append_51) \
-	$(am__append_52) $(am__append_53) $(am__append_54) \
-	$(am__append_55) $(am__append_56) $(am__append_57) \
-	$(am__append_58) $(am__append_59) $(am__append_60) \
-	$(am__append_61) $(am__append_62) $(am__append_63) \
-	$(am__append_64) $(am__append_65) $(am__append_66) \
-	$(am__append_67) $(am__append_68) $(am__append_69) \
-	$(am__append_70) $(am__append_71) $(am__append_72) \
-	$(am__append_73) $(am__append_74) $(am__append_75) \
-	$(am__append_76) $(am__append_77) $(am__append_78) \
-	$(am__append_79) $(am__append_80) $(am__append_81) \
-	$(am__append_82) $(am__append_83) $(am__append_84) \
-	$(am__append_85) $(am__append_86) $(am__append_87) \
-	$(am__append_88) $(am__append_89) $(am__append_90) \
-	$(am__append_91) $(am__append_92) $(am__append_93) \
-	$(am__append_94) $(am__append_95) $(am__append_96) \
-	$(am__append_97) $(am__append_98) $(am__append_99) \
-	$(am__append_100) $(am__append_101) $(am__append_102) \
-	$(am__append_103) $(am__append_104) $(am__append_105) \
-	$(am__append_106) $(am__append_107) $(am__append_108) \
-	$(am__append_109) $(am__append_110) $(am__append_111) \
-	$(am__append_112) $(am__append_113) $(am__append_114) \
-	$(am__append_115) $(am__append_116) $(am__append_117) \
-	$(am__append_118) $(am__append_119) $(am__append_120) \
-	$(am__append_121) $(am__append_122) $(am__append_123) \
-	$(am__append_124) $(am__append_125) $(am__append_126) \
-	$(am__append_127) $(am__append_128) $(am__append_129) \
-	$(am__append_130) $(am__append_131) $(am__append_132) \
-	$(am__append_133) $(am__append_134) $(am__append_135) \
-	$(am__append_136) $(am__append_137) $(am__append_138) \
-	$(am__append_139) $(am__append_140) $(am__append_141) \
-	$(am__append_142) $(am__append_143) $(am__append_144) \
-	$(am__append_145) $(am__append_146) $(am__append_147) \
-	$(am__append_148) $(am__append_149) $(am__append_150) \
-	$(am__append_151) $(am__append_152) $(am__append_153) \
-	$(am__append_154) $(am__append_155) $(am__append_156) \
-	$(am__append_157) $(am__append_158) $(am__append_159) \
-	$(am__append_160) $(am__append_161) $(am__append_162) \
-	$(am__append_163) $(am__append_164) $(am__append_165) \
-	$(am__append_166) $(am__append_167) $(am__append_168) \
-	$(am__append_169) $(am__append_170) $(am__append_171) \
-	$(am__append_172) $(am__append_173) $(am__append_174) \
-	$(am__append_175) $(am__append_176) $(am__append_177) \
-	$(am__append_178) $(am__append_179) $(am__append_180) \
-	$(am__append_181) $(am__append_182) $(am__append_183) \
-	$(am__append_184) $(am__append_185) $(am__append_186) \
-	$(am__append_187) $(am__append_188) $(am__append_189) \
-	$(am__append_190) $(am__append_191) $(am__append_192) \
-	$(am__append_193) $(am__append_194) $(am__append_195) \
-	$(am__append_196) $(am__append_197) $(am__append_198) \
-	$(am__append_199) $(am__append_200) $(am__append_201) \
-	$(am__append_202) $(am__append_203) $(am__append_204) \
-	$(am__append_205) $(am__append_206) $(am__append_207) \
-	$(am__append_208) $(am__append_209) $(am__append_210) \
-	$(am__append_211) $(am__append_212) $(am__append_213) \
-	$(am__append_214) $(am__append_215) $(am__append_216) \
-	$(am__append_217) $(am__append_218) $(am__append_219) \
-	$(am__append_220) $(am__append_221) $(am__append_222) \
-	$(am__append_223) $(am__append_224) $(am__append_225) \
-	$(am__append_226) $(am__append_227) $(am__append_228) \
-	$(am__append_229) $(am__append_230) $(am__append_231) \
-	$(am__append_232) $(am__append_233) $(am__append_234) \
-	$(am__append_235) $(am__append_236) $(am__append_237) \
-	$(am__append_238) $(am__append_239) $(am__append_240) \
-	$(am__append_241) $(am__append_242) $(am__append_243) \
-	$(am__append_244) $(am__append_245) $(am__append_246) \
-	$(am__append_247) $(am__append_248) $(am__append_249) \
-	$(am__append_250) $(am__append_251) $(am__append_252) \
-	$(am__append_253) $(am__append_254) $(am__append_255) \
-	$(am__append_256) $(am__append_257) $(am__append_258) \
-	$(am__append_259) $(am__append_260) $(am__append_261) \
-	$(am__append_262) unilbrk/lbrktables.c $(am__append_263) \
-	$(am__append_264) $(am__append_265) $(am__append_266) \
-	$(am__append_267) $(am__append_268) unilbrk/ulc-common.c \
-	$(am__append_269) $(am__append_270) $(am__append_271) \
-	$(am__append_272) uninorm/compat-decomposition.c \
-	$(am__append_273) uninorm/decompose-internal.c \
-	$(am__append_274) $(am__append_275) \
-	uninorm/decomposition-table.c $(am__append_276) \
-	$(am__append_277) $(am__append_278) $(am__append_279) \
-	$(am__append_280) $(am__append_281) $(am__append_282) \
-	$(am__append_283) $(am__append_284) $(am__append_285) \
-	$(am__append_286) $(am__append_287) $(am__append_288) \
-	$(am__append_289) $(am__append_290) $(am__append_291) \
-	$(am__append_292) unistd.c unistdio/u-printf-args.c \
-	$(am__append_293) $(am__append_294) \
+	c-strcasecmp.c c-strncasecmp.c hard-locale.c localcharset.h \
+	localcharset.c localename.c glthread/lock.h glthread/lock.c \
+	malloca.c math.c mbchar.c mbiter.h mbiter.c mbsnlen.c \
+	memcmp2.c minmax.h printf-frexp.c printf-frexpl.c size_max.h \
+	striconveh.h striconveh.c striconveha.h striconveha.c \
+	glthread/threadlib.c unicase/cased.c $(am__append_2) \
+	$(am__append_3) unicase/ignorable.c $(am__append_4) \
+	unicase/special-casing.c unicase/tocasefold.c $(am__append_5) \
+	$(am__append_6) $(am__append_7) $(am__append_8) \
+	$(am__append_9) $(am__append_10) unicase/u16-casemap.c \
+	$(am__append_11) $(am__append_12) $(am__append_13) \
+	$(am__append_14) $(am__append_15) $(am__append_16) \
+	$(am__append_17) unicase/u16-is-invariant.c $(am__append_18) \
+	$(am__append_19) $(am__append_20) $(am__append_21) \
+	$(am__append_22) $(am__append_23) $(am__append_24) \
+	$(am__append_25) $(am__append_26) unicase/u32-casemap.c \
+	$(am__append_27) $(am__append_28) $(am__append_29) \
+	$(am__append_30) $(am__append_31) $(am__append_32) \
+	$(am__append_33) unicase/u32-is-invariant.c $(am__append_34) \
+	$(am__append_35) $(am__append_36) $(am__append_37) \
+	$(am__append_38) $(am__append_39) $(am__append_40) \
+	$(am__append_41) $(am__append_42) unicase/u8-casemap.c \
+	$(am__append_43) $(am__append_44) $(am__append_45) \
+	$(am__append_46) $(am__append_47) $(am__append_48) \
+	$(am__append_49) unicase/u8-is-invariant.c $(am__append_50) \
+	$(am__append_51) $(am__append_52) $(am__append_53) \
+	$(am__append_54) $(am__append_55) $(am__append_56) \
+	$(am__append_57) $(am__append_58) $(am__append_59) \
+	$(am__append_60) $(am__append_61) $(am__append_62) \
+	$(am__append_63) $(am__append_64) $(am__append_65) \
+	$(am__append_66) $(am__append_67) $(am__append_68) \
+	$(am__append_69) $(am__append_70) $(am__append_71) \
+	$(am__append_72) $(am__append_73) $(am__append_74) \
+	$(am__append_75) $(am__append_76) $(am__append_77) \
+	$(am__append_78) $(am__append_79) $(am__append_80) \
+	$(am__append_81) $(am__append_82) $(am__append_83) \
+	$(am__append_84) $(am__append_85) $(am__append_86) \
+	$(am__append_87) $(am__append_88) $(am__append_89) \
+	$(am__append_90) $(am__append_91) $(am__append_92) \
+	$(am__append_93) $(am__append_94) $(am__append_95) \
+	$(am__append_96) $(am__append_97) $(am__append_98) \
+	$(am__append_99) $(am__append_100) $(am__append_101) \
+	$(am__append_102) $(am__append_103) $(am__append_104) \
+	$(am__append_105) $(am__append_106) $(am__append_107) \
+	$(am__append_108) $(am__append_109) $(am__append_110) \
+	$(am__append_111) $(am__append_112) $(am__append_113) \
+	$(am__append_114) $(am__append_115) $(am__append_116) \
+	$(am__append_117) $(am__append_118) $(am__append_119) \
+	$(am__append_120) $(am__append_121) $(am__append_122) \
+	$(am__append_123) $(am__append_124) $(am__append_125) \
+	$(am__append_126) $(am__append_127) $(am__append_128) \
+	$(am__append_129) $(am__append_130) $(am__append_131) \
+	$(am__append_132) $(am__append_133) $(am__append_134) \
+	$(am__append_135) $(am__append_136) $(am__append_137) \
+	$(am__append_138) $(am__append_139) $(am__append_140) \
+	$(am__append_141) $(am__append_142) $(am__append_143) \
+	$(am__append_144) $(am__append_145) $(am__append_146) \
+	$(am__append_147) $(am__append_148) $(am__append_149) \
+	$(am__append_150) $(am__append_151) $(am__append_152) \
+	$(am__append_153) $(am__append_154) $(am__append_155) \
+	$(am__append_156) $(am__append_157) $(am__append_158) \
+	$(am__append_159) $(am__append_160) $(am__append_161) \
+	$(am__append_162) $(am__append_163) $(am__append_164) \
+	$(am__append_165) $(am__append_166) $(am__append_167) \
+	$(am__append_168) $(am__append_169) $(am__append_170) \
+	$(am__append_171) $(am__append_172) $(am__append_173) \
+	$(am__append_174) $(am__append_175) $(am__append_176) \
+	$(am__append_177) $(am__append_178) $(am__append_179) \
+	$(am__append_180) $(am__append_181) $(am__append_182) \
+	$(am__append_183) $(am__append_184) $(am__append_185) \
+	$(am__append_186) $(am__append_187) $(am__append_188) \
+	$(am__append_189) $(am__append_190) $(am__append_191) \
+	$(am__append_192) $(am__append_193) $(am__append_194) \
+	$(am__append_195) $(am__append_196) $(am__append_197) \
+	$(am__append_198) $(am__append_199) $(am__append_200) \
+	$(am__append_201) $(am__append_202) $(am__append_203) \
+	$(am__append_204) $(am__append_205) $(am__append_206) \
+	$(am__append_207) $(am__append_208) $(am__append_209) \
+	$(am__append_210) $(am__append_211) $(am__append_212) \
+	$(am__append_213) $(am__append_214) $(am__append_215) \
+	$(am__append_216) $(am__append_217) $(am__append_218) \
+	$(am__append_219) $(am__append_220) $(am__append_221) \
+	$(am__append_222) $(am__append_223) $(am__append_224) \
+	$(am__append_225) $(am__append_226) $(am__append_227) \
+	$(am__append_228) $(am__append_229) $(am__append_230) \
+	$(am__append_231) $(am__append_232) $(am__append_233) \
+	$(am__append_234) $(am__append_235) $(am__append_236) \
+	$(am__append_237) $(am__append_238) $(am__append_239) \
+	$(am__append_240) $(am__append_241) $(am__append_242) \
+	$(am__append_243) $(am__append_244) $(am__append_245) \
+	$(am__append_246) $(am__append_247) $(am__append_248) \
+	$(am__append_249) $(am__append_250) $(am__append_251) \
+	$(am__append_252) $(am__append_253) $(am__append_254) \
+	$(am__append_255) $(am__append_256) $(am__append_257) \
+	$(am__append_258) $(am__append_259) $(am__append_260) \
+	$(am__append_261) $(am__append_262) unilbrk/lbrktables.c \
+	$(am__append_263) $(am__append_264) $(am__append_265) \
+	$(am__append_266) $(am__append_267) $(am__append_268) \
+	unilbrk/ulc-common.c $(am__append_269) $(am__append_270) \
+	$(am__append_271) $(am__append_272) \
+	uninorm/compat-decomposition.c $(am__append_273) \
+	uninorm/decompose-internal.c $(am__append_274) \
+	$(am__append_275) uninorm/decomposition-table.c \
+	$(am__append_276) $(am__append_277) $(am__append_278) \
+	$(am__append_279) $(am__append_280) $(am__append_281) \
+	$(am__append_282) $(am__append_283) $(am__append_284) \
+	$(am__append_285) $(am__append_286) $(am__append_287) \
+	$(am__append_288) $(am__append_289) $(am__append_290) \
+	$(am__append_291) $(am__append_292) unistd.c \
+	unistdio/u-printf-args.c $(am__append_293) $(am__append_294) \
 	unistdio/u16-printf-parse.c $(am__append_295) \
 	$(am__append_296) $(am__append_297) $(am__append_298) \
 	$(am__append_299) $(am__append_300) $(am__append_301) \
@@ -3377,6 +3395,9 @@ libunistring_la_LDFLAGS = $(AM_LDFLAGS) -no-undefined $(LTLIBICONV) \
 # might appear in an installed header, which is used by some other compiler.
 HAVE_INCLUDE_NEXT = (__GNUC__ || 60000000 <= __DECC_VER)
 GPERF = gperf
+V_GPERF = $(V_GPERF_@AM_V@)
+V_GPERF_ = $(V_GPERF_@AM_DEFAULT_V@)
+V_GPERF_0 = @echo "  GPERF   " $@;
 charset_alias = $(DESTDIR)$(libdir)/charset.alias
 charset_tmp = $(DESTDIR)$(libdir)/charset.tmp
 
@@ -4521,19 +4542,19 @@ configmake.h: Makefile
 @GL_GENERATE_ICONV_H_FALSE@	rm -f $@
 
 iconv_open-aix.h: iconv_open-aix.gperf
-	$(GPERF) -m 10 $(srcdir)/iconv_open-aix.gperf > $(srcdir)/iconv_open-aix.h-t
+	$(V_GPERF)$(GPERF) -m 10 $(srcdir)/iconv_open-aix.gperf > $(srcdir)/iconv_open-aix.h-t && \
 	mv $(srcdir)/iconv_open-aix.h-t $(srcdir)/iconv_open-aix.h
 iconv_open-hpux.h: iconv_open-hpux.gperf
-	$(GPERF) -m 10 $(srcdir)/iconv_open-hpux.gperf > $(srcdir)/iconv_open-hpux.h-t
+	$(V_GPERF)$(GPERF) -m 10 $(srcdir)/iconv_open-hpux.gperf > $(srcdir)/iconv_open-hpux.h-t && \
 	mv $(srcdir)/iconv_open-hpux.h-t $(srcdir)/iconv_open-hpux.h
 iconv_open-irix.h: iconv_open-irix.gperf
-	$(GPERF) -m 10 $(srcdir)/iconv_open-irix.gperf > $(srcdir)/iconv_open-irix.h-t
+	$(V_GPERF)$(GPERF) -m 10 $(srcdir)/iconv_open-irix.gperf > $(srcdir)/iconv_open-irix.h-t && \
 	mv $(srcdir)/iconv_open-irix.h-t $(srcdir)/iconv_open-irix.h
 iconv_open-osf.h: iconv_open-osf.gperf
-	$(GPERF) -m 10 $(srcdir)/iconv_open-osf.gperf > $(srcdir)/iconv_open-osf.h-t
+	$(V_GPERF)$(GPERF) -m 10 $(srcdir)/iconv_open-osf.gperf > $(srcdir)/iconv_open-osf.h-t && \
 	mv $(srcdir)/iconv_open-osf.h-t $(srcdir)/iconv_open-osf.h
 iconv_open-solaris.h: iconv_open-solaris.gperf
-	$(GPERF) -m 10 $(srcdir)/iconv_open-solaris.gperf > $(srcdir)/iconv_open-solaris.h-t
+	$(V_GPERF)$(GPERF) -m 10 $(srcdir)/iconv_open-solaris.gperf > $(srcdir)/iconv_open-solaris.h-t && \
 	mv $(srcdir)/iconv_open-solaris.h-t $(srcdir)/iconv_open-solaris.h
 
 # We need the following in order to create an empty placeholder for
@@ -4560,6 +4581,22 @@ langinfo.h: langinfo.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_U
 	} > $@-t && \
 	mv $@-t $@
 
+# We need the following in order to create <limits.h> when the system
+# doesn't have one that is compatible with GNU.
+@GL_GENERATE_LIMITS_H_TRUE@limits.h: limits.in.h $(top_builddir)/config.status
+@GL_GENERATE_LIMITS_H_TRUE@	$(AM_V_GEN)rm -f $@-t $@ && \
+@GL_GENERATE_LIMITS_H_TRUE@	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
+@GL_GENERATE_LIMITS_H_TRUE@	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \
+@GL_GENERATE_LIMITS_H_TRUE@	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+@GL_GENERATE_LIMITS_H_TRUE@	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
+@GL_GENERATE_LIMITS_H_TRUE@	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
+@GL_GENERATE_LIMITS_H_TRUE@	      -e 's|@''NEXT_LIMITS_H''@|$(NEXT_LIMITS_H)|g' \
+@GL_GENERATE_LIMITS_H_TRUE@	      < $(srcdir)/limits.in.h; \
+@GL_GENERATE_LIMITS_H_TRUE@	} > $@-t && \
+@GL_GENERATE_LIMITS_H_TRUE@	mv $@-t $@
+@GL_GENERATE_LIMITS_H_FALSE@limits.h: $(top_builddir)/config.status
+@GL_GENERATE_LIMITS_H_FALSE@	rm -f $@
+
 # We need the following in order to install a simple file in $(libdir)
 # which is shared with other installed packages. We use a list of referencing
 # packages so that "make uninstall" will remove the file if and only if it
@@ -4969,6 +5006,7 @@ warn-on-use.h: $(top_srcdir)/build-aux/snippet/warn-on-use.h
 @GL_GENERATE_STDINT_H_TRUE@	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
 @GL_GENERATE_STDINT_H_TRUE@	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
 @GL_GENERATE_STDINT_H_TRUE@	      -e 's|@''NEXT_STDINT_H''@|$(NEXT_STDINT_H)|g' \
+@GL_GENERATE_STDINT_H_TRUE@	      -e 's/@''HAVE_C99_STDINT_H''@/$(HAVE_C99_STDINT_H)/g' \
 @GL_GENERATE_STDINT_H_TRUE@	      -e 's/@''HAVE_SYS_TYPES_H''@/$(HAVE_SYS_TYPES_H)/g' \
 @GL_GENERATE_STDINT_H_TRUE@	      -e 's/@''HAVE_INTTYPES_H''@/$(HAVE_INTTYPES_H)/g' \
 @GL_GENERATE_STDINT_H_TRUE@	      -e 's/@''HAVE_SYS_INTTYPES_H''@/$(HAVE_SYS_INTTYPES_H)/g' \
@@ -5055,6 +5093,7 @@ stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \
 	      -e 's|@''HAVE_POSIX_OPENPT''@|$(HAVE_POSIX_OPENPT)|g' \
 	      -e 's|@''HAVE_PTSNAME''@|$(HAVE_PTSNAME)|g' \
 	      -e 's|@''HAVE_PTSNAME_R''@|$(HAVE_PTSNAME_R)|g' \
+	      -e 's|@''HAVE_QSORT_R''@|$(HAVE_QSORT_R)|g' \
 	      -e 's|@''HAVE_RANDOM''@|$(HAVE_RANDOM)|g' \
 	      -e 's|@''HAVE_RANDOM_H''@|$(HAVE_RANDOM_H)|g' \
 	      -e 's|@''HAVE_RANDOM_R''@|$(HAVE_RANDOM_R)|g' \
@@ -5207,11 +5246,11 @@ unicase.h: unicase.in.h
 	mv -f $@-t $@
 
 unicase/locale-languages.h: $(srcdir)/unicase/locale-languages.gperf
-	$(GPERF) -m 10 $(srcdir)/unicase/locale-languages.gperf > $(srcdir)/unicase/locale-languages.h-t
+	$(V_GPERF)$(GPERF) -m 10 $(srcdir)/unicase/locale-languages.gperf > $(srcdir)/unicase/locale-languages.h-t && \
 	mv $(srcdir)/unicase/locale-languages.h-t $(srcdir)/unicase/locale-languages.h
 
 unicase/special-casing-table.h: $(srcdir)/unicase/special-casing-table.gperf
-	$(GPERF) -m 10 $(srcdir)/unicase/special-casing-table.gperf > $(srcdir)/unicase/special-casing-table.h-t
+	$(V_GPERF)$(GPERF) -m 10 $(srcdir)/unicase/special-casing-table.gperf > $(srcdir)/unicase/special-casing-table.h-t && \
 	mv $(srcdir)/unicase/special-casing-table.h-t $(srcdir)/unicase/special-casing-table.h
 
 uniconv.h: uniconv.in.h
@@ -5229,31 +5268,31 @@ unictype.h: unictype.in.h
 	mv -f $@-t $@
 
 unictype/bidi_byname.h: unictype/bidi_byname.gperf
-	$(GPERF) -m 10 $(srcdir)/unictype/bidi_byname.gperf > $(srcdir)/unictype/bidi_byname.h-t
+	$(V_GPERF)$(GPERF) -m 10 $(srcdir)/unictype/bidi_byname.gperf > $(srcdir)/unictype/bidi_byname.h-t && \
 	mv $(srcdir)/unictype/bidi_byname.h-t $(srcdir)/unictype/bidi_byname.h
 
 unictype/categ_byname.h: unictype/categ_byname.gperf
-	$(GPERF) -m 10 $(srcdir)/unictype/categ_byname.gperf > $(srcdir)/unictype/categ_byname.h-t
+	$(V_GPERF)$(GPERF) -m 10 $(srcdir)/unictype/categ_byname.gperf > $(srcdir)/unictype/categ_byname.h-t && \
 	mv $(srcdir)/unictype/categ_byname.h-t $(srcdir)/unictype/categ_byname.h
 
 unictype/combiningclass_byname.h: unictype/combiningclass_byname.gperf
-	$(GPERF) -m 10 $(srcdir)/unictype/combiningclass_byname.gperf > $(srcdir)/unictype/combiningclass_byname.h-t
+	$(V_GPERF)$(GPERF) -m 10 $(srcdir)/unictype/combiningclass_byname.gperf > $(srcdir)/unictype/combiningclass_byname.h-t && \
 	mv $(srcdir)/unictype/combiningclass_byname.h-t $(srcdir)/unictype/combiningclass_byname.h
 
 unictype/joininggroup_byname.h: unictype/joininggroup_byname.gperf
-	$(GPERF) -m 10 $(srcdir)/unictype/joininggroup_byname.gperf > $(srcdir)/unictype/joininggroup_byname.h-t
+	$(V_GPERF)$(GPERF) -m 10 $(srcdir)/unictype/joininggroup_byname.gperf > $(srcdir)/unictype/joininggroup_byname.h-t && \
 	mv $(srcdir)/unictype/joininggroup_byname.h-t $(srcdir)/unictype/joininggroup_byname.h
 
 unictype/joiningtype_byname.h: unictype/joiningtype_byname.gperf
-	$(GPERF) -m 10 $(srcdir)/unictype/joiningtype_byname.gperf > $(srcdir)/unictype/joiningtype_byname.h-t
+	$(V_GPERF)$(GPERF) -m 10 $(srcdir)/unictype/joiningtype_byname.gperf > $(srcdir)/unictype/joiningtype_byname.h-t && \
 	mv $(srcdir)/unictype/joiningtype_byname.h-t $(srcdir)/unictype/joiningtype_byname.h
 
 unictype/pr_byname.h: unictype/pr_byname.gperf
-	$(GPERF) -m 10 $(srcdir)/unictype/pr_byname.gperf > $(srcdir)/unictype/pr_byname.h-t
+	$(V_GPERF)$(GPERF) -m 10 $(srcdir)/unictype/pr_byname.gperf > $(srcdir)/unictype/pr_byname.h-t && \
 	mv $(srcdir)/unictype/pr_byname.h-t $(srcdir)/unictype/pr_byname.h
 
 unictype/scripts_byname.h: unictype/scripts_byname.gperf
-	$(GPERF) -m 10 $(srcdir)/unictype/scripts_byname.gperf > $(srcdir)/unictype/scripts_byname.h-t
+	$(V_GPERF)$(GPERF) -m 10 $(srcdir)/unictype/scripts_byname.gperf > $(srcdir)/unictype/scripts_byname.h-t && \
 	mv $(srcdir)/unictype/scripts_byname.h-t $(srcdir)/unictype/scripts_byname.h
 
 unigbrk.h: unigbrk.in.h
@@ -5285,7 +5324,7 @@ uninorm.h: uninorm.in.h
 	mv -f $@-t $@
 
 uninorm/composition-table.h: $(srcdir)/uninorm/composition-table.gperf
-	$(GPERF) -m 1 $(srcdir)/uninorm/composition-table.gperf > $(srcdir)/uninorm/composition-table.h-t
+	$(V_GPERF)$(GPERF) -m 1 $(srcdir)/uninorm/composition-table.gperf > $(srcdir)/uninorm/composition-table.h-t && \
 	mv $(srcdir)/uninorm/composition-table.h-t $(srcdir)/uninorm/composition-table.h
 
 # We need the following in order to create an empty placeholder for