diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2011-08-18 19:47:44 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2011-08-18 19:47:44 +0000 |
| commit | 89a9d00d92ea1a41217d9872e55921ca810f2f17 (patch) | |
| tree | 93bf2b1ec082b82a2e0283bc5a51a5d7832966fb /app/xterm/configure.in | |
| parent | 4fb2f769ab80d79b4e1730b1688ee21b130596ed (diff) | |
Update to xterm 271. Tested by shadchin@ and ajacoutot@
Diffstat (limited to 'app/xterm/configure.in')
| -rw-r--r-- | app/xterm/configure.in | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/app/xterm/configure.in b/app/xterm/configure.in index 05349aaae..8c4731e89 100644 --- a/app/xterm/configure.in +++ b/app/xterm/configure.in @@ -1,4 +1,4 @@ -dnl $XTermId: configure.in,v 1.272 2011/04/22 08:54:15 tom Exp $ +dnl $XTermId: configure.in,v 1.274 2011/07/07 00:06:11 tom Exp $ dnl dnl ----------------------------------------------------------------------------- dnl this file is part of xterm @@ -115,6 +115,7 @@ CF_POSIX_SAVED_IDS CF_HELP_MESSAGE(Compile/Install Options:) CF_FUNC_TGETENT +CF_WITH_APP_CLASS(XTerm) CF_WITH_APP_DEFAULTS CF_WITH_ICONDIR CF_DISABLE_DESKTOP(xterm) @@ -278,6 +279,18 @@ AC_CHECK_FUNCS(Xutf8LookupString, [],[ CF_WITH_IMAKE_CFLAGS($(MAIN_DEFINES) $(VENDORMANDEFS)) +# If we have already established that there is a full termcap implementation, +# suppress the definitions for terminfo that we make have imported from the +# imake-file. +if test "x$cf_cv_lib_tgetent" != xno ; then + case "$IMAKE_CFLAGS" in + *-DUSE_TERMINFO\ -DHAVE_TIGETSTR*) + CF_UNDO_CFLAGS(IMAKE_CFLAGS,terminfo,[-DUSE_TERMINFO[[ ]]*-DHAVE_TIGETSTR[[ ]]*]) + CF_UNDO_CFLAGS(CPPFLAGS,terminfo,[-DUSE_TERMINFO[[ ]]*-DHAVE_TIGETSTR[[ ]]*]) + ;; + esac +fi + CF_HELP_MESSAGE(Terminal Configuration:) AC_MSG_CHECKING(for default terminal-id) |