diff --git a/tools/config.lisp b/tools/config.lisp index 84083bf2e4ae21f533988f15b4d17f6a80ba7e40..fa71bb6393072ffb5bd8330f30b5dae7b3dbb4ce 100644 --- a/tools/config.lisp +++ b/tools/config.lisp @@ -7,7 +7,7 @@ ;;; Scott Fahlman or slisp-group@cs.cmu.edu. ;;; (ext:file-comment - "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/tools/config.lisp,v 1.4 1993/07/26 15:16:03 ram Exp $") + "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/tools/config.lisp,v 1.5 2000/06/06 10:01:24 dtc Exp $") ;;; ;;; ********************************************************************** ;;; @@ -18,6 +18,7 @@ (block abort (let ((output-file #p"library:lisp.core") + (load-gray-streams t) (load-clm t) (load-clx t) (load-hemlock t) @@ -26,22 +27,25 @@ (fresh-line) (format t " 1: specify result file (currently ~S)~%" (namestring output-file)) - (format t " 2: toggle loading of the CLX X library, currently ~ + (format t " 2: toggle loading of the Gray Stream library, currently ~ + ~:[dis~;en~]abled.~%" + load-gray-streams) + (format t " 3: toggle loading of the CLX X library, currently ~ ~:[dis~;en~]abled.~%" load-clx) - (format t " 3: toggle loading of Motif and the graphical debugger, ~ + (format t " 4: toggle loading of Motif and the graphical debugger, ~ currently ~:[dis~;en~]abled.~ ~:[~% (would force loading of CLX.)~;~]~%" load-clm load-clx) - (format t " 4: toggle loading the Hemlock editor, currently ~ + (format t " 5: toggle loading the Hemlock editor, currently ~ ~:[dis~;en~]abled.~ ~:[~% (would force loading of CLX.)~;~]~%" load-hemlock load-clx) - (format t " 5: specify some site-specific file to load.~@ + (format t " 6: specify some site-specific file to load.~@ ~@[ Current files:~%~{ ~S~%~}~]" (mapcar #'namestring other)) - (format t " 6: configure according to current options.~%") - (format t " 7: abort the configuration process.~%") + (format t " 7: configure according to current options.~%") + (format t " 8: abort the configuration process.~%") (format t "~%Option number: ") (force-output) (flet ((file-prompt (prompt) @@ -53,25 +57,29 @@ (1 (setq output-file (file-prompt "Result core file name: "))) (2 + (setq load-gray-streams (not load-gray-streams))) + (3 (unless (setq load-clx (not load-clx)) (setq load-hemlock nil))) - (3 + (4 (when (setq load-clm (not load-clm)) (setq load-clx t))) - (4 + (5 (when (setq load-hemlock (not load-hemlock)) (setq load-clx t))) - (5 + (6 (setq other (append other (list (file-prompt "File(s) to load ~ (can have wildcards): "))))) - (6 (return)) - (7 + (7 (return)) + (8 (format t "~%Aborted.~%") (return-from abort)))))) (gc-off) + (when load-gray-streams + (load "library:subsystems/gray-streams-library")) (when load-clx (setf *features* (delete :no-clx *features* :test #'eq)) (load "library:subsystems/clx-library"))