;;;; Programmer: Aurelio Bignoli
;;;; Date Started: Nov 2003
;;;;
-;;;; $Id$
-;;;;
;;;; This file, part of CLSQL, is Copyright (c) 2003 by Aurelio Bignoli
;;;;
;;;; CLSQL users are granted the rights to distribute and use this software
to load the SQLite library succesfully. If this differs at your site,
set to the right path before compiling or loading the system.")
-(defvar *sqlite-library-loaded* #+clisp t
- #-clisp nil
- "T if foreign library was able to be loaded successfully")
+(defvar *sqlite-library-loaded* nil
+ "T if foreign library was able to be loaded successfully")
(defmethod database-type-library-loaded ((database-type (eql :sqlite)))
"T if foreign library was able to be loaded successfully. "
*sqlite-library-loaded*)
(defmethod database-type-load-foreign ((database-type (eql :sqlite)))
- #+clisp
- t
- #-clisp
- (let ((libpath (uffi:find-foreign-library
- "libsqlite"
- '(#+64bit "/usr/lib64/"
- "/usr/lib/" "/usr/local/lib/")
- :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-base:database-type-load-foreign :sqlite)
-
-
-
+ (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)
+
+
+