From 8345c529d0096a7a5471d28af061904237fb8898 Mon Sep 17 00:00:00 2001 From: Steve Kay Date: Sat, 27 Feb 2016 15:06:51 -0500 Subject: [PATCH] Fixes #97 - disable NLS if any gettext components are unavailable --- configure | 9 +++++++++ configure.in | 9 +++++++++ 2 files changed, 18 insertions(+) diff --git a/configure b/configure index 815710f..00dec54 100755 --- a/configure +++ b/configure @@ -5018,15 +5018,24 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AUX_NLS" >&5 $as_echo "$AUX_NLS" >&6; } +LACKING_GETTEXT="n" if test $AUX_NLS = "yes" && test x$MSGFMT != x"msgfmt"; then echo "WARNING: msgfmt command not found!" + LACKING_GETTEXT="y" fi if test $AUX_NLS = "yes" && test x$XGETTEXT != x"xgettext"; then echo "WARNING: xgettext command not found!" + LACKING_GETTEXT="y" fi if test $AUX_NLS = "yes" && test x$MSGMERGE != x"msgmerge"; then echo "WARNING: msgmerge command not found!" + LACKING_GETTEXT="y" fi +if test $NLS = "y" && test $LACKING_GETTEXT = "y"; then + echo "WARNING: Disabling NLS" + NLS="n" +fi + # Data history to keep by sa2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking number of daily data files to keep" >&5 diff --git a/configure.in b/configure.in index 68f495a..85a211a 100644 --- a/configure.in +++ b/configure.in @@ -289,15 +289,24 @@ else fi AC_MSG_RESULT($AUX_NLS) AC_SUBST(NLS) +LACKING_GETTEXT="n" if test $AUX_NLS = "yes" && test x$MSGFMT != x"msgfmt"; then echo "WARNING: msgfmt command not found!" + LACKING_GETTEXT="y" fi if test $AUX_NLS = "yes" && test x$XGETTEXT != x"xgettext"; then echo "WARNING: xgettext command not found!" + LACKING_GETTEXT="y" fi if test $AUX_NLS = "yes" && test x$MSGMERGE != x"msgmerge"; then echo "WARNING: msgmerge command not found!" + LACKING_GETTEXT="y" fi +if test $NLS = "y" && test $LACKING_GETTEXT = "y"; then + echo "WARNING: Disabling NLS" + NLS="n" +fi + # Data history to keep by sa2 AC_MSG_CHECKING(number of daily data files to keep) -- 2.40.0