1d2631fb31
- Patch #322 - 2016/01/02 * fix regression due to incorrect fix for compiler warning when allocating storage for /etc/shells (reports by Ashish Shukla, Debian #809646). - Patch #321 - 2015/12/31 * add resource keepClipboard, escape sequence and action keep-clipboard. * add optional feature to capture text copied to clipboard at the time of copying rather than at the time the clipboard contents are requested for pasting (patch by Milan Mehner). * improve a special case where the -e option was used to pass a single-quoted command via luit, by wrapping it in a “sh -c” (report by Keith Hedger). * minor fix for type-cleanliness when allocating storage for /etc/shells (Tobias Stoeckmann). * fix a typo in manual page (Dan Church). * fix minor file-descriptor leak; after calling openpty, the slave's file descriptor is not needed (report by Juha Nurmela). * editorial change to ctlseqs.ms (report by David Gomboc). * minor updates for autoconf macros. * update config.guess, config.sub - vttest 20140305 * save/restore color enable-flag for menu 11.6 in a couple of places so that the ISO-6429 tests do not reset it unexpectedly. * amend the REP test to not reset colors if it happens to be run via the menu entry for BCE-related tests. - vttest 20140116 * cosmetic changes (suggested by Itay Chamiel): OBS-URL: https://build.opensuse.org/request/show/357555 OBS-URL: https://build.opensuse.org/package/show/X11:terminals/xterm?expand=0&rev=134
55 lines
1.7 KiB
Diff
55 lines
1.7 KiB
Diff
# check for libtinfo before falling back to ncurses
|
|
|
|
diff --git a/aclocal.m4 b/aclocal.m4
|
|
--- a/aclocal.m4
|
|
+++ b/aclocal.m4
|
|
@@ -761,20 +761,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
|
|
@@ -5562,20 +5562,20 @@ echo "$as_me:5561: 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" && {
|
|
cf_add_libs="-l$cf_termlib"
|
|
# Filter out duplicates - this happens with badly-designed ".pc" files...
|
|
for cf_add_1lib in $LIBS
|