2013-05-29 14:46:55 +00:00
|
|
|
# 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
|
Accepting request 232778 from home:pcerny:factory
- Patch #304 - 2014/05/03
* add debugging check for parsing table entries, fixed a few
inconsistencies.
* handle utmp/utmpx strings consistently with new function that
null-pads unused locations.
* build-fix for imake configuration with FreeBSD 9 and later,
to account for replacing utmp with utmpx.
* improve handling of the fontsel (font-selection) menu item:
+ initialize the menu entry differently if the toolbar
configuration is used, i.e., enabling it without attempting
to use the current selection as a font name. Because of the
way in which the toolbar is setup, this attempt usually
failed, and would result in a warning.
+ if the menu action fails, e.g., no font can be loaded for
the given selected name, then recover by resuming with the
current font. Before, the recovery went to the default
font. That was done to work around missing bitmap font in
patch #276.
* document OSC 119 in the control sequences listing (report by
Egmont Koblinger).
* modify special handling of XF86Paste or SunPaste keysyms (see
patch #227) to use the standard shift/lock modifiers in case
those are, for example, used in level 3 in an XKB file (patch
by Matthieu Herrb).
* configure macro updates:
+ drop the -no-gcc option from CF_INTEL_COMPILER
+ modify CF_XOPEN_SOURCE to suppress the check for defining
_XOPEN_SOURCE on Solaris
* reduce bss storage used for ReGIS/Sixel modules, as well as
cleanup storage usage in other modules.
OBS-URL: https://build.opensuse.org/request/show/232778
OBS-URL: https://build.opensuse.org/package/show/X11:terminals/xterm?expand=0&rev=92
2014-05-05 22:05:44 +00:00
|
|
|
@@ -5585,20 +5585,20 @@ echo "$as_me:5584: checking for $cf_test
|
2013-05-29 14:46:55 +00:00
|
|
|
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
|
