X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=clsql.asd;h=f423927cecfb262027d2057fa504c0159237f4e2;hp=74f837680515f33c9e562eb22dfbd50e1ff5e937;hb=0e43efc5b776edd86d304e103123944a84efd9a4;hpb=18e34efea688a6758b6e997401fbc3f241da98f3

diff --git a/clsql.asd b/clsql.asd
index 74f8376..f423927 100644
--- a/clsql.asd
+++ b/clsql.asd
@@ -18,6 +18,11 @@
 (defpackage #:clsql-system (:use #:asdf #:cl))
 (in-package #:clsql-system)
 
+;; 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>"
@@ -62,8 +67,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 +91,10 @@ 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 "/etc/clsql-init.lisp")
+                        #+(or mswin windows win32)
+                        (probe-file "c:\\etc\\clsql-init.lisp"))))
+    (when init-file (load init-file))))