js/buildsys
1
1
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Stop using tput

Browse source 
It causes more problems than it solves.

FossilOrigin-Name: a1fc408477cb9cb06aa19632e921135360b505a0e464fc8bbf5e2b854b1eaa8e
This commit is contained in:
Jonathan Schleifer 2025-05-29 17:06:48 +00:00
parent ab77d9e807
commit a91173a882
2 changed files with 22 additions and 121 deletions
Download patch file Download diff file Expand all files Collapse all files

99
build-aux/m4/buildsys.m4
View file

@ -59,105 +59,6 @@ AC_DEFUN([BUILDSYS_INIT], [
AC_SUBST(AMIGA_LIB_CFLAGS)
AC_SUBST(AMIGA_LIB_LDFLAGS)
case "$build_os" in
morphos*)
dnl Don't use tput on MorphOS: The colored output is
dnl quite unreadable and in some MorphOS versions the
dnl output from tput is not 8-bit safe, with awk (for
dnl AC_SUBST) failing as a result.
;;
*)
AC_PATH_PROG(TPUT, tput)
;;
esac
AS_IF([test x"$TPUT" != x""], [
if x=$($TPUT el 2>/dev/null); then
AC_SUBST(TERM_EL, "$x")
else
AC_SUBST(TERM_EL, "$($TPUT ce 2>/dev/null)")
fi
if x=$($TPUT sgr0 2>/dev/null); then
AC_SUBST(TERM_SGR0, "$x")
else
AC_SUBST(TERM_SGR0, "$($TPUT me 2>/dev/null)")
fi
if x=$($TPUT bold 2>/dev/null); then
AC_SUBST(TERM_BOLD, "$x")
else
AC_SUBST(TERM_BOLD, "$($TPUT md 2>/dev/null)")
fi
if x=$($TPUT setaf 1 2>/dev/null); then
AC_SUBST(TERM_SETAF1, "$x")
AC_SUBST(TERM_SETAF2,
"$($TPUT setaf 2 2>/dev/null)")
AC_SUBST(TERM_SETAF3,
"$($TPUT setaf 3 2>/dev/null)")
AC_SUBST(TERM_SETAF4,
"$($TPUT setaf 4 2>/dev/null)")
AC_SUBST(TERM_SETAF6,
"$($TPUT setaf 6 2>/dev/null)")
AC_SUBST(TERM_SETAF9,
"$($TPUT setaf 9 2>/dev/null)")
AC_SUBST(TERM_SETAF10,
"$($TPUT setaf 10 2>/dev/null)")
AC_SUBST(TERM_SETAF11,
"$($TPUT setaf 11 2>/dev/null)")
AC_SUBST(TERM_SETAF12,
"$($TPUT setaf 12 2>/dev/null)")
AC_SUBST(TERM_SETAF14,
"$($TPUT setaf 14 2>/dev/null)")
dnl OpenBSD seems to want 3 parameters for terminals
dnl ending in -256color, but the additional two
dnl parameters don't seem to do anything, so we set
dnl them to 0.
elif x=$($TPUT setaf 1 0 0 2>/dev/null); then
AC_SUBST(TERM_SETAF1, "$x")
AC_SUBST(TERM_SETAF2,
"$($TPUT setaf 2 0 0 2>/dev/null)")
AC_SUBST(TERM_SETAF3,
"$($TPUT setaf 3 0 0 2>/dev/null)")
AC_SUBST(TERM_SETAF4,
"$($TPUT setaf 4 0 0 2>/dev/null)")
AC_SUBST(TERM_SETAF6,
"$($TPUT setaf 6 0 0 2>/dev/null)")
AC_SUBST(TERM_SETAF9,
"$($TPUT setaf 9 0 0 2>/dev/null)")
AC_SUBST(TERM_SETAF10,
"$($TPUT setaf 10 0 0 2>/dev/null)")
AC_SUBST(TERM_SETAF11,
"$($TPUT setaf 11 0 0 2>/dev/null)")
AC_SUBST(TERM_SETAF12,
"$($TPUT setaf 12 0 0 2>/dev/null)")
AC_SUBST(TERM_SETAF14,
"$($TPUT setaf 14 0 0 2>/dev/null)")
else
AC_SUBST(TERM_SETAF1,
"$($TPUT AF 1 2>/dev/null)")
AC_SUBST(TERM_SETAF2,
"$($TPUT AF 2 2>/dev/null)")
AC_SUBST(TERM_SETAF3,
"$($TPUT AF 3 2>/dev/null)")
AC_SUBST(TERM_SETAF4,
"$($TPUT AF 4 2>/dev/null)")
AC_SUBST(TERM_SETAF6,
"$($TPUT AF 6 2>/dev/null)")
AC_SUBST(TERM_SETAF9,
"$($TPUT AF 9 2>/dev/null)")
AC_SUBST(TERM_SETAF10,
"$($TPUT AF 10 2>/dev/null)")
AC_SUBST(TERM_SETAF11,
"$($TPUT AF 11 2>/dev/null)")
AC_SUBST(TERM_SETAF12,
"$($TPUT AF 12 2>/dev/null)")
AC_SUBST(TERM_SETAF14,
"$($TPUT AF 14 2>/dev/null)")
fi
])
AS_IF([test x"$enable_silent_rules" != x"no"], [
AC_SUBST(SILENT, '.SILENT:')
AC_SUBST(MAKEFLAGS_SILENT, '-s')