r11859: Canonicalize whitespace

[clsql.git] / clsql.asd

diff --git a/clsql.asd b/clsql.asd
index 74f837680515f33c9e562eb22dfbd50e1ff5e937..35e172ac40ef9440ed3037b4c60af5a4b589f638 100644 (file)
--- a/clsql.asd
+++ b/clsql.asd
@@ -18,6 +18,17 @@
 (defpackage #:clsql-system (:use #:asdf #:cl))
 (in-package #:clsql-system)
 
+#+clisp
+(progn
+  (asdf:operate 'asdf:load-op 'cffi)
+  (asdf:operate 'asdf:load-op 'cffi-uffi-compat)
+  (asdf:defsystem uffi :depends-on (cffi-uffi-compat)))
+
+;; need to load uffi for below perform :after method
+(eval-when (:compile-toplevel :load-toplevel :execute)
+  (unless (find-package 'uffi)
+    (asdf:operate 'asdf:load-op 'uffi)))
+
 (defsystem clsql
     :name "CLSQL"
     :author "Kevin Rosenberg <kevin@rosenberg.net>"
@@ -40,8 +51,8 @@ oriented interface."
                         (:file "base-classes" :depends-on ("package"))
                          (:file "conditions" :depends-on ("base-classes"))
                          (:file "db-interface" :depends-on ("conditions"))
-                        (:file "time" :depends-on ("package" "conditions"))
                         (:file "utils" :depends-on ("package" "db-interface"))
+                        (:file "time" :depends-on ("package" "conditions" "utils"))
                          (:file "generics" :depends-on ("package"))))
                (:module database
                         :pathname ""
@@ -49,7 +60,7 @@ oriented interface."
                         ((:file "initialize")
                         (:file "database" :depends-on ("initialize"))
                         (:file "recording" :depends-on ("database"))
-                        (:file "pool"))
+                        (:file "pool" :depends-on ("database")))
                         :depends-on (base))
               (:module syntax
                        :pathname ""
@@ -62,8 +73,9 @@ oriented interface."
                        :pathname ""
                        :components ((:file "fdml")
                                      (:file "transaction" :depends-on ("fdml"))
+                                     #+clisp (:file "ansi-loop")
                                      (:file "loop-extension"
-                                            :depends-on ("fdml"))
+                                            :depends-on ("fdml" #+clisp "ansi-loop"))
                                     (:file "fddl" :depends-on ("fdml")))
                        :depends-on (syntax))
               (:module object
@@ -85,6 +97,14 @@ oriented interface."
   (operate 'test-op 'clsql-tests :force t))
 
 (defmethod perform :after ((o load-op) (c (eql (find-system 'clsql))))
-  (when (probe-file "/etc/clsql-init.lisp")
-    (load "/etc/clsql-init.lisp")))
+  (let* ((init-var (uffi:getenv "CLSQLINIT"))
+         (init-file (or (when init-var (probe-file init-var))
+                        (probe-file
+                         (concatenate 'string
+                                      (namestring (user-homedir-pathname))
+                                      ".clsql-init.lisp"))
+                        (probe-file "/etc/clsql-init.lisp")
+                        #+(or mswin windows win32)
+                        (probe-file "c:\\etc\\clsql-init.lisp"))))
+    (when init-file (load init-file))))