X-Git-Url: https://git.distorted.org.uk/~mdw/sod/blobdiff_plain/31194ea55102b83b087232e7af8e1a47399eec02..refs/heads/mdw/progfmt:/configure.ac

diff --git a/configure.ac b/configure.ac
index 765924a..1a45f9e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -71,27 +71,17 @@ AC_SUBST([ASDF_VERSION])
 dnl--------------------------------------------------------------------------
 dnl Common Lisp things.
 
-AC_ARG_WITH([lisp-system],
-	[AS_HELP_STRING([--with-lisp-system=SYSTEMS],
-			[preference order of cl-launch Lisp systems])],
-	[], [with_lisp_system="sbcl clisp"])
-
-AC_CHECK_PROGS([CL_LAUNCH], [cl-launch], [not-found])
-case "$CL_LAUNCH" in
-  not-found) AC_MSG_ERROR([\`cl-launch' not found]) ;;
-esac
+WORKING_LISPS="sbcl,clisp,ecl"; AC_SUBST([WORKING_LISPS])
 
-AC_MSG_CHECKING([for best choice of Lisp system])
-if ! LISPSYS=$($CL_LAUNCH -l "$with_lisp_system" \
-		-ip '(string-downcase (lisp-implementation-type))'); then
-  AC_MSG_ERROR([cl-launch didn't like any Lisp system])
-fi
-AC_SUBST([LISPSYS])
-AC_MSG_RESULT([$LISPSYS])
+AC_CHECK_PROGS([RUNLISP], [runlisp], [not-found])
+case "$RUNLISP" in
+  not-found) AC_MSG_ERROR([\`runlisp' not found]) ;;
+esac
 
 AC_MSG_CHECKING([FASL file extension])
-fasl=$($CL_LAUNCH -l $LISPSYS -ip \
-	'(pathname-type (compile-file-pathname "foo.lisp"))')
+fasl=$($RUNLISP -L$WORKING_LISPS -e \
+	'(format t "~A~%"
+		 (pathname-type (compile-file-pathname "foo.lisp")))')
 AC_SUBST([fasl])
 AC_MSG_RESULT([.$fasl])
 
@@ -211,6 +201,7 @@ dnl Output.
 
 AC_CONFIG_FILES(
   [Makefile]
+  [common/Makefile]
   [src/Makefile]
   [lib/Makefile]
   [doc/Makefile]