[SCM] GNU Inetutils branch, master, updated. inetutils-1_9_1-331-g5666011

[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  56660118ac33f48f071cb51d2a13d09cc2e77178 (commit)
      from  0887048c53f30d7f3a5c1b5cc6d943b40b22e1df (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=56660118ac33f48f071cb51d2a13d09cc2e77178


commit 56660118ac33f48f071cb51d2a13d09cc2e77178
Author: Mats Erik Andersson <address@hidden>
Date:   Sat Aug 31 00:54:39 2013 +0200

    Support BSD libedit.

diff --git a/ChangeLog b/ChangeLog
index 761184f..b79298b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2013-08-31  Mats Erik Andersson  <address@hidden>
+
+       Support BSD libedit.  (Used on GNU/kFreeBSD.)
+
+       * am/readline.m4 (gl_FUNC_READLINE): Check for headers
+       before library linkage.  Check for header file variants
+       <editline/readline.h> and <editline/history.h>.
+       While testing linking against libreadline and libedit,
+       conditionally use HAVE_*_READLINE_H to include the
+       correct header file.
+
+       * ftp/cmds.c, ftp/main.c
+       [!HAVE_READLINE_READLINE_H && HAVE_EDITLINE_READLINE_H]:
+       Include <editline/readline.h>
+       [!HAVE_READLINE_HISTORY_H && HAVE_EDITLINE_HISTORY_H]:
+       Include <editline/history.h>
+
 2013-08-30  Mats Erik Andersson  <address@hidden>
 
        * bootstrap: Updated from gnulib.
diff --git a/am/readline.m4 b/am/readline.m4
index 3958e71..56cf01a 100644
--- a/am/readline.m4
+++ b/am/readline.m4
@@ -20,6 +20,11 @@ AC_DEFUN([gl_FUNC_READLINE],
                   [do not build against libreadline]), ,
     [enable_readline=yes])
 
+  dnl Readline libraries come in a handful flavours.
+  dnl Detect the ones we do offer support for.
+  AC_CHECK_HEADERS([readline/readline.h readline/history.h \
+                   editline/readline.h editline/history.h])
+
   dnl Search for libreadline and define LIBREADLINE, LTLIBREADLINE and
   dnl INCREADLINE accordingly.
   AC_LIB_LINKFLAGS_BODY([readline])
@@ -45,7 +50,11 @@ AC_DEFUN([gl_FUNC_READLINE],
         LIBS="$LIBS -l$extra_lib"
       fi
       AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>
-#include <readline/readline.h>]],
+#ifdef HAVE_READLINE_READLINE_H
+# include <readline/readline.h>
+#elif defined HAVE_EDITLINE_READLINE_H
+# include <editline/readline.h>
+#endif]],
           [[readline((char*)0);]])],
         [if test -n "$extra_lib"; then
            gl_cv_lib_readline="yes, requires -l$extra_lib"
@@ -67,7 +76,11 @@ AC_DEFUN([gl_FUNC_READLINE],
     am_save_LIBS="$LIBS"
     LIBS="$am_save_LIBS -ledit"
     AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>
-#include <readline/readline.h>]],
+#ifdef HAVE_READLINE_READLINE_H
+# include <readline/readline.h>
+#elif defined HAVE_EDITLINE_READLINE_H
+# include <editline/readline.h>
+#endif]],
         [[readline((char*)0);]])],
       [gl_cv_lib_readline="yes"])
     LIBS="$am_save_LIBS"
@@ -93,8 +106,6 @@ AC_DEFUN([gl_FUNC_READLINE],
   fi
   AC_SUBST([LIBREADLINE])
   AC_SUBST([LTLIBREADLINE])
-
-  AC_CHECK_HEADERS([readline/readline.h readline/history.h])
 ])
 
 # Prerequisites of lib/readline.c.
diff --git a/ftp/cmds.c b/ftp/cmds.c
index 87a9d78..cf09a9d 100644
--- a/ftp/cmds.c
+++ b/ftp/cmds.c
@@ -80,9 +80,13 @@
 
 #ifdef HAVE_READLINE_READLINE_H
 # include <readline/readline.h>
+#elif defined HAVE_EDITLINE_READLINE_H
+# include <editline/readline.h>
 #endif
 #ifdef HAVE_READLINE_HISTORY_H
 # include <readline/history.h>
+#elif defined HAVE_EDITLINE_HISTORY_H
+# include <editline/history.h>
 #endif
 
 #include "ftp_var.h"
diff --git a/ftp/main.c b/ftp/main.c
index d12f6dc..4231951 100644
--- a/ftp/main.c
+++ b/ftp/main.c
@@ -82,9 +82,13 @@
 
 #ifdef HAVE_READLINE_READLINE_H
 # include <readline/readline.h>
+#elif defined HAVE_EDITLINE_READLINE_H
+# include <editline/readline.h>
 #endif
 #ifdef HAVE_READLINE_HISTORY_H
 # include <readline/history.h>
+#elif defined HAVE_EDITLINE_HISTORY_H
+# include <editline/history.h>
 #endif
 
 

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

Summary of changes:
 ChangeLog      |   17 +++++++++++++++++
 am/readline.m4 |   19 +++++++++++++++----
 ftp/cmds.c     |    4 ++++
 ftp/main.c     |    4 ++++
 4 files changed, 40 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
GNU Inetutils