Don't rely on compile time #+cl-launch - use run-time detection,

so cl-launch can compiled in parallel without declaring a dependency.

diff --git a/get-command-line-arguments.lisp b/get-command-line-arguments.lisp
index d2cb0cf..02af126 100644 (file)
--- a/get-command-line-arguments.lisp
+++ b/get-command-line-arguments.lisp
@@ -14,19 +14,17 @@
 
 (in-package :command-line-arguments)
 
-#+cl-launch
 (defun get-command-line-arguments ()
-  cl-launch:*arguments*)
-
-#-cl-launch
-(defun get-command-line-arguments ()
-  #+sbcl (cdr sb-ext:*posix-argv*)
-  #+clozure (cdr (ccl::command-line-arguments))
-  #+gcl (cdr si:*command-args*)
-  #+ecl (loop for i from 1 below (si:argc) collect (si:argv i))
-  #+cmu (cdr extensions:*command-line-strings*)
-  #+allegro (cdr (sys:command-line-arguments))
-  #+lispworks (cdr sys:*line-arguments-list*)
-  #+clisp ext:*args*
-  #-(or sbcl clozure gcl ecl cmu allegro lispworks clisp)
-  (error "get-command-line-arguments not supported for your implementation"))
+  (if (find-package :cl-launch)
+    (symbol-value (find-symbol (string :*arguments*) :cl-launch))
+    (progn
+      #+sbcl (cdr sb-ext:*posix-argv*)
+      #+clozure (cdr (ccl::command-line-arguments))
+      #+gcl (cdr si:*command-args*)
+      #+ecl (loop for i from 1 below (si:argc) collect (si:argv i))
+      #+cmu (cdr extensions:*command-line-strings*)
+      #+allegro (cdr (sys:command-line-arguments))
+      #+lispworks (cdr sys:*line-arguments-list*)
+      #+clisp ext:*args*
+      #-(or sbcl clozure gcl ecl cmu allegro lispworks clisp)
+      (error "get-command-line-arguments not supported for your implementation"))))