Marcus Meissner
89e400e6b2
- Patch #296 - 2013/07/10 * improve experimental sixel feature (patch by Ross Combs). * modify delimiter in configure macro used to add a library after a given library to avoid confusion with -Wl pass-through options to linker (NetBSD #48031). * fix quoting in expression used to trim extra libraries from patch #295 changes (report by Thomas Klausner). - Patch #295 - 2013/07/06 * adjust order of libraries to work around incomplete symbol resolution when using --as-needed option (ArchLinux #36047). * minor fix for plink.sh, for IRIX64. - Patch #294 - 2013/07/05 * add note in ctlseqs.ms for CPR response pointing out a potential point of confusion with the string sent by a modified F1 key (suggested by Bram Moolenaar). * improve plink.sh by checking if the linker supports the --as-needed option (suggested by David Philippi). * improve clearing for private mode 1049 when switching to the alternate screen (Debian #711758). * amend fix from patch #292 by removing now-unneeded chunk which introduced problem in selection (Debian #714527). * add definition to optionally override compiled-in class for xterm from makefile, needed for test-packages. * add configure option --enable-sixel-graphics * add experimental support for sixel graphics (patch by Ross Combs). OBS-URL: https://build.opensuse.org/request/show/183779 OBS-URL: https://build.opensuse.org/package/show/X11:terminals/xterm?expand=0&rev=80
55 lines
1.8 KiB
Diff
55 lines
1.8 KiB
Diff
# check for libtinfo before falling back to ncurses
|
|
|
|
diff --git a/aclocal.m4 b/aclocal.m4
|
|
--- a/aclocal.m4
|
|
+++ b/aclocal.m4
|
|
@@ -743,20 +743,20 @@ if test "$cf_full_tgetent" = yes ; then
|
|
else
|
|
cf_test_message="tgetent"
|
|
fi
|
|
|
|
AC_CACHE_CHECK(for $cf_test_message function,cf_cv_lib_tgetent,[
|
|
cf_save_LIBS="$LIBS"
|
|
cf_cv_lib_tgetent=no
|
|
if test "$cf_full_tgetent" = yes ; then
|
|
- cf_TERMLIB="otermcap termcap termlib ncurses curses"
|
|
+ cf_TERMLIB="otermcap termcap termlib tinfo ncurses curses"
|
|
cf_TERMTST="buffer[[0]] == 0"
|
|
else
|
|
- cf_TERMLIB="termlib ncurses curses"
|
|
+ cf_TERMLIB="termlib tinfo ncurses curses"
|
|
cf_TERMTST="0"
|
|
fi
|
|
for cf_termlib in '' $cf_TERMLIB ; do
|
|
LIBS="$cf_save_LIBS"
|
|
test -n "$cf_termlib" && CF_ADD_LIB($cf_termlib)
|
|
AC_TRY_RUN([
|
|
/* terminfo implementations ignore the buffer argument, making it useless for
|
|
* the xterm application, which uses this information to make a new TERMCAP
|
|
diff --git a/configure b/configure
|
|
--- a/configure
|
|
+++ b/configure
|
|
@@ -5581,20 +5581,20 @@ echo "$as_me:5580: checking for $cf_test
|
|
echo $ECHO_N "checking for $cf_test_message function... $ECHO_C" >&6
|
|
if test "${cf_cv_lib_tgetent+set}" = set; then
|
|
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
else
|
|
|
|
cf_save_LIBS="$LIBS"
|
|
cf_cv_lib_tgetent=no
|
|
if test "$cf_full_tgetent" = yes ; then
|
|
- cf_TERMLIB="otermcap termcap termlib ncurses curses"
|
|
+ cf_TERMLIB="otermcap termcap termlib tinfo ncurses curses"
|
|
cf_TERMTST="buffer[0] == 0"
|
|
else
|
|
- cf_TERMLIB="termlib ncurses curses"
|
|
+ cf_TERMLIB="termlib tinfo ncurses curses"
|
|
cf_TERMTST="0"
|
|
fi
|
|
for cf_termlib in '' $cf_TERMLIB ; do
|
|
LIBS="$cf_save_LIBS"
|
|
test -n "$cf_termlib" && LIBS="-l$cf_termlib $LIBS"
|
|
if test "$cross_compiling" = yes; then
|
|
echo "cross-compiling, cannot verify if a termcap/tgetent is present in $cf_termlib" 1>&5
|
|
else
|