diff --git a/Makefile.am b/Makefile.am index 59a3200..3e52ae5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -57,13 +57,16 @@ scripts/welcome-bot.lisp dist_man1_MANS = doc/tinmop.man $(PACKAGE): $(CONF_PATH_FILE) *.asd src/* - if test "$(LISP_COMPILER)" = "sbcl"; then \ + if test $$(basename "$(LISP_COMPILER)") = "sbcl"; then \ $(LISP_COMPILER) \ --eval "(asdf:load-system '$(PACKAGE))" \ --eval "(in-package main)" \ --eval "(sb-ext:save-lisp-and-die \"$(PACKAGE)\" :toplevel 'main::main :executable t :purify t :save-runtime-options t)"; \ else \ - $(LISP_COMPILER) --eval "(asdf:make-build :tinmop :type :program :move-here #P\"./\" :epilogue-code '(main::main))"; \ + $(LISP_COMPILER) \ + --eval "(asdf:load-system '$(PACKAGE))" \ + --eval "(in-package main)" \ + --eval "(asdf:make-build :tinmop :type :program :move-here #P\"./\" :epilogue-code '(main::main))"; \ fi $(CONF_PATH_FILE): grep "^;" $(CONF_PATH_FILE_IN) > $(CONF_PATH_FILE) diff --git a/Makefile.in b/Makefile.in index e34fedf..cbcefcd 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1048,13 +1048,16 @@ uninstall-man: uninstall-man1 $(PACKAGE): $(CONF_PATH_FILE) *.asd src/* - if test "$(LISP_COMPILER)" = "sbcl"; then \ + if test $$(basename "$(LISP_COMPILER)") = "sbcl"; then \ $(LISP_COMPILER) \ --eval "(asdf:load-system '$(PACKAGE))" \ --eval "(in-package main)" \ --eval "(sb-ext:save-lisp-and-die \"$(PACKAGE)\" :toplevel 'main::main :executable t :purify t :save-runtime-options t)"; \ else \ - $(LISP_COMPILER) --eval "(asdf:make-build :tinmop :type :program :move-here #P\"./\" :epilogue-code '(main::main))"; \ + $(LISP_COMPILER) \ + --eval "(asdf:load-system '$(PACKAGE))" \ + --eval "(in-package main)" \ + --eval "(asdf:make-build :tinmop :type :program :move-here #P\"./\" :epilogue-code '(main::main))"; \ fi $(CONF_PATH_FILE): grep "^;" $(CONF_PATH_FILE_IN) > $(CONF_PATH_FILE) diff --git a/configure b/configure index 34eed18..8c0d224 100755 --- a/configure +++ b/configure @@ -7011,8 +7011,8 @@ printf "%s\n" "#define HAVE_DCGETTEXT 1" >>confdefs.h -# Extract the first word of "asbcl", so it can be a program name with args. -set dummy asbcl; ac_word=$2 +# Extract the first word of "sbcl", so it can be a program name with args. +set dummy sbcl; ac_word=$2 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_LISP_COMPILER+y} @@ -7108,13 +7108,14 @@ fi if test "$LISP_COMPILER" = "no" ; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Can not find SBCL, Common Lisp compiler." >&5 printf "%s\n" "$as_me: WARNING: Can not find SBCL, Common Lisp compiler." >&2;}; -else - if test "$LISP_COMPILER" = "no" ; then + LISP_COMPILER=$LISP_COMPILER_ECL; + if test "$LISP_COMPILER_ECL" = "no" ; then as_fn_error $? "Can not find ECL, Common Lisp compiler." "$LINENO" 5; fi fi -LISP_COMPILER=$LISP_COMPILER_ECL; +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: Using $LISP_COMPILER as Common Lisp compiler" >&5 +printf "%s\n" "$as_me: Using $LISP_COMPILER as Common Lisp compiler" >&6;} # Extract the first word of "curl", so it can be a program name with args. set dummy curl; ac_word=$2 diff --git a/configure.ac b/configure.ac index fb1c37f..225802d 100644 --- a/configure.ac +++ b/configure.ac @@ -41,19 +41,19 @@ fi AM_GNU_GETTEXT([external]) -AC_PATH_PROG([LISP_COMPILER],[asbcl],[no]) +AC_PATH_PROG([LISP_COMPILER],[sbcl],[no]) AC_PATH_PROG([LISP_COMPILER_ECL],[ecl],[no]) if test "$LISP_COMPILER" = "no" ; then AC_MSG_WARN([Can not find SBCL, Common Lisp compiler.]); -else - if test "$LISP_COMPILER" = "no" ; then + LISP_COMPILER=$LISP_COMPILER_ECL; + if test "$LISP_COMPILER_ECL" = "no" ; then AC_MSG_ERROR([Can not find ECL, Common Lisp compiler.]); fi fi -LISP_COMPILER=$LISP_COMPILER_ECL; +AC_MSG_NOTICE([Using $LISP_COMPILER as Common Lisp compiler]) AC_PATH_PROG([CURL],[curl],[no])