X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=clsql-mysql.asd;h=41a661c5fe3ee9490e74a9993cb32a0d5dc87aee;hb=e481460e74844407bc700259e9d0c3a666f4d26b;hp=feb6d29377dddc75d4729fdfff6684563ca36371;hpb=5b2f98573131ce19bb746d801e8f004b880427bf;p=clsql.git

diff --git a/clsql-mysql.asd b/clsql-mysql.asd
index feb6d29..41a661c 100644
--- a/clsql-mysql.asd
+++ b/clsql-mysql.asd
@@ -19,25 +19,26 @@
 (defpackage #:clsql-mysql-system (:use #:asdf #:cl))
 (in-package #:clsql-mysql-system)
 
-(defvar *asd-file-dir* (pathname-directory *load-truename*))
+(defvar *library-file-dir* (append (pathname-directory *load-truename*)
+				   (list "db-mysql")))
 
 (defclass clsql-mysql-source-file (c-source-file)
   ())
 
 (defmethod output-files ((o compile-op) (c clsql-mysql-source-file))
-  (let ((searched (or
-		   (probe-file #p"/usr/lib/clsql/uffi.so")
-		   (probe-file (make-pathname
-				:directory *asd-file-dir*
-				:name "db-mysql"
-				:type "so")))))
-    (if searched
-	(list searched)
-	(list (merge-pathnames
-	       (make-pathname :name (component-name c)
-			      :type "so"
-			      :directory '(:relative "db-mysql"))
-	       (make-pathname :directory *asd-file-dir*))))))
+  (let* ((library-file-type
+	  (funcall (intern (symbol-name'#:default-foreign-library-type)
+			   (symbol-name '#:uffi))))
+         (found (some #'(lambda (dir)
+			    (probe-file (make-pathname :directory dir
+						       :name (component-name c)
+						       :type library-file-type)))
+			'((:absolute "usr" "lib" "clsql"))))) 
+    (list (if found
+	      found
+	      (make-pathname :name (component-name c)
+			     :type library-file-type
+			     :directory *library-file-dir*)))))
 
 (defmethod perform ((o load-op) (c clsql-mysql-source-file))
   nil) ;;; library will be loaded by a loader file
@@ -45,13 +46,9 @@
 (defmethod perform ((o compile-op) (c clsql-mysql-source-file))
   (unless (zerop (run-shell-command
 		  "cd ~A; make"
-		  (namestring (merge-pathnames
-			       (make-pathname
-				:name nil
-				:type nil
-				:directory '(:relative "db-mysql"))
-			       (make-pathname
-				:directory *asd-file-dir*)))))
+		  (namestring (make-pathname :name nil
+					     :type nil
+					     :directory *library-file-dir*))))
     (error 'operation-error :component c :operation o)))
 
 ;;; System definition
@@ -71,7 +68,8 @@
 	    ((:clsql-mysql-source-file "mysql")
 	     (:file "mysql-package")
 	     (:file "mysql-loader" :depends-on ("mysql-package" "mysql"))
-	     (:file "mysql-api" :depends-on ("mysql-loader"))
+	     (: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-usql" :depends-on ("mysql-sql")))))
   :depends-on (:uffi :clsql-base :clsql-uffi))