diff --git a/Makefile.am b/Makefile.am
index 12259909b..34d3dc6fb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -30,7 +30,7 @@ endif
 lib_LTLIBRARIES = libgtsam.la
 libgtsam_la_SOURCES = 
 nodist_EXTRA_libgtsam_la_SOURCES = dummy.cxx
-libgtsam_la_LIBADD = $(SUBLIBS) -L$(CCOLAMDLib) -lccolamd
+libgtsam_la_LIBADD = $(SUBLIBS) -L$(CCOLAMDLib) $(BOOST_LDFLAGS) -lccolamd
 libgtsam_la_LDFLAGS = -no-undefined -version-info 0:0:0
 
 if USE_ACCELERATE_MACOS
diff --git a/base/Makefile.am b/base/Makefile.am
index e5830c632..74fa59dfd 100644
--- a/base/Makefile.am
+++ b/base/Makefile.am
@@ -50,7 +50,8 @@ base_HEADERS = $(headers)
 noinst_LTLIBRARIES = libbase.la
 libbase_la_SOURCES = $(sources)
 
-AM_CPPFLAGS = -I$(CCOLAMDInc) -I$(DenseQRInc) -I$(top_srcdir)/..
+AM_CPPFLAGS = $(BOOST_CPPFLAGS) -I$(CCOLAMDInc) -I$(DenseQRInc) -I$(top_srcdir)/..
+AM_LDFLAGS = $(BOOST_LDFLAGS)
 
 if USE_BLAS
 AM_CPPFLAGS += -DGT_USE_CBLAS
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 359cc0822..67c3443eb 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -20,7 +20,8 @@ noinst_PROGRAMS += Pose2SLAMwSPCG      # Solves a simple SLAM example with SPCG
 #----------------------------------------------------------------------------------------------------
 # rules to build local programs
 #----------------------------------------------------------------------------------------------------
-AM_CPPFLAGS = -I$(CCOLAMDInc) -I$(top_srcdir)/..
+AM_CPPFLAGS = $(BOOST_CPPFLAGS) -I$(CCOLAMDInc) -I$(top_srcdir)/..
+AM_LDFLAGS = $(BOOST_LDFLAGS)
 LDADD = ../libgtsam.la
 AM_DEFAULT_SOURCE_EXT = .cpp
 
diff --git a/geometry/Makefile.am b/geometry/Makefile.am
index fe4211333..32c24204f 100644
--- a/geometry/Makefile.am
+++ b/geometry/Makefile.am
@@ -41,13 +41,14 @@ geometrydir = $(pkgincludedir)/geometry
 geometry_HEADERS = $(headers)
 noinst_LTLIBRARIES = libgeometry.la
 libgeometry_la_SOURCES = $(sources)
-AM_CPPFLAGS = -I$(top_srcdir)/..
+AM_CPPFLAGS = $(BOOST_CPPFLAGS) -I$(top_srcdir)/..
+AM_LDFLAGS = $(BOOST_LDFLAGS)
 
 #----------------------------------------------------------------------------------------------------
 # rules to build local programs
 #----------------------------------------------------------------------------------------------------
 TESTS = $(check_PROGRAMS)
-AM_LDFLAGS = $(boost_serialization) 
+AM_LDFLAGS += $(boost_serialization) 
 LDADD = libgeometry.la ../base/libbase.la ../CppUnitLite/libCppUnitLite.a
 AM_DEFAULT_SOURCE_EXT = .cpp
 
diff --git a/inference/Makefile.am b/inference/Makefile.am
index c7f08255f..e20555ab4 100644
--- a/inference/Makefile.am
+++ b/inference/Makefile.am
@@ -63,14 +63,15 @@ inferencedir = $(pkgincludedir)/inference
 inference_HEADERS = $(headers)
 noinst_LTLIBRARIES = libinference.la
 libinference_la_SOURCES = $(sources)
-AM_CPPFLAGS = -I$(CCOLAMDInc) -I$(top_srcdir)/..
+AM_CPPFLAGS = $(BOOST_CPPFLAGS) -I$(CCOLAMDInc) -I$(top_srcdir)/..
+AM_LDFLAGS = $(BOOST_LDFLAGS)
 AM_CXXFLAGS =
 
 #----------------------------------------------------------------------------------------------------
 # rules to build local programs
 #----------------------------------------------------------------------------------------------------
 TESTS = $(check_PROGRAMS)
-AM_LDFLAGS = $(boost_serialization)
+AM_LDFLAGS += $(boost_serialization)
 LDADD = libinference.la ../base/libbase.la
 LDADD += ../CppUnitLite/libCppUnitLite.a
 AM_DEFAULT_SOURCE_EXT = .cpp
diff --git a/linear/Makefile.am b/linear/Makefile.am
index 8512567a8..59030014b 100644
--- a/linear/Makefile.am
+++ b/linear/Makefile.am
@@ -51,14 +51,15 @@ lineardir = $(pkgincludedir)/linear
 linear_HEADERS = $(headers)
 noinst_LTLIBRARIES = liblinear.la
 liblinear_la_SOURCES = $(sources)
-AM_CPPFLAGS = -I$(CCOLAMDInc) -I$(DenseQRInc) -I$(top_srcdir)/..
+AM_CPPFLAGS = $(BOOST_CPPFLAGS) -I$(CCOLAMDInc) -I$(DenseQRInc) -I$(top_srcdir)/..
+AM_LDFLAGS = $(BOOST_LDFLAGS)
 AM_CXXFLAGS =
 
 #----------------------------------------------------------------------------------------------------
 # rules to build local programs
 #----------------------------------------------------------------------------------------------------
 TESTS = $(check_PROGRAMS)
-AM_LDFLAGS = $(boost_serialization)
+AM_LDFLAGS += $(boost_serialization)
 LDADD = liblinear.la ../inference/libinference.la ../base/libbase.la
 LDADD += ../CppUnitLite/libCppUnitLite.a
 AM_DEFAULT_SOURCE_EXT = .cpp
diff --git a/myconfigure b/myconfigure
index d26570a71..9612c7752 100755
--- a/myconfigure
+++ b/myconfigure
@@ -1,4 +1,4 @@
-../configure --prefix=$HOME/workspace/gtsam2 --with-toolbox=$HOME/workspace/gtsam2/toolbox/ --with-boost=/opt/local/include/ CPP="/opt/local/bin/cpp-mp-4.5" CC="/opt/local/bin/gcc-mp-4.5" CXX="/usr/local/bin/gfilt" CPPFLAGS="-fno-inline -g -Wall -D_GLIBCXX_DEBUG" LDFLAGS="-fno-inline -g -Wall" --disable-static --enable-blas --enable-lapack --disable-fast-install
+../configure --prefix=$HOME --with-toolbox=$HOME/toolbox/ CPPFLAGS="-fno-inline -g -Wall" LDFLAGS="-fno-inline -g -Wall" --disable-static --enable-blas --enable-lapack --disable-fast-install
 #../configure --prefix=$HOME/borg-simplelinear --with-toolbox=$HOME/toolbox/ --with-boost=/opt/local/include/ CPP="/opt/local/bin/cpp-mp-4.5" CC="/opt/local/bin/gcc-mp-4.5" CXX="/usr/local/bin/gfilt" CXXFLAGS="-fno-inline -g -Wall -D_GLIBCXX_DEBUG -DNDEBUG" CFLAGS="-fno-inline -g -Wall -D_GLIBCXX_DEBUG -DNDEBUG" LDFLAGS="-fno-inline -g -Wall" --disable-static --enable-blas --enable-lapack --disable-fast-install
 #cd build && ../configure --prefix=$HOME/borg-simplelinear --with-toolbox=$HOME/toolbox/ --with-boost=/opt/local/include/ CXXFLAGS="-fno-inline -g -DNDEBUG -O3" CFLAGS="-fno-inline -g -DNDEBUG -O3" LDFLAGS="-fno-inline -g -DNDEBUG -O3" --disable-static --enable-blas --enable-lapack
 #cd build && ../configure --prefix=$HOME/borg-simplelinear --with-toolbox=$HOME/toolbox/ --with-boost=/opt/local/include/ CXXFLAGS="-DNDEBUG -O3" CFLAGS="-g -DNDEBUG -O3" LDFLAGS="-DNDEBUG -O3" --disable-static --enable-blas --enable-lapack
diff --git a/nonlinear/Makefile.am b/nonlinear/Makefile.am
index 3d9d58c1d..980d2bdbf 100644
--- a/nonlinear/Makefile.am
+++ b/nonlinear/Makefile.am
@@ -38,14 +38,15 @@ nonlineardir = $(pkgincludedir)/nonlinear
 nonlinear_HEADERS = $(headers)
 noinst_LTLIBRARIES = libnonlinear.la
 libnonlinear_la_SOURCES = $(sources)
-AM_CPPFLAGS = -I$(CCOLAMDInc) -I$(top_srcdir)/..
+AM_CPPFLAGS = $(BOOST_CPPFLAGS) -I$(CCOLAMDInc) -I$(top_srcdir)/..
+AM_LDFLAGS = $(BOOST_LDFLAGS)
 AM_CXXFLAGS =
 
 #----------------------------------------------------------------------------------------------------
 # rules to build local programs
 #----------------------------------------------------------------------------------------------------
 TESTS = $(check_PROGRAMS)
-AM_LDFLAGS = $(boost_serialization)
+AM_LDFLAGS += $(boost_serialization)
 LDADD = libnonlinear.la ../linear/liblinear.la ../inference/libinference.la ../base/libbase.la
 LDADD += ../CppUnitLite/libCppUnitLite.a
 AM_DEFAULT_SOURCE_EXT = .cpp
diff --git a/slam/Makefile.am b/slam/Makefile.am
index 9f8236254..7de50db6c 100644
--- a/slam/Makefile.am
+++ b/slam/Makefile.am
@@ -59,14 +59,15 @@ slamdir = $(pkgincludedir)/slam
 slam_HEADERS = $(headers)
 noinst_LTLIBRARIES = libslam.la
 libslam_la_SOURCES = $(sources)
-AM_CPPFLAGS = -I$(CCOLAMDInc) -I$(top_srcdir)/..
+AM_CPPFLAGS = $(BOOST_CPPFLAGS) -I$(CCOLAMDInc) -I$(top_srcdir)/..
+AM_LDFLAGS = $(BOOST_LDFLAGS)
 
 #----------------------------------------------------------------------------------------------------
 # rules to build local programs
 #----------------------------------------------------------------------------------------------------
 TESTS = $(check_PROGRAMS)
 AM_DEFAULT_SOURCE_EXT = .cpp
-AM_LDFLAGS = $(boost_serialization) -L$(CCOLAMDLib) -lccolamd
+AM_LDFLAGS += $(boost_serialization) -L$(CCOLAMDLib) -lccolamd
 LDADD = libslam.la ../geometry/libgeometry.la  ../nonlinear/libnonlinear.la ../linear/liblinear.la ../inference/libinference.la ../base/libbase.la
 LDADD += ../CppUnitLite/libCppUnitLite.a
 
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 8c2dae5d7..1fb67ac46 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -32,8 +32,8 @@ noinst_PROGRAMS = timeGaussianFactorGraph timeLinearOnDataset
 # rules to build unit tests
 #----------------------------------------------------------------------------------------------------
 TESTS = $(check_PROGRAMS)
-AM_LDFLAGS =
-AM_CPPFLAGS = -I$(CCOLAMDInc) -I$(top_srcdir)/..
+AM_LDFLAGS = $(BOOST_LDFLAGS)
+AM_CPPFLAGS = $(BOOST_CPPFLAGS) -I$(CCOLAMDInc) -I$(top_srcdir)/..
 
 if USE_ACCELERATE_MACOS
 AM_LDFLAGS += -Wl,/System/Library/Frameworks/Accelerate.framework/Accelerate
diff --git a/wrap/Makefile.am b/wrap/Makefile.am
index 8cd6ef967..657ee7008 100644
--- a/wrap/Makefile.am
+++ b/wrap/Makefile.am
@@ -18,9 +18,9 @@ noinst_HEADERS = geometry.h utilities.h Argument.h Constructor.h Method.h Class.
 
 noinst_PROGRAMS = wrap
 wrap_SOURCES = ${common} wrap.cpp
-AM_CPPFLAGS = -I$(top_srcdir)/.. -DTOPSRCDIR="\"$(top_srcdir)\""
+AM_CPPFLAGS = $(BOOST_CPPFLAGS) -I$(top_srcdir)/.. -DTOPSRCDIR="\"$(top_srcdir)\""
 AM_CXXFLAGS = -MMD
-AM_LDFLAGS = -L../CppUnitLite -lCppUnitLite
+AM_LDFLAGS = $(BOOST_LDFLAGS) -L../CppUnitLite -lCppUnitLite
 
 TESTS = $(check_PROGRAMS)