[SCM] GNU Inetutils branch, master, updated. inetutils-1_8-160-ga1e3795

[Mats Erik Andersson]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Inetutils ".

The branch, master has been updated
       via  a1e37953a388d25327d3125d3e356114a1fe6c44 (commit)
      from  0aeea0cb612ca487908380ce37dcb96b0a0afd59 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=a1e37953a388d25327d3125d3e356114a1fe6c44


commit a1e37953a388d25327d3125d3e356114a1fe6c44
Author: Mats Erik Andersson <address@hidden>
Date:   Sat Nov 19 11:49:12 2011 +0100

    telnet,telnetd: Build fix for recent readline support.
    
    Condition on HAVE_READLINE, not HAVE_LIBREADLINE.

diff --git a/ChangeLog b/ChangeLog
index 32f4da6..7ec361c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-11-19  Mats Erik Andersson <address@hidden>
+
+       * telnet/telnet.c [HAVE_READLINE]: Replace previous use of
+       HAVE_LIBREADLINE for header inclusion and code protection.
+       * telnetd/utility.c [HAVE_READLINE]: Likewise.
+
 2011-11-19  Simon Josefsson  <address@hidden>
 
        * tests/Makefile.am (dist_check_SCRIPTS): Add ftp-localhost.sh.
diff --git a/telnet/telnet.c b/telnet/telnet.c
index ebfd86c..c5b4b19 100644
--- a/telnet/telnet.c
+++ b/telnet/telnet.c
@@ -73,7 +73,7 @@
 #include "types.h"
 #include "general.h"
 
-#ifdef HAVE_LIBREADLINE
+#ifdef HAVE_READLINE
 # include <curses.h>
 # include <term.h>
 #endif
@@ -729,7 +729,7 @@ int
 init_term (char *tname, int fd, int *errp)
 {
   int err = -1;
-#ifdef HAVE_LIBREADLINE
+#ifdef HAVE_READLINE
   err = tgetent (termbuf, tname);
 #endif
   if (err == 1)
diff --git a/telnetd/utility.c b/telnetd/utility.c
index 3fd054e..bb49298 100644
--- a/telnetd/utility.c
+++ b/telnetd/utility.c
@@ -37,7 +37,7 @@
 # define NET_ENCRYPT()
 #endif
 
-#ifdef HAVE_LIBREADLINE
+#ifdef HAVE_READLINE
 # include <curses.h>
 # include <term.h>
 #endif
@@ -826,7 +826,7 @@ terminaltypeok (char *s)
   if (terminaltype == NULL)
     return 1;
 
-#ifdef HAVE_LIBREADLINE
+#ifdef HAVE_READLINE
   if (tgetent (buf, s) == 0)
 #endif
     return 0;

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog         |    6 ++++++
 telnet/telnet.c   |    4 ++--
 telnetd/utility.c |    4 ++--
 3 files changed, 10 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
GNU Inetutils