From: Glenn Morris <rgm@gnu.org>
Date: Tue, 1 May 2012 00:30:11 +0000 (-0400)
Subject: Remove HAVE_LIBNCURSES; it is required to be true
X-Git-Tag: emacs-24.2.90~471^2~240
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9311dcff1de585f39b16e07fbc5a9fb681a06642;p=emacs.git

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.
---

diff --git a/ChangeLog b/ChangeLog
index 090f0de7c12..40bdeece6f0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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.
 
diff --git a/configure.in b/configure.in
index 47ab49793a4..1322703b3f4 100644
--- a/configure.in
+++ b/configure.in
@@ -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)
diff --git a/nt/ChangeLog b/nt/ChangeLog
index c76695a4a99..0374a3df0f5 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -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).
diff --git a/nt/config.nt b/nt/config.nt
index 8aadf2c150d..8b819af5cac 100644
--- a/nt/config.nt
+++ b/nt/config.nt
@@ -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 */
diff --git a/src/ChangeLog b/src/ChangeLog
index f1e175a968d..c02d919a2e2 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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.
 
diff --git a/src/dispnew.c b/src/dispnew.c
index b313852efe2..a50877a6a90 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -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.  */