* lisp/core.lisp.in ("AxiomCore"): Use Clozure CL's package CCL.

6 files changed, 14 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 6c02e99c..928cfebd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-02-08  Gabriel Dos Reis  <gdr@cs.tamu.edu>
+
+	* configure.ac.pamphlet: Check for ccl and ccl64 too.
+
 2010-02-07  Gabriel Dos Reis  <gdr@cs.tamu.edu>
 
 	* configure.ac.pamphlet: Add support for Clozure CL.
diff --git a/configure b/configure
index 8198b37b..a492b9a1 100755
--- a/configure
+++ b/configure
@@ -15924,7 +15924,7 @@ fi
 fi
 ## We need to build our own GCL if none is avalaible.
 if test -z $axiom_lisp; then
-    for ac_prog in sbcl gcl ecl clisp
+    for ac_prog in sbcl gcl ecl clisp ccl ccl64
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
diff --git a/configure.ac b/configure.ac
index 33f9fa90..8c832482 100644
--- a/configure.ac
+++ b/configure.ac
@@ -166,7 +166,7 @@ if test -z $axiom_lisp; then
 fi
 ## We need to build our own GCL if none is avalaible.
 if test -z $axiom_lisp; then
-    AC_CHECK_PROGS([AXIOM_LISP], [sbcl gcl ecl clisp])
+    AC_CHECK_PROGS([AXIOM_LISP], [sbcl gcl ecl clisp ccl ccl64])
     ## A lisp may not be available AND the GCL source may also
     ## be missing.  Instruct user to either build one or get
     ## the dependencies from our website.
diff --git a/configure.ac.pamphlet b/configure.ac.pamphlet
index 1192b7a2..b1a255de 100644
--- a/configure.ac.pamphlet
+++ b/configure.ac.pamphlet
@@ -845,7 +845,7 @@ Consequently, we need to check for \Tool{GCL} and its version:
 <<find lisp>>=
 ## We need to build our own GCL if none is avalaible.
 if test -z $axiom_lisp; then
-    AC_CHECK_PROGS([AXIOM_LISP], [sbcl gcl ecl clisp])
+    AC_CHECK_PROGS([AXIOM_LISP], [sbcl gcl ecl clisp ccl ccl64])
     ## A lisp may not be available AND the GCL source may also
     ## be missing.  Instruct user to either build one or get
     ## the dependencies from our website.
diff --git a/src/ChangeLog b/src/ChangeLog
index 0c6ab682..9db22bc8 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2010-02-08  Gabriel Dos Reis  <gdr@cs.tamu.edu>
+
+	* lisp/core.lisp.in ("AxiomCore"): Use Clozure CL's package CCL.
+
 2010-02-07  Gabriel Dos Reis  <gdr@cs.tamu.edu>
 
 	Add support for CLozure CL.
diff --git a/src/lisp/core.lisp.in b/src/lisp/core.lisp.in
index 1d4882ad..5078b47a 100644
--- a/src/lisp/core.lisp.in
+++ b/src/lisp/core.lisp.in
@@ -56,6 +56,9 @@
   ;; image obtained from compiler link will not work.  The root cause
   ;; is a non-ANSI compliant organization of GCL's implementation.
   #+:gcl (:use "DEFPACKAGE")
+  ;; Clozure CL sequesters most of its useful extensions, in particular
+  ;; threads, in the CCL package.
+  #+:clozure (:use "CCL")
   (:export "coreQuit"
            "fatalError"
            "internalError"