X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=db-sqlite%2Fsqlite-loader.lisp;h=27bea2027750a8a60c4e71fb85f002f91ba29065;hp=59baaee3822d4cfe8d81b0a0dcb477775e1c27ab;hb=e3924d6e872f06dce33c923b15c5d30baa31460c;hpb=a1921eaa3bd9a412a736a36bdd50ff5766ab1c9f

diff --git a/db-sqlite/sqlite-loader.lisp b/db-sqlite/sqlite-loader.lisp
index 59baaee..27bea20 100644
--- a/db-sqlite/sqlite-loader.lisp
+++ b/db-sqlite/sqlite-loader.lisp
@@ -31,17 +31,10 @@ set to the right path before compiling or loading the system.")
   *sqlite-library-loaded*)
 
 (defmethod database-type-load-foreign ((database-type (eql :sqlite)))
-  (let ((libpath (uffi:find-foreign-library
-		  '("libsqlite" "sqlite")
-		  '(#+64bit "/usr/lib64/"
-		    "/usr/lib/" "/usr/local/lib/" "/bin/")
-		  :drive-letters '("C" "D" "E"))))
-    (if (uffi:load-foreign-library libpath
-				   :module "sqlite"
-				   :supporting-libraries 
-				   *sqlite-supporting-libraries*)
-	(setq *sqlite-library-loaded* t)
-	(warn "Can't load SQLite library ~A" libpath))))
+  (clsql-uffi:find-and-load-foreign-library '("libsqlite" "sqlite")
+                                            :module "sqlite"
+                                            :supporting-libraries *sqlite-supporting-libraries*)
+  (setq *sqlite-library-loaded* t))
 
 (clsql-sys:database-type-load-foreign :sqlite)