Get rid of tput warnings if capability is unavailable.

This commit is contained in:
Jonathan Schleifer 2010-12-27 00:52:31 +01:00
parent f0742c4a65
commit 0e749cf744

View file

@ -24,36 +24,36 @@ AC_DEFUN([BUILDSYS_INIT], [
AC_PATH_PROG(TPUT, tput) AC_PATH_PROG(TPUT, tput)
AS_IF([test x"$TPUT" != x""], [ AS_IF([test x"$TPUT" != x""], [
if $TPUT el >/dev/null; then if x=$($TPUT el 2>/dev/null); then
AC_SUBST(TERM_EL, "$($TPUT el)") AC_SUBST(TERM_EL, "$x")
else else
AC_SUBST(TERM_EL, "$($TPUT ce)") AC_SUBST(TERM_EL, "$($TPUT ce 2>/dev/null)")
fi fi
if $TPUT sgr0 >/dev/null; then if x=$($TPUT sgr0 2>/dev/null); then
AC_SUBST(TERM_SGR0, "$($TPUT sgr0)") AC_SUBST(TERM_SGR0, "$x")
else else
AC_SUBST(TERM_SGR0, "$($TPUT me)") AC_SUBST(TERM_SGR0, "$($TPUT me 2>/dev/null)")
fi fi
if $TPUT bold >/dev/null; then if x=$($TPUT bold 2>/dev/null); then
AC_SUBST(TERM_BOLD, "$($TPUT bold)") AC_SUBST(TERM_BOLD, "$x")
else else
AC_SUBST(TERM_BOLD, "$($TPUT md)") AC_SUBST(TERM_BOLD, "$($TPUT md 2>/dev/null)")
fi fi
if $TPUT setaf 1 >/dev/null; then if x=$($TPUT setaf 1 2>/dev/null); then
AC_SUBST(TERM_SETAF1, "$($TPUT setaf 1)") AC_SUBST(TERM_SETAF1, "$x")
AC_SUBST(TERM_SETAF2, "$($TPUT setaf 2)") AC_SUBST(TERM_SETAF2, "$($TPUT setaf 2 2>/dev/null)")
AC_SUBST(TERM_SETAF3, "$($TPUT setaf 3)") AC_SUBST(TERM_SETAF3, "$($TPUT setaf 3 2>/dev/null)")
AC_SUBST(TERM_SETAF4, "$($TPUT setaf 4)") AC_SUBST(TERM_SETAF4, "$($TPUT setaf 4 2>/dev/null)")
AC_SUBST(TERM_SETAF6, "$($TPUT setaf 6)") AC_SUBST(TERM_SETAF6, "$($TPUT setaf 6 2>/dev/null)")
else else
AC_SUBST(TERM_SETAF1, "$($TPUT AF 1)") AC_SUBST(TERM_SETAF1, "$($TPUT AF 1 2>/dev/null)")
AC_SUBST(TERM_SETAF2, "$($TPUT AF 2)") AC_SUBST(TERM_SETAF2, "$($TPUT AF 2 2>/dev/null)")
AC_SUBST(TERM_SETAF3, "$($TPUT AF 3)") AC_SUBST(TERM_SETAF3, "$($TPUT AF 3 2>/dev/null)")
AC_SUBST(TERM_SETAF4, "$($TPUT AF 4)") AC_SUBST(TERM_SETAF4, "$($TPUT AF 4 2>/dev/null)")
AC_SUBST(TERM_SETAF6, "$($TPUT AF 6)") AC_SUBST(TERM_SETAF6, "$($TPUT AF 6 2>/dev/null)")
fi fi
], [ ], [
AC_SUBST(TERM_EL, '\033\133K') AC_SUBST(TERM_EL, '\033\133K')