[Matlisp-commit] [matlisp-git]matlisp branch master updated. 2012-02-23-15-gec16280

[Akshay S. <ak...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "matlisp".

The branch, master has been updated
       via  ec16280b56855cff043ec1fc6bbddc11cf2cebca (commit)
      from  6695b66525322e6817de899b467fb3505ec22775 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit ec16280b56855cff043ec1fc6bbddc11cf2cebca
Author: Akshay Srinivasan <aks...@gm...>
Date:   Sat Mar 10 23:01:08 2012 +0530

    Make sure lazy-loader.lisp, loads matlisp's version of libraries when asked to.

diff --git a/lib/lazy-loader.lisp.in b/lib/lazy-loader.lisp.in
index f67b5d0..d160594 100644
--- a/lib/lazy-loader.lisp.in
+++ b/lib/lazy-loader.lisp.in
@@ -117,33 +117,36 @@
 
 ;; Define our libraries
 (cffi:define-foreign-library dfftpack
-  (t (:default "libdfftpack")))
+  (t (:default "@libdir@/libdfftpack")))
 
 (cffi:define-foreign-library toms715
-  (t (:default "libtoms715")))
+  (t (:default "@libdir@/libtoms715")))
 
 (cffi:define-foreign-library odepack
-  (t (:default "libodepack")))
+  (t (:default "@libdir@/libodepack")))
+
+(if @ATLAS_P@
+    (progn
+      ;; Define the ATLAS libraries and their locations.
+      (push "@ATLAS_DIR@" cffi:*foreign-library-directories*)
+      (cffi:define-foreign-library atlas
+	(t (:default "libatlas")))
+
+      (cffi:define-foreign-library cblas
+	(t (:default "libcblas")))
+
+      (cffi:define-foreign-library f77blas
+	(t (:default "libf77blas")))
+
+      (cffi:define-foreign-library lapack
+	(t (:default "liblapack"))))
+    (progn
+      ;; Use our blas and lapack libraries
+      (cffi:define-foreign-library blas
+	(t (:default "@libdir@/libblas")))
+      (cffi:define-foreign-library lapack
+	(t (:default "@libdir@/liblapack")))))
 
-(when @ATLAS_P@
-  ;; Define the ATLAS libraries and their locations.
-  (push "@ATLAS_DIR@" cffi:*foreign-library-directories*)
-  (cffi:define-foreign-library atlas
-    (t (:default "libatlas")))
-
-  (cffi:define-foreign-library cblas
-    (t (:default "libcblas")))
-
-  (cffi:define-foreign-library f77blas
-    (t (:default "libf77blas"))))
-
-(unless @ATLAS_P@
-  ;; Use our blas and lapack libraries
-  (cffi:define-foreign-library blas
-    (t (:default "@libdir@/libblas"))))
-
-(cffi:define-foreign-library lapack
-  (t (:default "liblapack")))
 
 (defun load-blas-&-lapack-libraries ()
   ;; Load the additional matlisp libraries

-----------------------------------------------------------------------

Summary of changes:
 lib/lazy-loader.lisp.in |   39 +++++++++++++++++++++------------------
 1 files changed, 21 insertions(+), 18 deletions(-)


hooks/post-receive
-- 
matlisp