From c2864f5f61e0a0a8534012937a21c3213513a929 Mon Sep 17 00:00:00 2001
From: Richard Roberts <richard.jw.roberts@gmail.com>
Date: Tue, 2 Nov 2010 22:59:43 +0000
Subject: [PATCH] Changed order of compiler include paths to prevent conflict
 with MacPorts lapack

---
 gtsam/base/Makefile.am | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/gtsam/base/Makefile.am b/gtsam/base/Makefile.am
index 48777a829..4ae23a523 100644
--- a/gtsam/base/Makefile.am
+++ b/gtsam/base/Makefile.am
@@ -50,18 +50,20 @@ base_HEADERS = $(headers)
 noinst_LTLIBRARIES = libbase.la
 libbase_la_SOURCES = $(sources)
 
-AM_CPPFLAGS = $(BOOST_CPPFLAGS) -I$(CCOLAMDInc) -I$(top_srcdir)
-AM_LDFLAGS = $(BOOST_LDFLAGS)
-
-if USE_BLAS
-AM_CPPFLAGS += -DGT_USE_CBLAS
-endif
+AM_CPPFLAGS =
 
 # On Mac, we compile using the BLAS/LAPACK headers in the Accelerate framework 
 if USE_ACCELERATE_MACOS
 AM_CPPFLAGS += -I/System/Library/Frameworks/vecLib.framework/Headers
 endif
 
+AM_CPPFLAGS += $(BOOST_CPPFLAGS) -I$(CCOLAMDInc) -I$(top_srcdir)
+AM_LDFLAGS = $(BOOST_LDFLAGS)
+
+if USE_BLAS
+AM_CPPFLAGS += -DGT_USE_CBLAS
+endif
+
 #----------------------------------------------------------------------------------------------------
 # rules to build local programs
 #----------------------------------------------------------------------------------------------------