emacs/emacs-23.3-tinfo.dif
2011-11-22 15:11:36 +00:00

46 lines
1.3 KiB
Plaintext

--- configure.in
+++ configure.in 2011-11-22 14:37:39.195146873 +0000
@@ -2376,11 +2376,13 @@ AC_CHECK_FUNCS(getpt)
# That is because we have not set up to link ncurses in lib-src.
# It's better to believe a function is not available
# than to expect to find it in ncurses.
-AC_CHECK_LIB(ncurses, tparm)
+for lib in tinfo ncurses ; do
+ AC_CHECK_LIB($lib, tparm)
+done
case "$opsys" in
netbsd)
- AC_SEARCH_LIBS(tputs, [ncurses terminfo termcap])
+ AC_SEARCH_LIBS(tputs, [tinfo ncurses ncursesw terminfo termcap])
if test $ac_cv_search_tputs = -lterminfo; then
AC_DEFINE(TERMINFO, 1, [Define to 1 if you use terminfo instead of termcap.])
fi
--- src/config.in
+++ src/config.in 2011-11-22 14:34:49.199647061 +0000
@@ -388,6 +388,9 @@ along with GNU Emacs. If not, see <http
/* Define to 1 if you have the `ncurses' library (-lncurses). */
#undef HAVE_LIBNCURSES
+/* Define to 1 if you have the `tinfo' library (-ltinfo). */
+#undef HAVE_LIBTINFO
+
/* Define to 1 if using libotf. */
#undef HAVE_LIBOTF
--- src/s/gnu-linux.h
+++ src/s/gnu-linux.h 2011-11-22 14:36:11.327146051 +0000
@@ -230,8 +230,12 @@ along with GNU Emacs. If not, see <http
#ifdef HAVE_LIBNCURSES
#define TERMINFO
+#ifdef HAVE_LIBTINFO
+#define LIBS_TERMCAP -ltinfo
+#else
#define LIBS_TERMCAP -lncurses
#endif
+#endif
#define UNEXEC unexelf.o