[SCM] GNU Inetutils branch, master, updated. inetutils-1_8-157-g7a61b85

[Simon Josefsson]

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  7a61b85b3d9388eed3f25f486ddb14f36c7b296a (commit)
      from  0a83fb189cd3a7a81131b74b9aba0e0e1a838bad (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=7a61b85b3d9388eed3f25f486ddb14f36c7b296a


commit 7a61b85b3d9388eed3f25f486ddb14f36c7b296a
Author: Simon Josefsson <address@hidden>
Date:   Fri Nov 18 09:50:31 2011 +0100

    ftp: Use gnulib's readline module.
    
    * ftp/cmds.c: Replace complex readline #includes with simple
    include of gnulib's readline.h.
    (another): Assume libreadline has add_history.
    * ftp/main.c: Likewise.
    * configure.ac: Remove obsolete readline checks (we now use
    gnulib's readline module).

diff --git a/ChangeLog b/ChangeLog
index 967f0be..50a6993 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2011-11-18  Simon Josefsson  <address@hidden>
+
+       * ftp/cmds.c: Replace complex readline #includes with simple
+       include of gnulib's readline.h.
+       (another): Assume libreadline has add_history.
+       * ftp/main.c: Likewise.
+       * configure.ac: Remove obsolete readline checks (we now use
+       gnulib's readline module).
+
 2011-11-17  Mats Erik Andersson <address@hidden>
 
        * telnet/telnet.c [HAVE_LIBREADLINE]: Include <curses.h>.
diff --git a/configure.ac b/configure.ac
index 06c6a39..e1fd73a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -148,37 +148,6 @@ AC_CHECK_LIB(socket, getpeername)
 # See if a termcap library is available (under one of several names)
 IU_LIB_TERMCAP
 
-# We want to use libreadline if it is available.  However, it seems that the
-# guile hackers have had problems because there is a Solaris libreadline
-# that is different from the GNU libreadline; therefore we test for an obscure
-# function in the GNU libreadline.
-#AC_CHECK_LIB(termcap, tputs)
-#AC_CHECK_LIB(readline, rl_bind_key,,, -ltermcap)
-AC_CHECK_LIB(readline, rl_bind_key,
-             [LIBREADLINE=-lreadline
-              AC_DEFINE([HAVE_LIBREADLINE], 1,
-                  [Define to one if you have -lreadline])],
-             [LIBREADLINE=], "$LIBTERMCAP")
-AC_SUBST(LIBREADLINE)
-AC_SUBST(LIBTERMCAP)
-
-AC_CHECK_LIB(history, add_history,
-             [LIBHISTORY=-lhistory
-              AC_DEFINE([HAVE_LIBHISTORY], 1,
-                  [Define to one if you have -lhistory])],
-             [LIBHISTORY=])
-
-# If libhistory does not provide add_history check if libreadline has it.
-if test -z "$LIBHISTORY" && test -n "$LIBREADLINE"; then
-  AC_CHECK_LIB(readline, add_history,
-               [LIBHISTORY=-lreadline
-                AC_DEFINE([HAVE_LIBHISTORY], 1,
-                     [Define to one if you have -lhistory])],
-               [LIBHISTORY=])
-fi
-
-AC_SUBST(LIBHISTORY)
-
 dnl See if there's a separate libcrypt (many systems put crypt there)
 AC_CHECK_LIB(crypt, crypt, LIBCRYPT=-lcrypt)
 AC_SUBST(LIBCRYPT)
@@ -461,7 +430,6 @@ AC_HEADER_DIRENT
 AC_CHECK_HEADERS([arpa/nameser.h des.h errno.h fcntl.h features.h glob.h \
                   krb.h memory.h malloc.h netinet/in_systm.h netinet/ip.h \
                   netinet/ip_icmp.h netinet/ip_var.h \
-                 readline/readline.h \
                  security/pam_appl.h \
                   shadow.h stdarg.h stdlib.h string.h stropts.h sys/tty.h \
                   sys/utsname.h sys/ptyvar.h sys/msgbuf.h sys/filio.h \
diff --git a/ftp/cmds.c b/ftp/cmds.c
index f9072f4..697cf70 100644
--- a/ftp/cmds.c
+++ b/ftp/cmds.c
@@ -77,12 +77,7 @@
    system headers on some platforms. */
 #include <glob.h>
 
-#if HAVE_LIBREADLINE
-# include <readline/readline.h>
-# include <readline/history.h>
-#else
-# include "readline.h"
-#endif
+#include "readline.h"
 
 #include "ftp_var.h"
 #include "unused-parameter.h"
@@ -147,10 +142,8 @@ another (int *pargc, char ***pargv, const char *prompt)
   arg = readline (buffer);
   free (buffer);
 
-#if HAVE_LIBHISTORY
   if (arg && *arg)
     add_history (arg);
-#endif
 
   if (!arg)
     intr (0);
diff --git a/ftp/main.c b/ftp/main.c
index 5ebfbb7..914a4fb 100644
--- a/ftp/main.c
+++ b/ftp/main.c
@@ -77,12 +77,7 @@
 #include "libinetutils.h"
 #include "unused-parameter.h"
 
-#if HAVE_LIBREADLINE
-# include <readline/readline.h>
-# include <readline/history.h>
-#else
-# include "readline.h"
-#endif
+#include "readline.h"
 
 
 #define DEFAULT_PROMPT "ftp> "
@@ -347,10 +342,8 @@ cmdscanner (int top)
          break;
        }
 
-#if HAVE_LIBHISTORY
       if (line && *line)
        add_history (line);
-#endif
 
       if (l == 0)
        break;

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

Summary of changes:
 ChangeLog    |    9 +++++++++
 configure.ac |   32 --------------------------------
 ftp/cmds.c   |    9 +--------
 ftp/main.c   |    9 +--------
 4 files changed, 11 insertions(+), 48 deletions(-)


hooks/post-receive
-- 
GNU Inetutils