build: Fix "make distcheck" after the line-breaking algorithm changed, part 2.

* gettext-tools/configure.ac (MSGMERGE): Test $cross_compiling, since
$CROSS_COMPILING is not set at this point.

diff --git a/gettext-tools/configure.ac b/gettext-tools/configure.ac
index 86e4f1725d6413d7bd0c8339546f981035cf7434..86432c3fb7327d99c76d8c6dae3dc3e1f7ec8d17 100644 (file)
--- a/gettext-tools/configure.ac
+++ b/gettext-tools/configure.ac
@@ -174,7 +174,7 @@ AM_GNU_GETTEXT([use-libtool], [need-ngettext], [\${top_builddir}/../gettext-runt
 dnl When not cross-compiling, use the 'msgmerge' program from this package,
 dnl for output consistency with the 'msgfilter' program used to create
 dnl en@quot.po and en@boldquot.po.
-if test "$CROSS_COMPILING" != yes; then
+if test "$cross_compiling" != yes; then
   MSGMERGE='msgmerge'
   MSGMERGE_FOR_MSGFMT_OPTION='--for-msgfmt'
 fi