From 2fdabd721e74c5b84df2558f7c2e9d0ae0ed0bb7 Mon Sep 17 00:00:00 2001
From: Chris Kleeschulte <chrisk@bitpay.com>
Date: Tue, 28 Jul 2015 10:51:39 -0400
Subject: [PATCH] Fixed the dependency on system-installed boost libs.

---
 bin/build-libbitcoind       | 16 ++++++++++------
 bin/config_options.sh       |  2 +-
 bin/config_options_debug.sh |  2 +-
 bin/config_options_test.sh  |  2 +-
 binding.gyp                 |  2 +-
 5 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/bin/build-libbitcoind b/bin/build-libbitcoind
index 4795013e..14b79850 100755
--- a/bin/build-libbitcoind
+++ b/bin/build-libbitcoind
@@ -1,10 +1,12 @@
 #!/bin/bash
 root_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/.."
-cd "${root_dir}"
 options=`cat ${root_dir}/bin/config_options.sh`
-
+depends_dir=$($root_dir/platform/os.sh depends_dir)
 os_dir=$(./platform/os.sh osdir)
 host=$(./platform/os.sh host)
+
+cd "${root_dir}"
+
 build_dependencies () {
   if [ -d "${btc_dir}" ]; then
     pushd "${btc_dir}"/depends
@@ -35,8 +37,6 @@ compare_patch () {
   matching_patch=`diff -w /tmp/tmp.patch "${root_dir}/etc/bitcoin.patch"` 
 }
 #set the LD_LIBRARY_PATH for the linux clients.
-export LD_LIBRARY_PATH="${root_dir}/libbitcoind/src/leveldb":"${os_dir}":$LD_LIBRARY_PATH
-
 debug=
 if [ "${BITCOINDJS_ENV}" == "debug" ]; then
   options=`cat ${root_dir}/bin/config_options_debug.sh`
@@ -104,10 +104,14 @@ fi
 build_dependencies
 echo './autogen.sh'
 ./autogen.sh
-export CPPFLAGS="-I${btc_dir}/depends/${host}/include/boost -I${btc_dir}/depends/${host}/include -L${btc_dir}/depends/${host}/lib"
-full_options="${options}${os_dir}"
+
+export CPPFLAGS="-I${depends_dir}/include/boost -I${depends_dir}/include -L${depends_dir}/lib"
+boost_libdir="--with-boost-libdir=${depends_dir}/lib"
+
+full_options="${options} ${boost_libdir} --prefix=${os_dir}"
 echo "running the configure script with the following options:\n :::[\"${full_options}\"]:::"
 ${full_options}
+
 echo 'make V=1'
 make V=1
 
diff --git a/bin/config_options.sh b/bin/config_options.sh
index 248bcb6a..d51d99a0 100644
--- a/bin/config_options.sh
+++ b/bin/config_options.sh
@@ -1,2 +1,2 @@
-./configure --enable-tests=no --enable-daemonlib --with-gui=no --without-qt --without-miniupnpc --without-bdb --disable-wallet --without-utils --prefix=
+./configure --enable-tests=no --enable-daemonlib --with-gui=no --without-qt --without-miniupnpc --without-bdb --disable-wallet --without-utils
 
diff --git a/bin/config_options_debug.sh b/bin/config_options_debug.sh
index afacbc9f..fb5845e0 100644
--- a/bin/config_options_debug.sh
+++ b/bin/config_options_debug.sh
@@ -1,2 +1,2 @@
-./configure --enable-debug --enable-tests=no --enable-daemonlib --with-gui=no --without-qt --without-miniupnpc --without-bdb --disable-wallet --without-utils --prefix=
+./configure --enable-debug --enable-tests=no --enable-daemonlib --with-gui=no --without-qt --without-miniupnpc --without-bdb --disable-wallet --without-utils
 
diff --git a/bin/config_options_test.sh b/bin/config_options_test.sh
index 225f7aa0..3ee83701 100644
--- a/bin/config_options_test.sh
+++ b/bin/config_options_test.sh
@@ -1,2 +1,2 @@
-./configure --enable-debug --enable-tests=no --enable-daemonlib --with-gui=no --without-qt --without-miniupnpc --prefix=
+./configure --enable-debug --enable-tests=no --enable-daemonlib --with-gui=no --without-qt --without-miniupnpc
 
diff --git a/binding.gyp b/binding.gyp
index 223d1e9c..5230924b 100755
--- a/binding.gyp
+++ b/binding.gyp
@@ -3,7 +3,7 @@
     'target_name': 'bitcoindjs',
     'include_dirs' : [
       '<!(node -e "require(\'nan\')")',
-      '<!(./platform/os.sh depends_dir)/include/boost',
+      '<!(./platform/os.sh depends_dir)/include',
       './libbitcoind/src/leveldb/include',
       './libbitcoind/src',
     ],