Merge remote-tracking branches 'distorted/master' and 'ponder/master'

* distorted/master:
  bin/mdw-conf, dot/bashrc, setup: Portability fixes.

* ponder/master:
  dot/lisp-init.lisp: Make sure that ASDF is available.

diff --git a/dot/lisp-init.lisp b/dot/lisp-init.lisp
index 6624c60c9407768a0b19e554e18304aba0a516b3..3b5806de5ca75d4d9e9cac46d44d1c3fdb97ae86 100644 (file)
--- a/dot/lisp-init.lisp
+++ b/dot/lisp-init.lisp
@@ -3,6 +3,18 @@ (defpackage #:mdw-hacks
   (:export #:crank-swank))
 (use-package '#:mdw-hacks)
 
+;; Obtain ASDF from somewhere.
+#+sbcl (require :asdf)
+#+clisp (let ((*compile-verbose* nil)
+             (*load-verbose* nil))
+         (load "/usr/share/common-lisp/source/cl-asdf/asdf.lisp"
+               :verbose nil)
+         (handler-bind ((warning (lambda (cond)
+                                   (declare (ignore cond))
+                                   (muffle-warning))))
+           (funcall (find-symbol "LOAD-SYSTEM" :asdf) :asdf
+                    :verbose nil)))
+
 ;; Shut up.
 (setf *load-verbose* nil)
 (setf *compile-verbose* nil)