svn commit: samba r18208 - in branches/SAMBA_4_0/source: client lib/smbreadline

[tridge at samba.org]

Author: tridge
Date: 2006-09-07 08:34:12 +0000 (Thu, 07 Sep 2006)
New Revision: 18208

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=18208

Log:

Mac OS X also doesn't have history_list()

must be a pretty old readline lib!

Modified:
   branches/SAMBA_4_0/source/client/client.c
   branches/SAMBA_4_0/source/lib/smbreadline/readline.m4


Changeset:
Modified: branches/SAMBA_4_0/source/client/client.c
===================================================================
--- branches/SAMBA_4_0/source/client/client.c	2006-09-07 07:56:41 UTC (rev 18207)
+++ branches/SAMBA_4_0/source/client/client.c	2006-09-07 08:34:12 UTC (rev 18208)
@@ -2388,7 +2388,7 @@
 ****************************************************************************/
 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;
 

Modified: branches/SAMBA_4_0/source/lib/smbreadline/readline.m4
===================================================================
--- branches/SAMBA_4_0/source/lib/smbreadline/readline.m4	2006-09-07 07:56:41 UTC (rev 18207)
+++ branches/SAMBA_4_0/source/lib/smbreadline/readline.m4	2006-09-07 08:34:12 UTC (rev 18208)
@@ -68,8 +68,12 @@
 	     [],
 	     [$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