*** defsystem.lisp-clocc	Thu Jul 28 23:04:33 2005
--- defsystem.lisp	Sat Feb  5 21:31:34 2005
***************
*** 2382,2388 ****
     (component :reader missing-component-component
                :initarg :component)
     )
!   (:default-initargs :component nil)
    (:report (lambda (mmc stream)
  	     (format stream "MK:DEFSYSTEM: missing component ~S for ~S."
                       (missing-component-name mmc)
--- 2382,2388 ----
     (component :reader missing-component-component
                :initarg :component)
     )
!   #-gcl(:default-initargs :component nil)
    (:report (lambda (mmc stream)
  	     (format stream "MK:DEFSYSTEM: missing component ~S for ~S."
                       (missing-component-name mmc)
***************
*** 2800,2805 ****
--- 2800,2808 ----
  	    (make-pathname :host (when (component-host component)
  				   ;; MCL2.0b1 and ACLPC cause an error on
  				   ;; (pathname-host nil)
+ 				   #+sbcl
+ 				   (component-host component)
+ 				   #-sbcl
  				   (pathname-host (component-host component)
  						  #+scl :case #+scl :common
  						  ))
***************
*** 2993,3002 ****
    (unless (find :source-pathname definition-body)
      (setf definition-body
  	  (list* :source-pathname
! 		 '(when *load-pathname*
  		        (make-pathname :name nil
  			               :type nil
! 			               :defaults *load-pathname*))
  		 definition-body)))
    `(create-component :defsystem ',name ',definition-body nil 0))
  
--- 2996,3006 ----
    (unless (find :source-pathname definition-body)
      (setf definition-body
  	  (list* :source-pathname
! 		 '(when #-gcl *load-pathname* #+gcl si::*load-pathname*
  		        (make-pathname :name nil
  			               :type nil
! 			               :defaults #-gcl *load-pathname* 
! 			                         #+gcl si::*load-pathname*))
  		 definition-body)))
    `(create-component :defsystem ',name ',definition-body nil 0))
  
***************
*** 3568,3576 ****
    (declare #-(or :cltl2 :ansi-cl) (ignore override-compilation-unit))
    (unwind-protect
        ;; Protect the undribble.
!       (#+(or :cltl2 :ansi-cl) with-compilation-unit
! 	 #+(or :cltl2 :ansi-cl) (:override override-compilation-unit)
! 	 #-(or :cltl2 :ansi-cl) progn
  	(when *reset-full-pathname-table* (clear-full-pathname-tables))
  	(when dribble (dribble dribble))
  	(when test (setq verbose t))
--- 3572,3580 ----
    (declare #-(or :cltl2 :ansi-cl) (ignore override-compilation-unit))
    (unwind-protect
        ;; Protect the undribble.
!       (#+(and (or :cltl2 :ansi-cl) (not :gcl)) with-compilation-unit
! 	 #+(and (or :cltl2 :ansi-cl) (not :gcl)) (:override override-compilation-unit)
! 	 #-(and (or :cltl2 :ansi-cl) (not :gcl)) progn
  	(when *reset-full-pathname-table* (clear-full-pathname-tables))
  	(when dribble (dribble dribble))
  	(when test (setq verbose t))
***************
*** 4593,4598 ****
--- 4597,4604 ----
  	 ;; Ugly, but seems to fix the problem.
  	 (concatenate 'string "./" namestring))))
  
+ #+gcl(defun ensure-directories-exist (arg0 &key verbose) ())
+ 
  (defun compile-file-operation (component force)
    ;; Returns T if the file had to be compiled.
    (let ((must-compile