From 761550d241729069efb506ea027d132e87f1d9db Mon Sep 17 00:00:00 2001
From: frese <frese>
Date: Fri, 16 May 2003 15:05:13 +0000
Subject: [PATCH] + 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

---
 Makefile.in   | 1 -
 configure.in  | 6 +++++-
 src/utils.scm | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 72e71e0..436f946 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -4,7 +4,6 @@ ORION-WM=orion-wm
 $(ORION-WM): Makefile
 	script=$(ORION-WM) && \
 	echo "#!$(SCX) \\" > $$script && \
-	echo -n "-ll sunterlib-0.4/sunterlib.scm " >> $$script && \
 	echo "-lm `pwd`/src/packages.scm -m main -s" >> $$script && \
 	echo '!#' >> $$script && \
 	echo '(start)' >> $$script && \
diff --git a/configure.in b/configure.in
index 4726ef1..6b28671 100644
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,9 @@
 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)
 
diff --git a/src/utils.scm b/src/utils.scm
index 4b0e3e7..148f99f 100644
--- a/src/utils.scm
+++ b/src/utils.scm
@@ -24,7 +24,7 @@
 
 ;; *** cml utilities *************************************************
 
-(define (select* . list) (select list))
+(define select* select)
 
 (define (make-sync-point)
   (make-placeholder))