+ added with-scx option to configure (specifies scx executable)
+ removed loading sunterlib, because scx includes it now + changed select*, because cml's select now takes multiple args too
This commit is contained in:
parent
adc01826f2
commit
761550d241
|
@ -4,7 +4,6 @@ ORION-WM=orion-wm
|
||||||
$(ORION-WM): Makefile
|
$(ORION-WM): Makefile
|
||||||
script=$(ORION-WM) && \
|
script=$(ORION-WM) && \
|
||||||
echo "#!$(SCX) \\" > $$script && \
|
echo "#!$(SCX) \\" > $$script && \
|
||||||
echo -n "-ll sunterlib-0.4/sunterlib.scm " >> $$script && \
|
|
||||||
echo "-lm `pwd`/src/packages.scm -m main -s" >> $$script && \
|
echo "-lm `pwd`/src/packages.scm -m main -s" >> $$script && \
|
||||||
echo '!#' >> $$script && \
|
echo '!#' >> $$script && \
|
||||||
echo '(start)' >> $$script && \
|
echo '(start)' >> $$script && \
|
||||||
|
|
|
@ -1,5 +1,9 @@
|
||||||
AC_INIT
|
AC_INIT
|
||||||
AC_PATH_PROG(SCX, scx, /usr/local/bin/scx)
|
AC_ARG_WITH(scx, [ --with-scx=FILE the scx binary to use [/usr/local/bin/scx]],
|
||||||
|
scx_binary=$withval , scx_binary=/usr/local/bin/scx)
|
||||||
|
AC_SUBST(scx_binary)
|
||||||
|
|
||||||
|
AC_PATH_PROG(SCX, scx, $scx_binary)
|
||||||
|
|
||||||
AC_OUTPUT(Makefile)
|
AC_OUTPUT(Makefile)
|
||||||
|
|
||||||
|
|
|
@ -24,7 +24,7 @@
|
||||||
|
|
||||||
;; *** cml utilities *************************************************
|
;; *** cml utilities *************************************************
|
||||||
|
|
||||||
(define (select* . list) (select list))
|
(define select* select)
|
||||||
|
|
||||||
(define (make-sync-point)
|
(define (make-sync-point)
|
||||||
(make-placeholder))
|
(make-placeholder))
|
||||||
|
|
Loading…
Reference in New Issue