From 67b6274d0f8fa796770ebb5201dbfaf2b7c1dd6d Mon Sep 17 00:00:00 2001
From: Fritz Elfert <felfert@to.com>
Date: Sat, 11 Nov 2000 14:39:35 +0000
Subject: Added checks for broken libreadline-4 on RH7 (needs libcurses instead
 of automatically using libtermcap which does export _NO_ symbols on RH7!!!)
 Added --disable-readline and --disable-history Fixed a function prototype

---
 plpftp/Makefile.am | 12 ++++++++----
 plpftp/ftp.cc      |  4 ++--
 2 files changed, 10 insertions(+), 6 deletions(-)

(limited to 'plpftp')

diff --git a/plpftp/Makefile.am b/plpftp/Makefile.am
index 4ca89a0..4805577 100644
--- a/plpftp/Makefile.am
+++ b/plpftp/Makefile.am
@@ -2,12 +2,16 @@
 #
 INCLUDES=-I$(top_srcdir)/lib
 
-#if HAVE_LIBREADLINE
+if HAVE_LIBREADLINE
+if ADD_LIBCURSES
+LIBREADLINE=-lreadline -lcurses
+else
 LIBREADLINE=-lreadline
-#endif
-#if HAVE_LIBHISTORY
+endif
+endif
+if HAVE_LIBHISTORY
 LIBHISTORY=-lhistory
-#endif
+endif
 
 bin_PROGRAMS = plpftp
 plpftp_LDADD = $(top_srcdir)/lib/libplp.la $(LIBREADLINE) $(LIBHISTORY)
diff --git a/plpftp/ftp.cc b/plpftp/ftp.cc
index 595ca75..41fa429 100644
--- a/plpftp/ftp.cc
+++ b/plpftp/ftp.cc
@@ -1008,7 +1008,7 @@ do_completion(char *text, int start, int end)
 
 	rl_completion_entry_function = (Function *)null_completion;
 	if (start == 0)
-		matches = completion_matches(text, command_generator);
+		matches = completion_matches(text, (CPFunction *)command_generator);
 	else {
 		int idx = 0;
 		char *name;
@@ -1029,7 +1029,7 @@ do_completion(char *text, int start, int end)
 				maskAttr = rfsv::PSI_A_DIR;
 		}
 		
-		matches = completion_matches(text, filename_generator);
+		matches = completion_matches(text, (CPFunction *)filename_generator);
 	}
 	return matches;
 }
-- 
cgit v1.2.3