[Maxima-commits] CVS: maxima/lisp-utils defsystem.lisp,1.33,1.34

[Raymond T. <rt...@us...>]

Update of /cvsroot/maxima/maxima/lisp-utils
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv1744/lisp-utils

Modified Files:
	defsystem.lisp 
Log Message:
Some updates for building maxima with Clozure CL (aka ccl, aka
openmcl).

src/Makefile.am:
o Need to call quit after building the dependencies.

lisp-utils/defsystem.lisp:
o Update conditionalizations because ccl doesn't have lisp::require.
o Need in-package form.


Index: defsystem.lisp
===================================================================
RCS file: /cvsroot/maxima/maxima/lisp-utils/defsystem.lisp,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- defsystem.lisp	13 May 2009 08:01:40 -0000	1.33
+++ defsystem.lisp	18 Feb 2010 16:00:36 -0000	1.34
@@ -871,6 +871,7 @@
       :cormanlisp
       :scl
       :abcl
+      :ccl
       (and allegro-version>= (version>= 4 1)))
 (eval-when #-(or :lucid)
            (:compile-toplevel :load-toplevel :execute)
@@ -993,10 +994,10 @@
 
 #+abcl (defpackage make (:use "COMMON-LISP") (:nicknames "MK"))
 
-#+(or clisp cormanlisp ecl (and gcl defpackage) sbcl)
+#+(or clisp cormanlisp ecl (and gcl defpackage) sbcl ccl)
 (defpackage "MAKE" (:use "COMMON-LISP") (:nicknames "MK"))
 
-#-(or :sbcl :cltl2 :lispworks :ecl :scl :abcl)
+#-(or :sbcl :cltl2 :lispworks :ecl :scl :abcl :ccl)
 (in-package :make :nicknames '("MK"))
 
 ;;; For CLtL2 compatible lisps...
@@ -1052,7 +1053,7 @@
 (eval-when (compile load eval)
   (in-package :make))
 
-#+(or ecl abcl)
+#+(or ecl abcl ccl)
 (in-package :make)
 
 ;;; *** Marco Antoniotti <ma...@ic...> 19970105
@@ -4127,7 +4128,7 @@
 (unless *old-require*
   (setf *old-require*
 	(symbol-function
-	 #-(or (and :excl :allegro-v4.0) :mcl :sbcl :scl :lispworks :abcl) 'lisp:require
+	 #-(or (and :excl :allegro-v4.0) :mcl :sbcl :scl :lispworks :abcl  :openmcl) 'lisp:require
 	 #+(and :excl :allegro-v4.0) 'cltl1:require
 	 #+(or :sbcl :scl) 'cl:require
 	 #+(or :lispworks3.1 :abcl) 'common-lisp::require
@@ -4141,7 +4142,7 @@
 	  (ccl:*warn-if-redefine-kernel* nil))
       #-(or (and allegro-version>= (version>= 4 1)) :lispworks)
       (setf (symbol-function
-	     #-(or (and :excl :allegro-v4.0) :mcl :sbcl :scl :lispworks :abcl) 'lisp:require
+	     #-(or (and :excl :allegro-v4.0) :mcl :sbcl :scl :lispworks :abcl :openmcl) 'lisp:require
 	     #+(and :excl :allegro-v4.0) 'cltl1:require
 	     #+(or :lispworks3.1 :abcl) 'common-lisp::require
 	     #+(or :sbcl :scl) 'cl:require