r18208: Mac OS X also doesn't have history_list()

must be a pretty old readline lib!
(This used to be commit ba901e6820c02bc696c0bd3e9e0788801fd0795b)

diff --git a/source4/client/client.c b/source4/client/client.c
index e748edd347652d8be230e9b85fe5c9b92ae62287..e9fe32967b06d7c445a57f9582062d74b4de54e2 100644 (file)
--- a/source4/client/client.c
+++ b/source4/client/client.c
@@ -2388,7 +2388,7 @@ history
 ****************************************************************************/
 static int cmd_history(struct smbclient_context *ctx, const char **args)
 {
-#if defined(HAVE_LIBREADLINE)
+#if defined(HAVE_LIBREADLINE) && defined(HAVE_DECL_RL_EVENT_HOOK)
        HIST_ENTRY **hlist;
        int i;
 

diff --git a/source4/lib/smbreadline/readline.m4 b/source4/lib/smbreadline/readline.m4
index 4eebd13b5a66057b6bcc16140fe2b7fb197256cc..29f7ac6e1a8594b91f39033526135d9dc70b5f69 100644 (file)
--- a/source4/lib/smbreadline/readline.m4
+++ b/source4/lib/smbreadline/readline.m4
@@ -68,8 +68,12 @@ AC_CHECK_LIB(readline, rl_completion_matches,
             [],
             [$TERMLIBS])
 
-# not all readline libs have rl_event_hook
+# not all readline libs have rl_event_hook or history_list
 AC_CHECK_DECLS(rl_event_hook, [], [], [#include <readline/readline.h>])
+AC_CHECK_LIB(readline, history_list,
+            [AC_DEFINE(HAVE_HISTORY_LIST, 1, [Do we have history_list?])],
+            [],
+            [$TERMLIBS])
 
 AC_MSG_CHECKING(whether to use extern readline)
 if test x"$EXTERNAL_READLINE" = x"yes"; then