[Emacs-diffs] trunk r113504: Port to GNU/Linux systems with tinfo but not ncurses.

[Paul Eggert]

------------------------------------------------------------
revno: 113504
revision-id: address@hidden
parent: address@hidden
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Tue 2013-07-23 09:08:57 +0100
message:
  Port to GNU/Linux systems with tinfo but not ncurses.
  
  * configure.ac (USE_NCURSES): New symbol.
  * src/dispnew.c (init_display): Depend on USE_NCURSES, not GNU_LINUX,
  to decide whether ncurses is being used.  Without this change,
  GCC complains about tgetent not being declared, on a system
  that has tinfo installed but ncurses not installed.
modified:
  ChangeLog                      changelog-20091113204419-o5vbwnq5f7feedwu-1538
  configure.ac                   
configure.in-20091113204419-o5vbwnq5f7feedwu-783
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/dispnew.c                  dispnew.c-20091113204419-o5vbwnq5f7feedwu-258

=== modified file 'ChangeLog'
--- a/ChangeLog 2013-07-20 19:20:33 +0000
+++ b/ChangeLog 2013-07-23 08:08:57 +0000
@@ -1,3 +1,8 @@
+2013-07-23  Paul Eggert  <address@hidden>
+
+       Port to Ubuntu 12.04 with tinfo but not ncurses.
+       * configure.ac (USE_NCURSES): New symbol.
+
 2013-07-20  Paul Eggert  <address@hidden>
 
        Fix array bounds violation when pty allocation fails.

=== modified file 'configure.ac'
--- a/configure.ac      2013-07-20 15:33:00 +0000
+++ b/configure.ac      2013-07-23 08:08:57 +0000
@@ -3406,6 +3406,9 @@
   AC_DEFINE(TERMINFO, 1, [Define to 1 if you use terminfo instead of termcap.])
   TERMCAP_OBJ=terminfo.o
 fi
+if test "X$LIBS_TERMCAP" = "X-lncurses"; then
+  AC_DEFINE(USE_NCURSES, 1, [Define to 1 if you use ncurses.])
+fi
 AC_SUBST(LIBS_TERMCAP)
 AC_SUBST(TERMCAP_OBJ)
 

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-07-23 07:22:16 +0000
+++ b/src/ChangeLog     2013-07-23 08:08:57 +0000
@@ -1,5 +1,11 @@
 2013-07-23  Paul Eggert  <address@hidden>
 
+       Port to GNU/Linux systems with tinfo but not ncurses.
+       * dispnew.c (init_display): Depend on USE_NCURSES, not GNU_LINUX,
+       to decide whether ncurses is being used.  Without this change,
+       GCC complains about tgetent not being declared, on a system
+       that has tinfo installed but ncurses not installed.
+
        * eval.c (Fprogn): Check that BODY is a proper list.
 
        Tune UNEVALLED functions by using XCAR instead of Fcar, etc.

=== modified file 'src/dispnew.c'
--- a/src/dispnew.c     2013-07-16 16:39:42 +0000
+++ b/src/dispnew.c     2013-07-23 08:08:57 +0000
@@ -6041,7 +6041,7 @@
 #ifdef HAVE_X11
       Vwindow_system_version = make_number (11);
 #endif
-#ifdef GNU_LINUX
+#ifdef USE_NCURSES
       /* In some versions of ncurses,
         tputs crashes if we have not called tgetent.
         So call tgetent.  */