From fb41a54877f82982b88a89aecd473f1089cc5252 Mon Sep 17 00:00:00 2001 From: Andreas Oberritter Date: Wed, 1 Dec 2010 01:27:40 +0100 Subject: [PATCH] configure.ac: move some gettext checks to conditional block --- configure.ac | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/configure.ac b/configure.ac index 5eadfb5..6e77e49 100644 --- a/configure.ac +++ b/configure.ac @@ -16,14 +16,7 @@ AC_CONFIG_MACRO_DIR([m4]) AC_CHECK_HEADERS([dbox/fp.h dbox/lcd-ks0713.h]) -AC_PATH_PROG(MSGFMT,[msgfmt]) -AC_PATH_PROG(MSGINIT,[msginit]) -AC_PATH_PROG(MSGMERGE,[msgmerge]) -AC_PATH_PROG(MSGUNIQ,[msguniq]) -AC_PATH_PROG(XGETTEXT,[xgettext]) -if test -z "$MSGFMT" -o -z "$MSGINIT" -o -z "$MSGMERGE" -o -z "$MSGUNIQ" -o -z "$XGETTEXT"; then - AC_MSG_ERROR([Could not find required gettext tools]) -fi +AC_PATH_PROG(MSGFMT, msgfmt, AC_MSG_ERROR(Could not find msgfmt)) AM_PATH_PYTHON AX_PYTHON_DEVEL @@ -88,6 +81,15 @@ fi AC_ARG_WITH(po, AS_HELP_STRING([--with-po],[enable updating of po files]), [with_po="$withval"],[with_po="no"]) +if test "$with_po" = "yes"; then + AC_PATH_PROG(MSGINIT, msginit) + AC_PATH_PROG(MSGMERGE, msgmerge) + AC_PATH_PROG(MSGUNIQ, msguniq) + AC_PATH_PROG(XGETTEXT, xgettext) + if test -z "$MSGINIT" -o -z "$MSGMERGE" -o -z "$MSGUNIQ" -o -z "$XGETTEXT"; then + AC_MSG_ERROR([Could not find required gettext tools]) + fi +fi AM_CONDITIONAL(UPDATE_PO, test "$with_po" = "yes") CPPFLAGS="$CPPFLAGS $PYTHON_CPPFLAGS" -- 2.7.4