[RFC libX11 2/2] nls: Verify Compose at build

[Mihail Konev]

Signed-off-by: Mihail Konev <k.mvc at ya.ru>
---
 nls/Makefile.am | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/nls/Makefile.am b/nls/Makefile.am
index 57665fff4282..c0f0d0c7181f 100644
--- a/nls/Makefile.am
+++ b/nls/Makefile.am
@@ -24,7 +24,7 @@ locale.alias: locale.alias.pre
         < locale.alias.l1 > locale.alias.l2
 	cat locale.alias.l2 locale.alias.l1 > locale.alias
 
-compose.dir: compose.dir.pre
+compose.dir: compose.dir.pre compose-check
 	$(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $(srcdir)/compose.dir.pre | $(CPP_SED_MAGIC) > compose.dir.l1
 	$(SED) -e '/^[^#][^	 ]*:/s/://' -e '/^[^#].*[	 ].*:/d' \
         < compose.dir.l1 > compose.dir.l2
@@ -36,12 +36,6 @@ locale.dir: locale.dir.pre
         < locale.dir.l1 > locale.dir.l2
 	cat locale.dir.l2 locale.dir.l1 > locale.dir
 
-if HAVE_PERL
-LOG_COMPILER = $(PERL)
-TESTS = compose-check.pl
-endif HAVE_PERL
-
-
 # Per-locale data files
 
 XI18N_FILES = $(locales:%=%/XI18N_OBJS)
@@ -54,3 +48,13 @@ nobase_x11locale_DATA = $(XLC_FILES) $(COMPOSE_FILES)
 EXTRA_DIST += $(nobase_x11locale_DATA:%=%.pre)
 CLEANFILES += $(nobase_x11locale_DATA)
 
+# Checks for per-locale data files
+
+compose-check: $(COMPOSE_FILES)
+if HAVE_PERL
+	@ $(PERL) $(srcdir)/compose-check.pl
+else !HAVE_PERL
+	@:
+endif !HAVE_PERL
+
+.PHONY: compose-check
-- 
2.9.2