Merge tag 'upstream/0.9.7'

Upstream version 0.9.7

1 files changed, 237 insertions, 130 deletions

diff --git a/tests/Makefile.in b/tests/Makefile.in
index ea30f88..c8f1352 100644
--- a/tests/Makefile.in
+++ b/tests/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
@@ -113,20 +113,21 @@ build_triplet = @build@
 host_triplet = @host@
 TESTS = test-alloca-opt$(EXEEXT) test-array-mergesort$(EXEEXT) \
 	test-btowc1.sh test-btowc2.sh test-c-ctype$(EXEEXT) \
-	test-c-strcase.sh test-environ$(EXEEXT) test-errno$(EXEEXT) \
-	test-fdopen$(EXEEXT) test-fgetc$(EXEEXT) test-float$(EXEEXT) \
-	test-fputc$(EXEEXT) test-fread$(EXEEXT) \
+	test-c-strcase.sh test-ctype$(EXEEXT) test-environ$(EXEEXT) \
+	test-errno$(EXEEXT) test-fdopen$(EXEEXT) test-fgetc$(EXEEXT) \
+	test-float$(EXEEXT) test-fputc$(EXEEXT) test-fread$(EXEEXT) \
 	test-frexp-nolibm$(EXEEXT) test-frexpl-nolibm$(EXEEXT) \
 	test-fseterr$(EXEEXT) test-fwrite$(EXEEXT) \
-	test-iconv-h$(EXEEXT) test-iconv$(EXEEXT) \
-	test-intprops$(EXEEXT) test-inttypes$(EXEEXT) \
-	test-isnand-nolibm$(EXEEXT) test-isnanf-nolibm$(EXEEXT) \
-	test-isnanl-nolibm$(EXEEXT) test-iswblank$(EXEEXT) \
-	test-langinfo$(EXEEXT) test-locale$(EXEEXT) \
+	test-getprogname$(EXEEXT) test-iconv-h$(EXEEXT) \
+	test-iconv$(EXEEXT) test-intprops$(EXEEXT) \
+	test-inttypes$(EXEEXT) test-isnand-nolibm$(EXEEXT) \
+	test-isnanf-nolibm$(EXEEXT) test-isnanl-nolibm$(EXEEXT) \
+	test-iswblank$(EXEEXT) test-langinfo$(EXEEXT) \
+	test-limits-h$(EXEEXT) test-locale$(EXEEXT) \
 	test-localename$(EXEEXT) test-lock$(EXEEXT) \
 	test-malloca$(EXEEXT) test-math$(EXEEXT) test-mbrtowc1.sh \
 	test-mbrtowc2.sh test-mbrtowc3.sh test-mbrtowc4.sh \
-	test-mbrtowc-w32-1.sh test-mbrtowc-w32-2.sh \
+	test-mbrtowc5.sh test-mbrtowc-w32-1.sh test-mbrtowc-w32-2.sh \
 	test-mbrtowc-w32-3.sh test-mbrtowc-w32-4.sh \
 	test-mbrtowc-w32-5.sh test-mbsinit.sh test-memchr$(EXEEXT) \
 	test-printf-frexp$(EXEEXT) test-printf-frexpl$(EXEEXT) \
@@ -395,51 +396,53 @@ noinst_PROGRAMS =
 check_PROGRAMS = test-alloca-opt$(EXEEXT) \
 	test-array-mergesort$(EXEEXT) test-btowc$(EXEEXT) \
 	test-c-ctype$(EXEEXT) test-c-strcasecmp$(EXEEXT) \
-	test-c-strncasecmp$(EXEEXT) test-environ$(EXEEXT) \
-	test-errno$(EXEEXT) test-fdopen$(EXEEXT) test-fgetc$(EXEEXT) \
-	test-float$(EXEEXT) test-fputc$(EXEEXT) test-fread$(EXEEXT) \
-	test-frexp-nolibm$(EXEEXT) test-frexpl-nolibm$(EXEEXT) \
-	test-fseterr$(EXEEXT) test-fwrite$(EXEEXT) \
+	test-c-strncasecmp$(EXEEXT) test-ctype$(EXEEXT) \
+	test-environ$(EXEEXT) test-errno$(EXEEXT) test-fdopen$(EXEEXT) \
+	test-fgetc$(EXEEXT) test-float$(EXEEXT) test-fputc$(EXEEXT) \
+	test-fread$(EXEEXT) test-frexp-nolibm$(EXEEXT) \
+	test-frexpl-nolibm$(EXEEXT) test-fseterr$(EXEEXT) \
+	test-fwrite$(EXEEXT) test-getprogname$(EXEEXT) \
 	test-iconv-h$(EXEEXT) test-iconv$(EXEEXT) \
 	test-intprops$(EXEEXT) test-inttypes$(EXEEXT) \
 	test-isnand-nolibm$(EXEEXT) test-isnanf-nolibm$(EXEEXT) \
 	test-isnanl-nolibm$(EXEEXT) test-iswblank$(EXEEXT) \
-	test-langinfo$(EXEEXT) test-locale$(EXEEXT) \
-	test-localename$(EXEEXT) test-lock$(EXEEXT) \
-	test-malloca$(EXEEXT) test-math$(EXEEXT) test-mbrtowc$(EXEEXT) \
-	test-mbrtowc-w32$(EXEEXT) test-mbsinit$(EXEEXT) \
-	test-memchr$(EXEEXT) test-printf-frexp$(EXEEXT) \
-	test-printf-frexpl$(EXEEXT) test-setenv$(EXEEXT) \
-	test-setlocale1$(EXEEXT) test-setlocale2$(EXEEXT) \
-	test-signbit$(EXEEXT) test-stdalign$(EXEEXT) \
-	test-stdbool$(EXEEXT) test-stddef$(EXEEXT) \
-	test-stdint$(EXEEXT) test-stdio$(EXEEXT) test-stdlib$(EXEEXT) \
-	test-strerror$(EXEEXT) test-striconveh$(EXEEXT) \
-	test-striconveha$(EXEEXT) test-string$(EXEEXT) \
-	test-strncat$(EXEEXT) test-strstr$(EXEEXT) \
-	test-sys_types$(EXEEXT) test-thread_self$(EXEEXT) \
-	test-thread_create$(EXEEXT) test-cased$(EXEEXT) \
-	test-ignorable$(EXEEXT) test-locale-language$(EXEEXT) \
-	test-uc_tolower$(EXEEXT) test-uc_totitle$(EXEEXT) \
-	test-uc_toupper$(EXEEXT) test-u16-casecmp$(EXEEXT) \
-	test-u16-casecoll$(EXEEXT) test-u16-casefold$(EXEEXT) \
-	test-u16-is-cased$(EXEEXT) test-u16-is-casefolded$(EXEEXT) \
-	test-u16-is-lowercase$(EXEEXT) test-u16-is-titlecase$(EXEEXT) \
-	test-u16-is-uppercase$(EXEEXT) test-u16-tolower$(EXEEXT) \
-	test-u16-totitle$(EXEEXT) test-u16-toupper$(EXEEXT) \
-	test-u32-casecmp$(EXEEXT) test-u32-casecoll$(EXEEXT) \
-	test-u32-casefold$(EXEEXT) test-u32-is-cased$(EXEEXT) \
-	test-u32-is-casefolded$(EXEEXT) test-u32-is-lowercase$(EXEEXT) \
-	test-u32-is-titlecase$(EXEEXT) test-u32-is-uppercase$(EXEEXT) \
-	test-u32-tolower$(EXEEXT) test-u32-totitle$(EXEEXT) \
-	test-u32-toupper$(EXEEXT) test-u8-casecmp$(EXEEXT) \
-	test-u8-casecoll$(EXEEXT) test-u8-casefold$(EXEEXT) \
-	test-u8-is-cased$(EXEEXT) test-u8-is-casefolded$(EXEEXT) \
-	test-u8-is-lowercase$(EXEEXT) test-u8-is-titlecase$(EXEEXT) \
-	test-u8-is-uppercase$(EXEEXT) test-u8-tolower$(EXEEXT) \
-	test-u8-totitle$(EXEEXT) test-u8-toupper$(EXEEXT) \
-	test-ulc-casecmp$(EXEEXT) test-ulc-casecoll$(EXEEXT) \
-	test-u16-conv-from-enc$(EXEEXT) test-u16-conv-to-enc$(EXEEXT) \
+	test-langinfo$(EXEEXT) test-limits-h$(EXEEXT) \
+	test-locale$(EXEEXT) test-localename$(EXEEXT) \
+	test-lock$(EXEEXT) test-malloca$(EXEEXT) test-math$(EXEEXT) \
+	test-mbrtowc$(EXEEXT) test-mbrtowc-w32$(EXEEXT) \
+	test-mbsinit$(EXEEXT) test-memchr$(EXEEXT) \
+	test-printf-frexp$(EXEEXT) test-printf-frexpl$(EXEEXT) \
+	test-setenv$(EXEEXT) test-setlocale1$(EXEEXT) \
+	test-setlocale2$(EXEEXT) test-signbit$(EXEEXT) \
+	test-stdalign$(EXEEXT) test-stdbool$(EXEEXT) \
+	test-stddef$(EXEEXT) test-stdint$(EXEEXT) test-stdio$(EXEEXT) \
+	test-stdlib$(EXEEXT) test-strerror$(EXEEXT) \
+	test-striconveh$(EXEEXT) test-striconveha$(EXEEXT) \
+	test-string$(EXEEXT) test-strncat$(EXEEXT) \
+	test-strstr$(EXEEXT) test-sys_types$(EXEEXT) \
+	test-thread_self$(EXEEXT) test-thread_create$(EXEEXT) \
+	test-cased$(EXEEXT) test-ignorable$(EXEEXT) \
+	test-locale-language$(EXEEXT) test-uc_tolower$(EXEEXT) \
+	test-uc_totitle$(EXEEXT) test-uc_toupper$(EXEEXT) \
+	test-u16-casecmp$(EXEEXT) test-u16-casecoll$(EXEEXT) \
+	test-u16-casefold$(EXEEXT) test-u16-is-cased$(EXEEXT) \
+	test-u16-is-casefolded$(EXEEXT) test-u16-is-lowercase$(EXEEXT) \
+	test-u16-is-titlecase$(EXEEXT) test-u16-is-uppercase$(EXEEXT) \
+	test-u16-tolower$(EXEEXT) test-u16-totitle$(EXEEXT) \
+	test-u16-toupper$(EXEEXT) test-u32-casecmp$(EXEEXT) \
+	test-u32-casecoll$(EXEEXT) test-u32-casefold$(EXEEXT) \
+	test-u32-is-cased$(EXEEXT) test-u32-is-casefolded$(EXEEXT) \
+	test-u32-is-lowercase$(EXEEXT) test-u32-is-titlecase$(EXEEXT) \
+	test-u32-is-uppercase$(EXEEXT) test-u32-tolower$(EXEEXT) \
+	test-u32-totitle$(EXEEXT) test-u32-toupper$(EXEEXT) \
+	test-u8-casecmp$(EXEEXT) test-u8-casecoll$(EXEEXT) \
+	test-u8-casefold$(EXEEXT) test-u8-is-cased$(EXEEXT) \
+	test-u8-is-casefolded$(EXEEXT) test-u8-is-lowercase$(EXEEXT) \
+	test-u8-is-titlecase$(EXEEXT) test-u8-is-uppercase$(EXEEXT) \
+	test-u8-tolower$(EXEEXT) test-u8-totitle$(EXEEXT) \
+	test-u8-toupper$(EXEEXT) test-ulc-casecmp$(EXEEXT) \
+	test-ulc-casecoll$(EXEEXT) test-u16-conv-from-enc$(EXEEXT) \
+	test-u16-conv-to-enc$(EXEEXT) \
 	test-u16-strconv-from-enc$(EXEEXT) \
 	test-u16-strconv-to-enc$(EXEEXT) \
 	test-u32-conv-from-enc$(EXEEXT) test-u32-conv-to-enc$(EXEEXT) \
@@ -679,6 +682,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 \
@@ -690,15 +696,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 \
@@ -720,6 +729,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 \
@@ -807,7 +817,8 @@ am__v_AR_1 =
 libtests_a_AR = $(AR) $(ARFLAGS)
 am__DEPENDENCIES_1 =
 am__dirstamp = $(am__leading_dot)dirstamp
-am_libtests_a_OBJECTS = exitfail.$(OBJEXT) progname.$(OBJEXT) \
+am_libtests_a_OBJECTS = dirname-lgpl.$(OBJEXT) basename-lgpl.$(OBJEXT) \
+	stripslash.$(OBJEXT) exitfail.$(OBJEXT) getprogname.$(OBJEXT) \
 	glthread/thread.$(OBJEXT) xmalloc.$(OBJEXT) \
 	xalloc-die.$(OBJEXT)
 libtests_a_OBJECTS = $(am_libtests_a_OBJECTS)
@@ -1055,6 +1066,11 @@ test_compat_decomposition_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_composition_OBJECTS = uninorm/test-composition.$(OBJEXT)
 test_composition_OBJECTS = $(am_test_composition_OBJECTS)
 test_composition_DEPENDENCIES = $(am__DEPENDENCIES_2)
+test_ctype_SOURCES = test-ctype.c
+test_ctype_OBJECTS = test-ctype.$(OBJEXT)
+test_ctype_LDADD = $(LDADD)
+test_ctype_DEPENDENCIES = libtests.a ../lib/libunistring.la libtests.a \
+	$(am__DEPENDENCIES_1)
 am_test_ctype_alnum_OBJECTS = unictype/test-ctype_alnum.$(OBJEXT)
 test_ctype_alnum_OBJECTS = $(am_test_ctype_alnum_OBJECTS)
 test_ctype_alnum_DEPENDENCIES = $(am__DEPENDENCIES_2)
@@ -1160,6 +1176,9 @@ test_fwrite_OBJECTS = test-fwrite.$(OBJEXT)
 test_fwrite_LDADD = $(LDADD)
 test_fwrite_DEPENDENCIES = libtests.a ../lib/libunistring.la \
 	libtests.a $(am__DEPENDENCIES_1)
+test_getprogname_SOURCES = test-getprogname.c
+test_getprogname_OBJECTS = test-getprogname.$(OBJEXT)
+test_getprogname_DEPENDENCIES = $(am__DEPENDENCIES_2)
 test_iconv_SOURCES = test-iconv.c
 test_iconv_OBJECTS = test-iconv.$(OBJEXT)
 test_iconv_DEPENDENCIES = $(am__DEPENDENCIES_2)
@@ -1237,6 +1256,11 @@ test_langinfo_OBJECTS = test-langinfo.$(OBJEXT)
 test_langinfo_LDADD = $(LDADD)
 test_langinfo_DEPENDENCIES = libtests.a ../lib/libunistring.la \
 	libtests.a $(am__DEPENDENCIES_1)
+test_limits_h_SOURCES = test-limits-h.c
+test_limits_h_OBJECTS = test-limits-h.$(OBJEXT)
+test_limits_h_LDADD = $(LDADD)
+test_limits_h_DEPENDENCIES = libtests.a ../lib/libunistring.la \
+	libtests.a $(am__DEPENDENCIES_1)
 test_locale_SOURCES = test-locale.c
 test_locale_OBJECTS = test-locale.$(OBJEXT)
 test_locale_LDADD = $(LDADD)
@@ -2691,34 +2715,35 @@ SOURCES = $(libtests_a_SOURCES) $(EXTRA_libtests_a_SOURCES) \
 	$(test_combiningclass_longname_SOURCES) \
 	$(test_combiningclass_name_SOURCES) \
 	$(test_compat_decomposition_SOURCES) \
-	$(test_composition_SOURCES) $(test_ctype_alnum_SOURCES) \
-	$(test_ctype_alpha_SOURCES) $(test_ctype_blank_SOURCES) \
-	$(test_ctype_cntrl_SOURCES) $(test_ctype_digit_SOURCES) \
-	$(test_ctype_graph_SOURCES) $(test_ctype_lower_SOURCES) \
-	$(test_ctype_print_SOURCES) $(test_ctype_punct_SOURCES) \
-	$(test_ctype_space_SOURCES) $(test_ctype_upper_SOURCES) \
-	$(test_ctype_xdigit_SOURCES) $(test_decdigit_SOURCES) \
-	$(test_decomposing_form_SOURCES) $(test_decomposition_SOURCES) \
-	$(test_digit_SOURCES) test-environ.c test-errno.c \
-	test-fdopen.c test-fgetc.c test-float.c test-fputc.c \
-	test-fread.c $(test_frexp_nolibm_SOURCES) \
-	$(test_frexpl_nolibm_SOURCES) test-fseterr.c test-fwrite.c \
-	test-iconv.c test-iconv-h.c $(test_ignorable_SOURCES) \
-	test-intprops.c test-inttypes.c test-isnand-nolibm.c \
-	test-isnanf-nolibm.c test-isnanl-nolibm.c test-iswblank.c \
+	$(test_composition_SOURCES) test-ctype.c \
+	$(test_ctype_alnum_SOURCES) $(test_ctype_alpha_SOURCES) \
+	$(test_ctype_blank_SOURCES) $(test_ctype_cntrl_SOURCES) \
+	$(test_ctype_digit_SOURCES) $(test_ctype_graph_SOURCES) \
+	$(test_ctype_lower_SOURCES) $(test_ctype_print_SOURCES) \
+	$(test_ctype_punct_SOURCES) $(test_ctype_space_SOURCES) \
+	$(test_ctype_upper_SOURCES) $(test_ctype_xdigit_SOURCES) \
+	$(test_decdigit_SOURCES) $(test_decomposing_form_SOURCES) \
+	$(test_decomposition_SOURCES) $(test_digit_SOURCES) \
+	test-environ.c test-errno.c test-fdopen.c test-fgetc.c \
+	test-float.c test-fputc.c test-fread.c \
+	$(test_frexp_nolibm_SOURCES) $(test_frexpl_nolibm_SOURCES) \
+	test-fseterr.c test-fwrite.c test-getprogname.c test-iconv.c \
+	test-iconv-h.c $(test_ignorable_SOURCES) test-intprops.c \
+	test-inttypes.c test-isnand-nolibm.c test-isnanf-nolibm.c \
+	test-isnanl-nolibm.c test-iswblank.c \
 	$(test_joininggroup_byname_SOURCES) \
 	$(test_joininggroup_name_SOURCES) \
 	$(test_joininggroup_of_SOURCES) \
 	$(test_joiningtype_byname_SOURCES) \
 	$(test_joiningtype_longname_SOURCES) \
 	$(test_joiningtype_name_SOURCES) \
-	$(test_joiningtype_of_SOURCES) test-langinfo.c test-locale.c \
-	$(test_locale_language_SOURCES) test-localename.c test-lock.c \
-	test-malloca.c test-math.c test-mbrtowc.c test-mbrtowc-w32.c \
-	test-mbsinit.c test-memchr.c $(test_mirror_SOURCES) \
-	$(test_nfc_SOURCES) $(test_nfd_SOURCES) $(test_nfkc_SOURCES) \
-	$(test_nfkd_SOURCES) $(test_numeric_SOURCES) \
-	$(test_pr_alphabetic_SOURCES) \
+	$(test_joiningtype_of_SOURCES) test-langinfo.c test-limits-h.c \
+	test-locale.c $(test_locale_language_SOURCES) \
+	test-localename.c test-lock.c test-malloca.c test-math.c \
+	test-mbrtowc.c test-mbrtowc-w32.c test-mbsinit.c test-memchr.c \
+	$(test_mirror_SOURCES) $(test_nfc_SOURCES) $(test_nfd_SOURCES) \
+	$(test_nfkc_SOURCES) $(test_nfkd_SOURCES) \
+	$(test_numeric_SOURCES) $(test_pr_alphabetic_SOURCES) \
 	$(test_pr_ascii_hex_digit_SOURCES) \
 	$(test_pr_bidi_arabic_digit_SOURCES) \
 	$(test_pr_bidi_arabic_right_to_left_SOURCES) \
@@ -2969,34 +2994,35 @@ DIST_SOURCES = $(libtests_a_SOURCES) $(EXTRA_libtests_a_SOURCES) \
 	$(test_combiningclass_longname_SOURCES) \
 	$(test_combiningclass_name_SOURCES) \
 	$(test_compat_decomposition_SOURCES) \
-	$(test_composition_SOURCES) $(test_ctype_alnum_SOURCES) \
-	$(test_ctype_alpha_SOURCES) $(test_ctype_blank_SOURCES) \
-	$(test_ctype_cntrl_SOURCES) $(test_ctype_digit_SOURCES) \
-	$(test_ctype_graph_SOURCES) $(test_ctype_lower_SOURCES) \
-	$(test_ctype_print_SOURCES) $(test_ctype_punct_SOURCES) \
-	$(test_ctype_space_SOURCES) $(test_ctype_upper_SOURCES) \
-	$(test_ctype_xdigit_SOURCES) $(test_decdigit_SOURCES) \
-	$(test_decomposing_form_SOURCES) $(test_decomposition_SOURCES) \
-	$(test_digit_SOURCES) test-environ.c test-errno.c \
-	test-fdopen.c test-fgetc.c test-float.c test-fputc.c \
-	test-fread.c $(test_frexp_nolibm_SOURCES) \
-	$(test_frexpl_nolibm_SOURCES) test-fseterr.c test-fwrite.c \
-	test-iconv.c test-iconv-h.c $(test_ignorable_SOURCES) \
-	test-intprops.c test-inttypes.c test-isnand-nolibm.c \
-	test-isnanf-nolibm.c test-isnanl-nolibm.c test-iswblank.c \
+	$(test_composition_SOURCES) test-ctype.c \
+	$(test_ctype_alnum_SOURCES) $(test_ctype_alpha_SOURCES) \
+	$(test_ctype_blank_SOURCES) $(test_ctype_cntrl_SOURCES) \
+	$(test_ctype_digit_SOURCES) $(test_ctype_graph_SOURCES) \
+	$(test_ctype_lower_SOURCES) $(test_ctype_print_SOURCES) \
+	$(test_ctype_punct_SOURCES) $(test_ctype_space_SOURCES) \
+	$(test_ctype_upper_SOURCES) $(test_ctype_xdigit_SOURCES) \
+	$(test_decdigit_SOURCES) $(test_decomposing_form_SOURCES) \
+	$(test_decomposition_SOURCES) $(test_digit_SOURCES) \
+	test-environ.c test-errno.c test-fdopen.c test-fgetc.c \
+	test-float.c test-fputc.c test-fread.c \
+	$(test_frexp_nolibm_SOURCES) $(test_frexpl_nolibm_SOURCES) \
+	test-fseterr.c test-fwrite.c test-getprogname.c test-iconv.c \
+	test-iconv-h.c $(test_ignorable_SOURCES) test-intprops.c \
+	test-inttypes.c test-isnand-nolibm.c test-isnanf-nolibm.c \
+	test-isnanl-nolibm.c test-iswblank.c \
 	$(test_joininggroup_byname_SOURCES) \
 	$(test_joininggroup_name_SOURCES) \
 	$(test_joininggroup_of_SOURCES) \
 	$(test_joiningtype_byname_SOURCES) \
 	$(test_joiningtype_longname_SOURCES) \
 	$(test_joiningtype_name_SOURCES) \
-	$(test_joiningtype_of_SOURCES) test-langinfo.c test-locale.c \
-	$(test_locale_language_SOURCES) test-localename.c test-lock.c \
-	test-malloca.c test-math.c test-mbrtowc.c test-mbrtowc-w32.c \
-	test-mbsinit.c test-memchr.c $(test_mirror_SOURCES) \
-	$(test_nfc_SOURCES) $(test_nfd_SOURCES) $(test_nfkc_SOURCES) \
-	$(test_nfkd_SOURCES) $(test_numeric_SOURCES) \
-	$(test_pr_alphabetic_SOURCES) \
+	$(test_joiningtype_of_SOURCES) test-langinfo.c test-limits-h.c \
+	test-locale.c $(test_locale_language_SOURCES) \
+	test-localename.c test-lock.c test-malloca.c test-math.c \
+	test-mbrtowc.c test-mbrtowc-w32.c test-mbsinit.c test-memchr.c \
+	$(test_mirror_SOURCES) $(test_nfc_SOURCES) $(test_nfd_SOURCES) \
+	$(test_nfkc_SOURCES) $(test_nfkd_SOURCES) \
+	$(test_numeric_SOURCES) $(test_pr_alphabetic_SOURCES) \
 	$(test_pr_ascii_hex_digit_SOURCES) \
 	$(test_pr_bidi_arabic_digit_SOURCES) \
 	$(test_pr_bidi_arabic_right_to_left_SOURCES) \
@@ -3510,7 +3536,7 @@ CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
+DEFS = @DEFS@ -DEXEEXT=\"@EXEEXT@\"
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
 DLL_VARIABLE = @DLL_VARIABLE@
@@ -3642,6 +3668,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@
@@ -3862,6 +3889,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@
@@ -3985,6 +4013,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@
@@ -4038,6 +4067,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@
@@ -4171,6 +4201,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@
@@ -4190,11 +4221,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@
@@ -4206,11 +4239,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@
@@ -4545,32 +4580,33 @@ check_LIBRARIES = libtests.a
 EXTRA_DIST = test-alloca-opt.c test-array-mergesort.c macros.h btowc.c \
 	test-btowc1.sh test-btowc2.sh test-btowc.c signature.h \
 	macros.h test-c-ctype.c macros.h test-c-strcase.sh \
-	test-c-strcasecmp.c test-c-strncasecmp.c macros.h \
-	test-environ.c test-errno.c error.c error.h exitfail.h \
-	fdopen.c test-fdopen.c signature.h macros.h test-fgetc.c \
-	signature.h macros.h test-float.c macros.h test-fputc.c \
-	signature.h macros.h test-fread.c signature.h macros.h \
-	test-frexp.c test-frexp.h minus-zero.h infinity.h nan.h \
-	signature.h macros.h randomd.c test-frexpl.c test-frexp.h \
-	minus-zero.h infinity.h nan.h signature.h macros.h randoml.c \
-	test-fseterr.c test-fwrite.c signature.h macros.h \
-	getpagesize.c test-iconv-h.c test-iconv.c signature.h macros.h \
-	intprops.h test-intprops.c macros.h inttypes.in.h \
-	test-inttypes.c test-isnand-nolibm.c test-isnand.h \
-	minus-zero.h infinity.h nan.h macros.h test-isnanf-nolibm.c \
-	test-isnanf.h minus-zero.h infinity.h nan.h macros.h \
-	test-isnanl-nolibm.c test-isnanl.h minus-zero.h infinity.h \
-	nan.h macros.h test-iswblank.c macros.h test-langinfo.c \
-	locale.in.h test-locale.c test-localename.c macros.h \
-	test-lock.c test-malloca.c test-math.c macros.h \
-	test-mbrtowc1.sh test-mbrtowc2.sh test-mbrtowc3.sh \
-	test-mbrtowc4.sh test-mbrtowc.c test-mbrtowc-w32-1.sh \
-	test-mbrtowc-w32-2.sh test-mbrtowc-w32-3.sh \
-	test-mbrtowc-w32-4.sh test-mbrtowc-w32-5.sh test-mbrtowc-w32.c \
-	signature.h macros.h test-mbsinit.sh test-mbsinit.c \
-	signature.h macros.h mbtowc-impl.h mbtowc.c test-memchr.c \
-	zerosize-ptr.h signature.h macros.h msvc-inval.c msvc-inval.h \
-	msvc-nothrow.c msvc-nothrow.h test-printf-frexp.c macros.h \
+	test-c-strcasecmp.c test-c-strncasecmp.c macros.h ctype.in.h \
+	test-ctype.c dirname.h dosname.h test-environ.c test-errno.c \
+	error.c error.h exitfail.h fdopen.c test-fdopen.c signature.h \
+	macros.h test-fgetc.c signature.h macros.h test-float.c \
+	macros.h test-fputc.c signature.h macros.h test-fread.c \
+	signature.h macros.h test-frexp.c test-frexp.h minus-zero.h \
+	infinity.h nan.h signature.h macros.h randomd.c test-frexpl.c \
+	test-frexp.h minus-zero.h infinity.h nan.h signature.h \
+	macros.h randoml.c test-fseterr.c test-fwrite.c signature.h \
+	macros.h getpagesize.c test-getprogname.c test-iconv-h.c \
+	test-iconv.c signature.h macros.h intprops.h test-intprops.c \
+	macros.h inttypes.in.h test-inttypes.c test-isnand-nolibm.c \
+	test-isnand.h minus-zero.h infinity.h nan.h macros.h \
+	test-isnanf-nolibm.c test-isnanf.h minus-zero.h infinity.h \
+	nan.h macros.h test-isnanl-nolibm.c test-isnanl.h minus-zero.h \
+	infinity.h nan.h macros.h test-iswblank.c macros.h \
+	test-langinfo.c test-limits-h.c locale.in.h test-locale.c \
+	test-localename.c macros.h test-lock.c test-malloca.c \
+	test-math.c macros.h test-mbrtowc1.sh test-mbrtowc2.sh \
+	test-mbrtowc3.sh test-mbrtowc4.sh test-mbrtowc5.sh \
+	test-mbrtowc.c test-mbrtowc-w32-1.sh test-mbrtowc-w32-2.sh \
+	test-mbrtowc-w32-3.sh test-mbrtowc-w32-4.sh \
+	test-mbrtowc-w32-5.sh test-mbrtowc-w32.c signature.h macros.h \
+	test-mbsinit.sh test-mbsinit.c signature.h macros.h \
+	mbtowc-impl.h mbtowc.c test-memchr.c zerosize-ptr.h \
+	signature.h macros.h msvc-inval.c msvc-inval.h msvc-nothrow.c \
+	msvc-nothrow.h test-printf-frexp.c macros.h \
 	test-printf-frexpl.c macros.h putenv.c setenv.c test-setenv.c \
 	signature.h macros.h setlocale.c test-setlocale1.sh \
 	test-setlocale1.c test-setlocale2.sh test-setlocale2.c \
@@ -5259,13 +5295,18 @@ EXTRA_DIST = test-alloca-opt.c test-array-mergesort.c macros.h btowc.c \
 # statements but through direct file reference. Therefore this snippet must be
 # present in all Makefile.am that need it. This is ensured by the applicability
 # 'all' defined above.
-BUILT_SOURCES = inttypes.h locale.h arg-nonnull.h c++defs.h \
+BUILT_SOURCES = ctype.h inttypes.h locale.h arg-nonnull.h c++defs.h \
 	unused-parameter.h warn-on-use.h $(STDALIGN_H) stdio.h
 SUFFIXES = 
-MOSTLYCLEANFILES = core *.stackdump inttypes.h inttypes.h-t locale.h \
-	locale.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 stdalign.h stdalign.h-t stdio.h stdio.h-t
+
+# This test expects compilation of test-verify.c to fail, and
+# each time it fails, the makefile rule does not perform the usual
+#  "mv -f $name.Tpo $name.po, so tell make clean to remove that file.
+MOSTLYCLEANFILES = core *.stackdump ctype.h ctype.h-t inttypes.h \
+	inttypes.h-t locale.h locale.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 stdalign.h stdalign.h-t stdio.h \
+	stdio.h-t .deps/test-verify.Tpo
 MOSTLYCLEANDIRS = 
 CLEANFILES = 
 DISTCLEANFILES = 
@@ -5277,7 +5318,8 @@ AM_CPPFLAGS = \
   -I../lib -I$(srcdir)/../lib
 
 LDADD = libtests.a ../lib/libunistring.la libtests.a $(LIBTESTS_LIBDEPS)
-libtests_a_SOURCES = exitfail.c gettext.h progname.h progname.c \
+libtests_a_SOURCES = dirname-lgpl.c basename-lgpl.c stripslash.c \
+	exitfail.c getprogname.h getprogname.c gettext.h \
 	glthread/thread.h glthread/thread.c xmalloc.c xalloc-die.c \
 	glthread/yield.h
 libtests_a_LIBADD = $(gltests_LIBOBJS)
@@ -5289,6 +5331,7 @@ EXTRA_libtests_a_SOURCES = btowc.c error.c fdopen.c getpagesize.c \
 AM_LIBTOOLFLAGS = --preserve-dup-deps
 test_frexp_nolibm_SOURCES = test-frexp.c randomd.c
 test_frexpl_nolibm_SOURCES = test-frexpl.c randoml.c
+test_getprogname_LDADD = $(LDADD)
 test_iconv_LDADD = $(LDADD) @LIBICONV@
 test_localename_LDADD = $(LDADD) @INTL_MACOSX_LIBS@ $(LIBTHREAD)
 test_lock_LDADD = $(LDADD) @LIBMULTITHREAD@ @YIELD_LIB@
@@ -6670,6 +6713,10 @@ uninorm/test-composition.$(OBJEXT): uninorm/$(am__dirstamp) \
 test-composition$(EXEEXT): $(test_composition_OBJECTS) $(test_composition_DEPENDENCIES) $(EXTRA_test_composition_DEPENDENCIES) 
 	@rm -f test-composition$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_composition_OBJECTS) $(test_composition_LDADD) $(LIBS)
+
+test-ctype$(EXEEXT): $(test_ctype_OBJECTS) $(test_ctype_DEPENDENCIES) $(EXTRA_test_ctype_DEPENDENCIES) 
+	@rm -f test-ctype$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_ctype_OBJECTS) $(test_ctype_LDADD) $(LIBS)
 unictype/test-ctype_alnum.$(OBJEXT): unictype/$(am__dirstamp) \
 	unictype/$(DEPDIR)/$(am__dirstamp)
 
@@ -6811,6 +6858,10 @@ test-fwrite$(EXEEXT): $(test_fwrite_OBJECTS) $(test_fwrite_DEPENDENCIES) $(EXTRA
 	@rm -f test-fwrite$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_fwrite_OBJECTS) $(test_fwrite_LDADD) $(LIBS)
 
+test-getprogname$(EXEEXT): $(test_getprogname_OBJECTS) $(test_getprogname_DEPENDENCIES) $(EXTRA_test_getprogname_DEPENDENCIES) 
+	@rm -f test-getprogname$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_getprogname_OBJECTS) $(test_getprogname_LDADD) $(LIBS)
+
 test-iconv$(EXEEXT): $(test_iconv_OBJECTS) $(test_iconv_DEPENDENCIES) $(EXTRA_test_iconv_DEPENDENCIES) 
 	@rm -f test-iconv$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_iconv_OBJECTS) $(test_iconv_LDADD) $(LIBS)
@@ -6895,6 +6946,10 @@ test-langinfo$(EXEEXT): $(test_langinfo_OBJECTS) $(test_langinfo_DEPENDENCIES) $
 	@rm -f test-langinfo$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_langinfo_OBJECTS) $(test_langinfo_LDADD) $(LIBS)
 
+test-limits-h$(EXEEXT): $(test_limits_h_OBJECTS) $(test_limits_h_DEPENDENCIES) $(EXTRA_test_limits_h_DEPENDENCIES) 
+	@rm -f test-limits-h$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_limits_h_OBJECTS) $(test_limits_h_LDADD) $(LIBS)
+
 test-locale$(EXEEXT): $(test_locale_OBJECTS) $(test_locale_DEPENDENCIES) $(EXTRA_test_locale_DEPENDENCIES) 
 	@rm -f test-locale$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_locale_OBJECTS) $(test_locale_LDADD) $(LIBS)
@@ -9111,15 +9166,17 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/basename-lgpl.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/btowc.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dirname-lgpl.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/error.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/exitfail.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fdopen.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getpagesize.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getprogname.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mbtowc.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msvc-inval.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msvc-nothrow.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/progname.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/putenv.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/randomd.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/randoml.Po@am__quote@
@@ -9127,12 +9184,14 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/setlocale.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strerror-override.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strerror.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stripslash.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-alloca-opt.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-array-mergesort.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-btowc.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-c-ctype.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-c-strcasecmp.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-c-strncasecmp.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-ctype.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-environ.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-errno.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-fdopen.Po@am__quote@
@@ -9144,6 +9203,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-frexpl.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-fseterr.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-fwrite.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-getprogname.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-iconv-h.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-iconv.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-intprops.Po@am__quote@
@@ -9153,6 +9213,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-isnanl-nolibm.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-iswblank.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-langinfo.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-limits-h.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-locale.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-localename.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-lock.Po@am__quote@
@@ -9940,6 +10001,13 @@ test-c-strcase.sh.log: test-c-strcase.sh
 	--log-file $$b.log --trs-file $$b.trs \
 	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
 	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-ctype.log: test-ctype$(EXEEXT)
+	@p='test-ctype$(EXEEXT)'; \
+	b='test-ctype'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-environ.log: test-environ$(EXEEXT)
 	@p='test-environ$(EXEEXT)'; \
 	b='test-environ'; \
@@ -10017,6 +10085,13 @@ test-fwrite.log: test-fwrite$(EXEEXT)
 	--log-file $$b.log --trs-file $$b.trs \
 	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
 	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-getprogname.log: test-getprogname$(EXEEXT)
+	@p='test-getprogname$(EXEEXT)'; \
+	b='test-getprogname'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-iconv-h.log: test-iconv-h$(EXEEXT)
 	@p='test-iconv-h$(EXEEXT)'; \
 	b='test-iconv-h'; \
@@ -10080,6 +10155,13 @@ test-langinfo.log: test-langinfo$(EXEEXT)
 	--log-file $$b.log --trs-file $$b.trs \
 	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
 	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-limits-h.log: test-limits-h$(EXEEXT)
+	@p='test-limits-h$(EXEEXT)'; \
+	b='test-limits-h'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-locale.log: test-locale$(EXEEXT)
 	@p='test-locale$(EXEEXT)'; \
 	b='test-locale'; \
@@ -10143,6 +10225,13 @@ test-mbrtowc4.sh.log: test-mbrtowc4.sh
 	--log-file $$b.log --trs-file $$b.trs \
 	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
 	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-mbrtowc5.sh.log: test-mbrtowc5.sh
+	@p='test-mbrtowc5.sh'; \
+	b='test-mbrtowc5.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-mbrtowc-w32-1.sh.log: test-mbrtowc-w32-1.sh
 	@p='test-mbrtowc-w32-1.sh'; \
 	b='test-mbrtowc-w32-1.sh'; \
@@ -13598,6 +13687,24 @@ uninstall-am:
 .PRECIOUS: Makefile
 
 
+# We need the following in order to create <ctype.h> when the system
+# doesn't have one that works with the given compiler.
+ctype.h: ctype.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H)
+	$(AM_V_GEN)rm -f $@-t $@ && \
+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
+	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \
+	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
+	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
+	      -e 's|@''NEXT_CTYPE_H''@|$(NEXT_CTYPE_H)|g' \
+	      -e 's/@''GNULIB_ISBLANK''@/$(GNULIB_ISBLANK)/g' \
+	      -e 's/@''HAVE_ISBLANK''@/$(HAVE_ISBLANK)/g' \
+	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
+	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
+	      < $(srcdir)/ctype.in.h; \
+	} > $@-t && \
+	mv $@-t $@
+
 # We need the following in order to create <inttypes.h> when the system
 # doesn't have one that works with the given compiler.
 inttypes.h: inttypes.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H) $(ARG_NONNULL_H)