Revert "Move calls to REQUIRE into the DEFSYSTEM"

This reverts commit 18f6ed50ef0b3ad91727640bfa53bc8fd169b595.

diff --git a/bordeaux-threads.asd b/bordeaux-threads.asd
index dd3efd3..ab4c828 100644 (file)
--- a/bordeaux-threads.asd
+++ b/bordeaux-threads.asd
@@ -6,7 +6,13 @@ Copyright 2006,2007 Greg Pfeil
 Distributed under the MIT license (see LICENSE file)
 |#
 
-(cl:eval-when (:compile-toplevel :load-toplevel :execute)
+(in-package :cl-user)
+
+(eval-when (:compile-toplevel :load-toplevel :execute)
+  #+allegro (require :smputil)
+  #+corman  (require :threads))
+
+(eval-when (:compile-toplevel :load-toplevel :execute)
   #+(or armedbear
         (and allegro multiprocessing)
         (and clisp mt)
@@ -52,15 +58,6 @@ Distributed under the MIT license (see LICENSE file)
                  #+(and thread-support digitool)
                  (:file "condition-variables")
                  (:file "default-implementations"))))
-  :perform (asdf:compile-op :before (o c)
-             #+allegro (require :smputil)
-             #+corman  (require :threads))
-  :perform (asdf:load-op :before (o c)
-             #+allegro (require :smputil)
-             #+corman  (require :threads))
-  :perform (asdf:load-source-op :before (o c)
-             #+allegro (require :smputil)
-             #+corman  (require :threads))
   :in-order-to ((asdf:test-op (asdf:load-op bordeaux-threads-test)))
   :perform (asdf:test-op :after (op c)
              (asdf:oos 'asdf:test-op :bordeaux-threads-test)))