>From 34a5cd6350b5485647f705d17d0fedf7e11f0c18 Mon Sep 17 00:00:00 2001
From: Ben Spencer <address@hidden>
Date: Tue, 22 Mar 2011 19:09:57 +0000
Subject: [PATCH] Fix build for CLISP installs with dynamic module support.

This is the default as of CLISP 2.49.
---
 Makefile.in        |    4 ++--
 configure.ac       |    8 ++++++++
 make-image.lisp.in |    1 +
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index c7512d7..4a5fd1f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,11 +1,11 @@
 address@hidden@
 
-clisp_BUILDOPTS=-K full -on-error exit ./make-image.lisp
+clisp_BUILDOPTS=-on-error exit ./make-image.lisp
 sbcl_BUILDOPTS=--load ./make-image.lisp
 ccl_BUILDOPTS=--load ./make-image.lisp
 ecl_BUILDOPTS=-norc -shell ./make-image.lisp
 
-clisp_INFOOPTS=-K full -on-error exit -x "(require 'asdf '(\"asdf.lisp\")) (load \"stumpwm.asd\") (load \"@PPCRE_PATH@/cl-ppcre.asd\") (asdf:operate 'asdf:load-op :stumpwm) (load (compile-file \"manual.lisp\")) (stumpwm::generate-manual) (ext:exit)"
+clisp_INFOOPTS=-on-error exit -x "(require 'asdf '(\"asdf.lisp\")) (require \"clx\") (load \"stumpwm.asd\") (load \"@PPCRE_PATH@/cl-ppcre.asd\") (asdf:operate 'asdf:load-op :stumpwm) (load (compile-file \"manual.lisp\")) (stumpwm::generate-manual) (ext:exit)"
 sbcl_INFOOPTS=--eval "(progn (require 'asdf) (require 'stumpwm) (load \"manual.lisp\"))" --eval "(progn (stumpwm::generate-manual) (sb-ext:quit))"
 ccl_INFOOPTS=--eval "(progn (require 'asdf) (require 'stumpwm))" --load manual.lisp --eval "(progn (stumpwm::generate-manual) (quit))"
 ecl_INFOOPTS=-eval "(progn (require 'asdf) (load \"@PPCRE_PATH@/cl-ppcre.asd\") (require 'stumpwm) (load \"manual.lisp\"))" -eval "(progn (stumpwm::generate-manual) (ext:quit))"
diff --git a/configure.ac b/configure.ac
index aef8485..e701bb9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -105,6 +105,14 @@ fi
 
 if test "$LISP" = "clisp"; then
    AC_CHECK_FILE([$PPCRE_PATH/cl-ppcre.asd],,AC_MSG_ERROR([Cannot find ppcre. When using clisp you must specify its location using --with-ppcre]))
+   AC_MSG_CHECKING([whether clisp is built with dynamic module support])
+   result=$($LISP_PROGRAM -q -x '(nth-value 0 (find-symbol "DYNLOAD-MODULES" "SYS"))')
+   if test "x$result" = "xNIL"; then
+      AC_MSG_RESULT([no])
+      LISP_PROGRAM="$LISP_PROGRAM -K full"
+   else
+      AC_MSG_RESULT([yes])
+   fi
 fi
 
 # XXX How to do an OR ?
diff --git a/make-image.lisp.in b/make-image.lisp.in
index 809619a..00f1e0b 100644
--- a/make-image.lisp.in
+++ b/make-image.lisp.in
@@ -19,6 +19,7 @@
 #+clisp
 (progn
   (require 'asdf '("asdf.lisp"))
+  (require "clx")
   (load "stumpwm.asd")
   (load "@PPCRE_PATH@/cl-ppcre.asd"))
 #+clisp
-- 
1.7.2.3