r11657: 25 Apr 2007 Kevin Rosenberg <kevin@rosenberg.net>

[clsql.git] / db-sqlite3 / sqlite3-loader.lisp

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