From 5b86f2777bcb491b1993007cfbb07c34ee79f8e0 Mon Sep 17 00:00:00 2001
From: Kai Ni <nikai97@gmail.com>
Date: Mon, 15 Mar 2010 20:10:36 +0000
Subject: [PATCH] added USE_BLAS_MACOS and changed old USE_BLAS to
 USE_BLAS_LINUX to make ublas compilable on mac

---
 configure.ac    | 3 ++-
 cpp/Makefile.am | 9 ++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 3bbbff80f..e74dcb007 100644
--- a/configure.ac
+++ b/configure.ac
@@ -63,7 +63,8 @@ AC_ARG_ENABLE([blas],
        *) AC_MSG_ERROR([bad value ${enableval} for --enable-blas]) ;;
      esac],[blas=false])
 
-AM_CONDITIONAL([USE_BLAS], [test x$blas = xtrue])
+AM_CONDITIONAL([USE_BLAS_MACOS], [test x$blas = xtrue && test -f "/System/Library/Frameworks/vecLib.framework/Headers/cblas.h"])
+AM_CONDITIONAL([USE_BLAS_LINUX], [test x$blas = xtrue && USE_BLAS_MAC = false])
 
 # Checks for programs.
 AC_PROG_CXX
diff --git a/cpp/Makefile.am b/cpp/Makefile.am
index 94ced7c8f..c82d652dd 100644
--- a/cpp/Makefile.am
+++ b/cpp/Makefile.am
@@ -294,13 +294,20 @@ AM_CXXFLAGS += -I..
 AM_LDFLAGS = -L../CppUnitLite -lCppUnitLite $(BOOST_LDFLAGS) $(boost_serialization) #-L. -lgtsam
 
 # adding cblas implementation with atlas
-if USE_BLAS
+if USE_BLAS_LINUX
 AM_CXXFLAGS += -DCBLAS 
 libgtsam_la_CPPFLAGS += -DCBLAS
 AM_LDFLAGS += $(BLAS_LIBS) $(LIBS) $(FLIBS) # -lcblas -latlas 
 libgtsam_la_LDFLAGS += $(BLAS_LIBS) $(LIBS) $(FLIBS) # -lcblas -latlas
 endif
 
+if USE_BLAS_MACOS
+AM_CXXFLAGS += -DYA_BLAS -DYA_LAPACK -DYA_BLASMULT -I/System/Library/Frameworks/vecLib.framework/Headers 
+libgtsam_la_CPPFLAGS += -DYA_BLAS -DYA_LAPACK -DYA_BLASMULT -I/System/Library/Frameworks/vecLib.framework/Headers 
+AM_LDFLAGS += -lcblas -latlas 
+libgtsam_la_LDFLAGS += -framework vecLib -lcblas -latlas
+endif
+
 
 TESTS = $(check_PROGRAMS)
 CXXLINK = $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \