Skip to content

Commit

Permalink
change implementation without depending on lem-ncureses-ccl.
Browse files Browse the repository at this point in the history
  • Loading branch information
snmsts committed Apr 30, 2019
1 parent 6ae2c02 commit dbce344
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 10 deletions.
7 changes: 5 additions & 2 deletions Makefile.am
Expand Up @@ -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 $< $@
Expand All @@ -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
11 changes: 3 additions & 8 deletions configure.ac
Expand Up @@ -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
Expand Down Expand Up @@ -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

0 comments on commit dbce344

Please sign in to comment.