synchronise with 3.5-rc1

[kconfig-frontends] / utils / Makefile.am

diff --git a/utils/Makefile.am b/utils/Makefile.am
index 990db30aabd8533e655ea71dbe45c5efa4893d20..843c696f6a7850d72adcb51ad6f05892dd0b5e78 100644 (file)
--- a/utils/Makefile.am
+++ b/utils/Makefile.am
@@ -1,9 +1,14 @@
 dist_bin_SCRIPTS =  tweak diff merge
 dist_bin_SCRIPTS += streamline
-bin_PROGRAMS = gettext
+
+if COND_utils_gettext
+    MAYBE_utils_gettext = gettext
+endif
+bin_PROGRAMS = $(MAYBE_utils_gettext)
 
 gettext_SOURCES = gettext.c
 gettext_CPPFLAGS = $(AM_CPPFLAGS)   \
                    -I$(top_srcdir)/libs/parser
 gettext_CFLAGS = $(AM_CFLAGS) $(kf_CFLAGS)
-gettext_LDADD = $(top_builddir)/libs/parser/libkconfig-parser.la
+gettext_LDADD = $(top_builddir)/libs/parser/libkconfig-parser.la    \
+                $(intl_LIBS)