summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2006-09-07 08:34:12 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:17:49 -0500
commitb04fac4ed3cea2bdc0d0888713c20e0cc1c9d5b1 (patch)
tree83ff9439590b0d3833bf6935a3067562ac484179
parentead21647a248b250876ce7d2133bd4a1fe2b2d57 (diff)
downloadsamba-b04fac4ed3cea2bdc0d0888713c20e0cc1c9d5b1.tar.gz
samba-b04fac4ed3cea2bdc0d0888713c20e0cc1c9d5b1.tar.bz2
samba-b04fac4ed3cea2bdc0d0888713c20e0cc1c9d5b1.zip
r18208: Mac OS X also doesn't have history_list()
must be a pretty old readline lib! (This used to be commit ba901e6820c02bc696c0bd3e9e0788801fd0795b)
-rw-r--r--source4/client/client.c2
-rw-r--r--source4/lib/smbreadline/readline.m46
2 files changed, 6 insertions, 2 deletions
diff --git a/source4/client/client.c b/source4/client/client.c
index e748edd347..e9fe32967b 100644
--- 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 4eebd13b5a..29f7ac6e1a 100644
--- 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