2013-11-23 Kiss Kalman <kami@zalaszam.hu>
authorKevin M. Rosenberg <kevin@rosenberg.net>
Sat, 23 Nov 2013 17:08:02 +0000 (10:08 -0700)
committerKevin M. Rosenberg <kevin@rosenberg.net>
Sat, 23 Nov 2013 17:08:02 +0000 (10:08 -0700)
           * utils/sql.lisp: Commit patch adding ccl getenv support

ChangeLog
db-mysql/Makefile
sql/utils.lisp

index 7e23b23..7675709 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2013-11-23 Kiss Kalman <kami@zalaszam.hu>
+       * utils/sql.lisp: Commit patch adding ccl getenv support
+
 2013-04-17 Kevin Rosenberg <kevin@rosenberg.net>
        * Version 6.4.1
        * sql/utils.lisp: Patch from Ben Hyde to add weak hash table
index 3616e9b..bbe489a 100644 (file)
@@ -26,7 +26,7 @@ dylib=$(base).dylib
 .PHONY: all
 all: $(shared_lib)
 
-CFLAGS=-I /usr/local/include/mysql -I /usr/include/mysql -I /sw/include/mysql -I /opt/local/include/mysql -I /opt/local/include/mysql5/mysql -I /usr/local/mysql/include
+CFLAGS=-I /usr/local/include/mysql -I /usr/include/mysql -I /sw/include/mysql -I /opt/local/include/mysql -I /opt/local/include/mysql55/mysql -I /usr/local/mysql/include
 LDFLAGS=-L/usr/local/lib64/mysql -L/usr/local/lib/mysql -L/usr/lib64/mysql -L/usr/lib/mysql -L/sw/lib -L/opt/local/lib/mysql -L/opt/local/lib/mysql5/mysql -L/usr/local/mysql/lib -L/usr/lib/gcc/i686-pc-cygwin/3.4.4 -lmysqlclient -lz -lc
 
 CFLAGS32=-I /usr/local/include/mysql -I /usr/include/mysql -I /sw/include/mysql -I /opt/local/include/mysql -I /opt/local/include/mysql5/mysql -I /usr/local/mysql/include -m32
index a215a44..0b58f0f 100644 (file)
@@ -375,7 +375,7 @@ list of characters and replacement strings."
   (cdr (assoc (string var) ext:*environment-list* :test #'equalp
               :key #'string))
   #+lispworks (lw:environment-variable (string var))
-  #+mcl (ccl::getenv var)
+  #+(or mcl ccl) (ccl::getenv var)
   #+sbcl (sb-ext:posix-getenv var))
 
 (eval-when (:compile-toplevel :load-toplevel :execute)