c4b3e375f0
- Patch #309 - 2014/07/13 * modify configure script to work around debris left by XQuartz upgrades. * modify test-package scripts to enable ReGIS graphics. * improvements/additions to ReGIS graphics, e.g., drawing text (Ross Comb). * add --with-Xaw3dxft, to link with Xaw 3d xft library (Stephen P Wall). * amend reset for cursor-shape to take into account cursorUnderline resource (report by Christian Weisgerber). * update config.guess, config.sub OBS-URL: https://build.opensuse.org/request/show/241234 OBS-URL: https://build.opensuse.org/package/show/X11:terminals/xterm?expand=0&rev=103
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
|
|
@@ -5587,20 +5587,20 @@ echo "$as_me:5586: 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
|