[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r108067: Remove HAVE_LIBNCURSES; it i
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r108067: Remove HAVE_LIBNCURSES; it is required to be true |
Date: |
Mon, 30 Apr 2012 20:30:11 -0400 |
User-agent: |
Bazaar (2.3.1) |
------------------------------------------------------------
revno: 108067
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Mon 2012-04-30 20:30:11 -0400
message:
Remove HAVE_LIBNCURSES; it is required to be true
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.
modified:
ChangeLog
configure.in
nt/ChangeLog
nt/config.nt
src/ChangeLog
src/dispnew.c
=== modified file 'ChangeLog'
--- a/ChangeLog 2012-05-01 00:16:02 +0000
+++ b/ChangeLog 2012-05-01 00:30:11 +0000
@@ -1,5 +1,7 @@
2012-05-01 Glenn Morris <address@hidden>
+ * 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.
=== modified file 'configure.in'
--- a/configure.in 2012-05-01 00:16:02 +0000
+++ b/configure.in 2012-05-01 00:30:11 +0000
@@ -2893,12 +2893,6 @@
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 @@
## 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)
=== modified file 'nt/ChangeLog'
--- a/nt/ChangeLog 2012-04-15 02:59:30 +0000
+++ b/nt/ChangeLog 2012-05-01 00:30:11 +0000
@@ -1,3 +1,7 @@
+2012-05-01 Glenn Morris <address@hidden>
+
+ * config.nt (HAVE_LIBNCURSES): Remove undef; not needed.
+
2012-04-14 Dani Moncayo <address@hidden> (tiny change)
* makefile.w32-in: Fix typo (Bug#10261).
=== modified file 'nt/config.nt'
--- a/nt/config.nt 2012-04-07 20:00:16 +0000
+++ b/nt/config.nt 2012-05-01 00:30:11 +0000
@@ -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 @@
#undef HAVE_LIBPTHREADS
#undef HAVE_LIBRESOLV
#undef HAVE_LIBXMU
-#undef HAVE_LIBNCURSES
#undef HAVE_LIBINTL
/* movemail Kerberos support */
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2012-05-01 00:16:02 +0000
+++ b/src/ChangeLog 2012-05-01 00:30:11 +0000
@@ -1,5 +1,8 @@
2012-05-01 Glenn Morris <address@hidden>
+ * 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.
=== modified file 'src/dispnew.c'
--- a/src/dispnew.c 2012-04-20 14:08:55 +0000
+++ b/src/dispnew.c 2012-05-01 00:30:11 +0000
@@ -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 @@
#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 @@
#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. */
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r108067: Remove HAVE_LIBNCURSES; it is required to be true,
Glenn Morris <=