32be4661929032760438904b6ce0a7043278d7e7
[clsql.git] / debian / _patch_orig_
1 diff -ur clsql/db-mysql/mysql-loader.lisp clsql-debian/db-mysql/mysql-loader.lisp
2 --- clsql/db-mysql/mysql-loader.lisp    2005-06-08 13:21:08.816849000 -0600
3 +++ clsql-debian/db-mysql/mysql-loader.lisp     2005-06-08 17:33:33.547500816 -0600
4 @@ -41,9 +41,11 @@
5    *mysql-library-loaded*)
6                                       
7  (defmethod clsql-sys:database-type-load-foreign ((database-type (eql :mysql)))
8 -  (clsql-uffi:find-and-load-foreign-library *mysql-library-candidate-names*
9 -                                            :module "mysql" 
10 -                                            :supporting-libraries *mysql-supporting-libraries*)
11 +  (if (probe-file #p"/usr/lib/clsql/clsql_mysql.so")
12 +      (uffi:load-foriegn-library #p"/usr/lib/clsql/clsql_mysql.so")
13 +      (clsql-uffi:find-and-load-foreign-library *mysql-library-candidate-names*
14 +                                               :module "mysql" 
15 +                                               :supporting-libraries *mysql-supporting-libraries*))
16    (clsql-uffi:find-and-load-foreign-library *clsql-mysql-library-candidate-names*
17                                              :module "clsql-mysql" 
18                                              :supporting-libraries *mysql-supporting-libraries*)
19 diff -ur clsql/uffi/clsql-uffi-loader.lisp clsql-debian/uffi/clsql-uffi-loader.lisp
20 --- clsql/uffi/clsql-uffi-loader.lisp   2005-06-08 13:25:29.006295000 -0600
21 +++ clsql-debian/uffi/clsql-uffi-loader.lisp    2005-06-08 17:34:29.748956896 -0600
22 @@ -51,10 +51,12 @@
23    "T if foreign library was able to be loaded successfully")
24  
25  (defun load-uffi-foreign-library ()
26 -  (find-and-load-foreign-library *clsql-uffi-library-filenames*
27 -                                 :module "clsql-uffi" 
28 -                                 :supporting-libraries 
29 -                                 *clsql-uffi-supporting-libraries*)
30 +  (if (probe-file #p"/usr/lib/clsql/clsql_uffi.so")
31 +      (uffi:load-foriegn-library #p"/usr/lib/clsql/clsql_uffi.so")
32 +      (find-and-load-foreign-library *clsql-uffi-library-filenames*
33 +                                    :module "clsql-uffi" 
34 +                                    :supporting-libraries 
35 +                                    *clsql-uffi-supporting-libraries*))
36    (setq *uffi-library-loaded* t))
37  
38  (load-uffi-foreign-library)