From dbce344a90f69b445ffdcdc52e97f9c9cd229b78 Mon Sep 17 00:00:00 2001
From: snmsts <snmsts@gmail.com>
Date: Tue, 30 Apr 2019 21:20:45 +0800
Subject: [PATCH] change implementation without depending on lem-ncureses-ccl.

---
 Makefile.am  |  7 +++++--
 configure.ac | 11 +++--------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 0f99a1e49..7f1182f5f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -27,8 +27,8 @@ lem-ncurses.desktop: scripts/gen-desktop.ros
 	cd $(PWD);ros scripts/gen-desktop.ros --prefix ${prefix}
 
 %$(EXEEXT): %.ros
-	ros -L sbcl-bin -l $< dump output $(basename $(notdir $<))
-	ros -v -L sbcl-bin -l $< dump executable $<
+	ros -L ${LISP_IMPL} -l $< dump output $(basename $(notdir $<))
+	ros -L ${LISP_IMPL} -l $< dump executable $<
 
 bin/%.ros: roswell/%.ros
 	cp $< $@
@@ -44,3 +44,6 @@ depend:
 	ros make-depends lem-ncurses bin/lem-ncurses > bin/lem-ncurses.depend
 
 -include bin/lem-ncurses.depend
+
+clean-local:
+	ros -L ${LISP_IMPL} delete dump lem-ncurses|true
diff --git a/configure.ac b/configure.ac
index 9e08ffb1f..8b400942b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,16 +9,15 @@ if test "x$ROSWELL" != xyes; then
 fi
 
 dnl [TBD] cross compile possible?
+lisp_impl=sbcl-bin
 frontend=ncurses
 if test `ros roswell-internal-use uname -m` == "armhf"; then
   if test `ros roswell-internal-use uname` == "linux"; then
-    ros install ccl-bin
-    enable_ncurses_ccl=yes
-    enable_ncurses=no
-    frontend=ncurses-ccl
+	lisp_impl=ccl-bin
   fi
 fi
 
+AC_SUBST([LISP_IMPL],$lisp_impl)
 ncurses=no
 AC_CHECK_HEADERS(ncurses.h,[ncurses=yes])
 if test "x$ncurses" = xno; then
@@ -49,8 +48,4 @@ AC_ARG_ENABLE([xcb],
     AS_HELP_STRING([--enable-xcb], [Enable xcb]))
 AM_CONDITIONAL(GENERATE_XCB,[test "x$enable_xcb" = "xyes"])
 
-AC_ARG_ENABLE([ncurses_ccl],
-    AS_HELP_STRING([--enable-ncurses-ccl], [Enable ncurses-ccl]))
-AM_CONDITIONAL(GENERATE_NCURSES_CCL,[test "x$enable_ncurses_ccl" = "xyes"])
-
 AC_OUTPUT