From a1921eaa3bd9a412a736a36bdd50ff5766ab1c9f Mon Sep 17 00:00:00 2001
From: "Kevin M. Rosenberg" <kevin@rosenberg.net>
Date: Wed, 8 Jun 2005 19:21:06 +0000
Subject: [PATCH] r10574: start renaming

---
 db-mysql/Makefile                       |   6 ++--
 db-mysql/Makefile.msvc                  |   2 +-
 db-mysql/{mysql.dll => clsql_mysql.dll} | Bin
 db-mysql/{mysql.lib => clsql_mysql.lib} | Bin
 db-mysql/mysql-loader.lisp              |  45 ++++++++----------------
 db-mysql/{mysql.c => uffi_mysql.c}      |   0
 6 files changed, 18 insertions(+), 35 deletions(-)
 rename db-mysql/{mysql.dll => clsql_mysql.dll} (100%)
 rename db-mysql/{mysql.lib => clsql_mysql.lib} (100%)
 rename db-mysql/{mysql.c => uffi_mysql.c} (100%)

diff --git a/db-mysql/Makefile b/db-mysql/Makefile
index 70a2d18..dd47bc5 100644
--- a/db-mysql/Makefile
+++ b/db-mysql/Makefile
@@ -17,16 +17,16 @@ SUBDIRS=
 
 include ../Makefile.common
 
-base=mysql
+base=uffi_mysql
 source=$(base).c
 object=$(base).o
-shared_lib=$(base).so
+shared_lib=uffi_mysql.so
 
 .PHONY: all
 all: $(shared_lib)
 
 $(shared_lib): $(source) Makefile
-	CFLAGS="-I /usr/local/include/mysql -I /usr/include/mysql -I /sw/include/mysql -I /opt/local/include/mysql" LDFLAGS="-L/usr/local/lib64/mysql -L/usr/lib/mysql -L/sw/lib -L/opt/local/lib/mysql -lmysqlclient" BASE=$(base) OBJECT=$(object) SOURCE=$(source) SHARED_LIB=$(shared_lib) sh make.sh
+	CFLAGS="-I /usr/local/include/mysql -I /usr/include/mysql -I /sw/include/mysql -I /opt/local/include/mysql" LDFLAGS="-L/usr/local/lib64/mysql -L/usr/lib/mysql -L/sw/lib -L/opt/local/lib/mysql -lmysqlclient -lz" BASE=$(base) OBJECT=$(object) SOURCE=$(source) SHARED_LIB=$(shared_lib) sh make.sh
 	rm $(object)
 
 .PHONY: distclean
diff --git a/db-mysql/Makefile.msvc b/db-mysql/Makefile.msvc
index 096bb55..a692f4c 100644
--- a/db-mysql/Makefile.msvc
+++ b/db-mysql/Makefile.msvc
@@ -17,7 +17,7 @@
 ###########################################################################
 
 
-BASE=mysql
+BASE=clsql_mysql
 
 # Set to the directory where you have installed mysql's library
 MYSQL_DIR=c:/mysql
diff --git a/db-mysql/mysql.dll b/db-mysql/clsql_mysql.dll
similarity index 100%
rename from db-mysql/mysql.dll
rename to db-mysql/clsql_mysql.dll
diff --git a/db-mysql/mysql.lib b/db-mysql/clsql_mysql.lib
similarity index 100%
rename from db-mysql/mysql.lib
rename to db-mysql/clsql_mysql.lib
diff --git a/db-mysql/mysql-loader.lisp b/db-mysql/mysql-loader.lisp
index ffcc576..354e61e 100644
--- a/db-mysql/mysql-loader.lisp
+++ b/db-mysql/mysql-loader.lisp
@@ -18,24 +18,16 @@
 
 (in-package #:mysql)
 
-(defparameter *clsql-mysql-library-path* 
-  (uffi:find-foreign-library
-   '(#+(or 64bit x86-64) "mysql64" "mysql")
-   `(,clsql-mysql-system::*library-file-dir*
-     "/usr/lib/clsql/"
-     "/sw/lib/clsql/")
-   :drive-letters '("C")))
+(defparameter *clsql-mysql-library-candidate-names* 
+  (list #+(or 64bit x86-64) (make-pathname :name "clsql_mysql64"
+                                           :directory (pathname-directory *load-truename*))
+        #+(or 64bit x86-64) "clsql_mysql64"
+        (make-pathname :name "clsql_mysql"
+                       :directory (pathname-directory *load-truename*))
+        "clsql_mysql"))
 
 (defvar *mysql-library-candidate-names*
-    '("libmysqlclient" "libmysql"))
-
-(defparameter *mysql-library-candidate-directories*
-    `(,(pathname-directory *load-pathname*)
-      #+(or 64bit x86-64) "/usr/lib64/" #+(or 64bit x86-64) "/usr/local/lib64/mysql/"
-      "/opt/mysql/lib/mysql/" "/usr/local/lib/"
-      "/usr/lib/" "/usr/local/lib/mysql/" "/usr/lib/mysql/" "/mysql/lib/opt/" "/sw/lib/mysql/" "/opt/local/lib/mysql/"))
-
-(defvar *mysql-library-candidate-drive-letters* '("C" "D" "E"))
+  '("libmysqlclient" "libmysql"))
 
 (defvar *mysql-supporting-libraries* '("c")
   "Used only by CMU. List of library flags needed to be passed to ld to
@@ -49,21 +41,12 @@ set to the right path before compiling or loading the system.")
   *mysql-library-loaded*)
 				      
 (defmethod clsql-sys:database-type-load-foreign ((database-type (eql :mysql)))
-  (let ((mysql-path
-	 (uffi:find-foreign-library *mysql-library-candidate-names*
-				    *mysql-library-candidate-directories*
-				    :drive-letters
-				    *mysql-library-candidate-drive-letters*)))
-    (unless (probe-file mysql-path)
-      (error "Can't find mysql client library to load"))
-    (uffi:load-foreign-library mysql-path
-			       :module "mysql" 
-			       :supporting-libraries 
-			       *mysql-supporting-libraries*)
-    (uffi:load-foreign-library *clsql-mysql-library-path* 
-			       :module "clsql-mysql" 
-			       :supporting-libraries 
-			       (append *mysql-supporting-libraries*)))
+  (clsql-uffi:find-and-load-foreign-library *mysql-library-candidate-names*
+                                            :module "mysql" 
+                                            :supporting-libraries *mysql-supporting-libraries*)
+  (clsql-uffi:find-and-load-foreign-library *clsql-mysql-library-candidate-names*
+                                            :module "clsql-mysql" 
+                                            :supporting-libraries *mysql-supporting-libraries*)
   (setq *mysql-library-loaded* t))
 
 
diff --git a/db-mysql/mysql.c b/db-mysql/uffi_mysql.c
similarity index 100%
rename from db-mysql/mysql.c
rename to db-mysql/uffi_mysql.c
-- 
2.34.1