X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=clsql-mysql.asd;h=cbcd9141d17532c262fdc7e0d3574f182751ea8c;hp=a229791304ebf382461acd183d63eb61b37844db;hb=2961f4f122593e9d4875e88e6af159de28c8dd47;hpb=afc88420d03b627b214473078c3adc201de2de80

diff --git a/clsql-mysql.asd b/clsql-mysql.asd
index a229791..cbcd914 100644
--- a/clsql-mysql.asd
+++ b/clsql-mysql.asd
@@ -20,8 +20,8 @@
 (in-package #:clsql-mysql-system)
 
 (eval-when (:compile-toplevel :load-toplevel :execute)
-  #+common-lisp-controller (require 'uffi)
-  #-common-lisp-controller (asdf:operate 'asdf:load-op 'uffi))
+  (unless (find-package 'uffi)
+    (asdf:operate 'asdf:load-op 'uffi)))
 
 (defvar *library-file-dir* (append (pathname-directory *load-truename*)
 				   (list "db-mysql")))
@@ -81,7 +81,7 @@
   :description "Common Lisp SQL MySQL Driver"
   :long-description "cl-sql-mysql package provides a database driver to the MySQL database system."
 
-  :depends-on (uffi clsql-base clsql-uffi)
+  :depends-on (uffi clsql clsql-uffi)
   :components
   ((:module :db-mysql
 	    :components
@@ -90,4 +90,5 @@
 	     (:file "mysql-loader" :depends-on ("mysql-package" "mysql"))
 	     (:file "mysql-client-info" :depends-on ("mysql-loader"))
 	     (:file "mysql-api" :depends-on ("mysql-client-info"))
-	     (:file "mysql-sql" :depends-on ("mysql-api"))))))
+	     (:file "mysql-sql" :depends-on ("mysql-api"))
+	     (:file "mysql-objects" :depends-on ("mysql-sql"))))))