* iconv/Makefile (test-iconvconfig): New target.

	[$(cross-compiling) != yes] (xtests): Depend on it.

diff --git a/ChangeLog b/ChangeLog
index 839475ddd7e7db691538f8a54657db44de01d94c..d15688c3ae53e0a7d522a204dbaed7bf30353f8b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2004-12-19  Roland McGrath  <roland@redhat.com>
 
+       * iconv/Makefile (test-iconvconfig): New target.
+       [$(cross-compiling) != yes] (xtests): Depend on it.
+
        * iconv/iconvconfig.c (nostdlib, output_file, output_file_len):
        New variables.
        (options, parse_opt, main): Take new options --nostdlib and

diff --git a/iconv/Makefile b/iconv/Makefile
index fe0c453e7bd8dd4a738fe822db87a9e4100fef4f..40c7cbcdd3b6544fc37101438aad87e00160f1fc 100644 (file)
--- a/iconv/Makefile
+++ b/iconv/Makefile
@@ -78,3 +78,15 @@ $(inst_bindir)/iconv: $(objpfx)iconv_prog $(+force)
 
 $(objpfx)iconv_prog: $(iconv_prog-modules:%=$(objpfx)%.o)
 $(objpfx)iconvconfig: $(iconvconfig-modules:%=$(objpfx)%.o)
+
+ifneq ($(cross-compiling),yes)
+xtests: test-iconvconfig
+endif
+
+.PHONY: test-iconvconfig
+test-iconvconfig: /dev/null $(objpfx)iconvconfig
+       tmp=$(objpfx)gconv-modules.cache.$$$$; \
+       rm -f $$tmp; \
+       $(make-test-out) --output=$$tmp --nostdlib $(inst_gconvdir) && \
+       cmp $$tmp $(inst_gconvdir)/gconv-modules.cache && \
+       rm -f $$tmp