mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-21 18:23:59 +00:00
Code Issues Releases Activity

Remove HAVE_LIBNCURSES; it is required to be true

Browse Source 
Also, it was a confusing name, since it does not necessarily mean that
we literally have libncurses; rather that we have tputs etc.

* configure.in (HAVE_LIBNCURSES): Remove; it is required to be true.

* src/dispnew.c: Remove HAVE_LIBNCURSES test;
it is always true on relevant platforms.

* nt/config.nt (HAVE_LIBNCURSES): Remove undef; not needed.
This commit is contained in:
Glenn Morris 2012-04-30 20:30:11 -04:00
parent 6eac8dc9ac
commit 9311dcff1d
6 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -1,5 +1,7 @@
2012-05-01 Glenn Morris <rgm@gnu.org>
* configure.in (HAVE_LIBNCURSES): Remove; it is required to be true.
* configure.in (LD_SWITCH_X_SITE_RPATH):
Rename from LD_SWITCH_X_SITE_AUX_RPATH.

13
configure.in
View File

@ -2893,12 +2893,6 @@ Please try installing whichever of these libraries is most appropriate
for your system, together with its header files.
For example, a libncurses-dev(el) or similar package.])
fi
# Must define this when any termcap library is found.
AC_DEFINE(HAVE_LIBNCURSES, 1,
[Define to 1 if you have the `ncurses' library (-lncurses).])
## FIXME This was the cpp logic, but I am not sure it is right.
## The above test has not necessarily found libncurses.
HAVE_LIBNCURSES=yes
## Use terminfo instead of termcap?
## Note only system files NOT using terminfo are:
@ -2917,11 +2911,8 @@ case "$opsys" in
## Mac OS X 10.2. So if configure detects it, set the command-line
## option to use it.
darwin|gnu*)
## (HAVE_LIBNCURSES was not always true, but is since 2010-03-18.)
if test "x$HAVE_LIBNCURSES" = "xyes"; then
TERMINFO=yes
LIBS_TERMCAP="-lncurses"
fi
TERMINFO=yes
LIBS_TERMCAP="-lncurses"
;;
freebsd)

4
nt/ChangeLog
View File

@ -1,3 +1,7 @@
2012-05-01 Glenn Morris <rgm@gnu.org>
* config.nt (HAVE_LIBNCURSES): Remove undef; not needed.
2012-04-14 Dani Moncayo <dmoncayo@gmail.com> (tiny change)
* makefile.w32-in: Fix typo (Bug#10261).

3
nt/config.nt
View File

@ -1,6 +1,6 @@
/* GNU Emacs site configuration template file. -*- C -*-
Copyright (C) 1988, 1993-1994, 2001-2012 Free Software Foundation, Inc.
Copyright (C) 1988, 1993-1994, 2001-2012 Free Software Foundation, Inc.
This file is part of GNU Emacs.
@ -138,7 +138,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#undef HAVE_LIBPTHREADS
#undef HAVE_LIBRESOLV
#undef HAVE_LIBXMU
#undef HAVE_LIBNCURSES
#undef HAVE_LIBINTL
/* movemail Kerberos support */

3
src/ChangeLog
View File

@ -1,5 +1,8 @@
2012-05-01 Glenn Morris <rgm@gnu.org>
* dispnew.c: Remove HAVE_LIBNCURSES test;
it is always true on relevant platforms.
* Makefile.in (LD_SWITCH_X_SITE_RPATH):
Rename from LD_SWITCH_X_SITE_AUX_RPATH.

7
src/dispnew.c
View File

@ -1,5 +1,6 @@
/* Updating of data structures for redisplay.
Copyright (C) 1985-1988, 1993-1995, 1997-2012 Free Software Foundation, Inc.
Copyright (C) 1985-1988, 1993-1995, 1997-2012 Free Software Foundation, Inc.
This file is part of GNU Emacs.
@ -87,7 +88,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#endif
#endif /* not __GNU_LIBRARY__ */
#if defined (HAVE_TERM_H) && defined (GNU_LINUX) && defined (HAVE_LIBNCURSES)
#if defined (HAVE_TERM_H) && defined (GNU_LINUX)
#include <term.h> /* for tgetent */
#endif
@ -6303,7 +6304,7 @@ init_display (void)
#ifdef HAVE_X11
Vwindow_system_version = make_number (11);
#endif
#if defined (GNU_LINUX) && defined (HAVE_LIBNCURSES)
#ifdef GNU_LINUX
/* In some versions of ncurses,
tputs crashes if we have not called tgetent.
So call tgetent. */