From 1b17dde9d17e4ba9a3bfa529f3237af50d8f7606 Mon Sep 17 00:00:00 2001
From: evoskuil <eric@voskuil.org>
Date: Fri, 1 Apr 2016 19:29:07 -0700
Subject: [PATCH 1/3] Installer fixes and updates.

---
 .travis.yml                       |   9 +-
 configure.ac                      |   6 +-
 install.sh                        | 678 +++++++++++++++++-------------
 libbitcoin_network_test_runner.sh |   2 +-
 4 files changed, 387 insertions(+), 308 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8aa0167e9..e44e1d32b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -58,17 +58,14 @@ install:
     - if [[ $LINUX && $CLANG ]]; then sudo update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-3.4 50; fi
     - if [[ $LINUX && $CLANG ]]; then sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-3.4 50; fi
 
-    # Download and install packages for linux/clang/dynamic.
-    - if [[ $LINUX && $CLANG && $DYNAMIC ]]; then sudo apt-get -qq install boost1.54; fi
-
 script:
 
     # Download and build libbitcoin-network and all dependencies.
     - if [[ $OSX   && $CLANG && $STATIC  ]]; then ./install.sh --disable-shared --build-boost --prefix=$TRAVIS_BUILD_DIR/my-prefix; fi
-    - if [[ $LINUX && $CLANG && $STATIC  ]]; then ./install.sh --disable-shared --build-boost --prefix=$TRAVIS_BUILD_DIR/my-prefix CFLAGS='-Os' LDLIBS='-lstdc++' CXXFLAGS='-Os -stdlib=libstdc++'; fi
-    - if [[ $LINUX && $GCC   && $STATIC  ]]; then ./install.sh --build-boost --disable-shared --build-dir=my-build --prefix=$TRAVIS_BUILD_DIR/my-prefix CFLAGS='-O0 -g -static --coverage' CXXFLAGS='-O0 -g -static --coverage'; fi
+    - if [[ $LINUX && $CLANG && $STATIC  ]]; then ./install.sh --disable-shared --build-boost --prefix=$TRAVIS_BUILD_DIR/my-prefix CFLAGS='-Os' CXXFLAGS='-Os'; fi
+    - if [[ $LINUX && $GCC   && $STATIC  ]]; then ./install.sh --build-boost --disable-shared --build-dir=my-build --prefix=$TRAVIS_BUILD_DIR/my-prefix CFLAGS='-O0 -g --coverage' CXXFLAGS='-O0 -g --coverage'; fi
     - if [[ $OSX   && $CLANG && $DYNAMIC ]]; then ./install.sh ; fi
-    - if [[ $LINUX && $CLANG && $DYNAMIC ]]; then sudo CXX=$CXX CC=$CC ./install.sh --disable-ndebug --disable-static CFLAGS='-Os' LDLIBS='-lstdc++' CXXFLAGS='-Os -stdlib=libstdc++'; fi
+    - if [[ $LINUX && $CLANG && $DYNAMIC ]]; then sudo CXX=$CXX CC=$CC ./install.sh --disable-ndebug --disable-static CFLAGS='-Os' CXXFLAGS='-Os'; fi
     - if [[ $LINUX && $GCC   && $DYNAMIC ]]; then sudo CXX=$CXX CC=$CC ./install.sh --disable-static --build-boost CFLAGS='-Os -s' CXXFLAGS='-Os -s'; fi
 
 after_success:
diff --git a/configure.ac b/configure.ac
index bc5b4bac2..fc58163f6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -116,15 +116,15 @@ AS_CASE([${CC}], [*gcc*],
          AC_MSG_NOTICE([boost_LDFLAGS : ${boost_LDFLAGS}])],
         [AC_MSG_ERROR([Boost 1.55.0 or later is required but was not found.])])])
 
-# Require Boost of at least version 1.54.0 if in clang and output ${boost_CPPFLAGS/LDFLAGS}.
+# Require Boost of at least version 1.56.0 if in clang and output ${boost_CPPFLAGS/LDFLAGS}.
 #------------------------------------------------------------------------------
 AS_CASE([${CC}], [*clang*],
-    [AX_BOOST_BASE([1.54.0],
+    [AX_BOOST_BASE([1.56.0],
         [AC_SUBST([boost_CPPFLAGS], [${BOOST_CPPFLAGS}])
          AC_SUBST([boost_LDFLAGS], [${BOOST_LDFLAGS}])
          AC_MSG_NOTICE([boost_CPPFLAGS : ${boost_CPPFLAGS}])
          AC_MSG_NOTICE([boost_LDFLAGS : ${boost_LDFLAGS}])],
-        [AC_MSG_ERROR([Boost 1.54.0 or later is required but was not found.])])])
+        [AC_MSG_ERROR([Boost 1.56.0 or later is required but was not found.])])])
 
 AS_CASE([${with_tests}], [yes],
     [AX_BOOST_UNIT_TEST_FRAMEWORK
diff --git a/install.sh b/install.sh
index 26fe73aae..d0c619176 100755
--- a/install.sh
+++ b/install.sh
@@ -24,31 +24,16 @@
 # Depending on the caller's permission to the --prefix or --build-dir
 # directory, the script may need to be sudo'd.
 
-# Define common constants.
+# Define constants.
 #==============================================================================
 # The default build directory.
 #------------------------------------------------------------------------------
 BUILD_DIR="build-libbitcoin-network"
 
-# Boost archive for gcc.
+# Boost archive.
 #------------------------------------------------------------------------------
-BOOST_URL_GCC="http://github.com/libbitcoin/libbitcoin-build/blob/master/mirror/boost_1_55_0.tar.bz2?raw=true"
-BOOST_ARCHIVE_GCC="boost_1_55_0.tar.bz2"
-BOOST_STANDARD_GCC=\
-"threading=multi "\
-"variant=release "\
-"-d0 "\
-"-q"
-
-# Boost archive for clang.
-#------------------------------------------------------------------------------
-BOOST_URL_CLANG="http://github.com/libbitcoin/libbitcoin-build/blob/master/mirror/boost_1_54_0.tar.bz2?raw=true"
-BOOST_ARCHIVE_CLANG="boost_1_54_0.tar.bz2"
-BOOST_STANDARD_CLANG=\
-"threading=multi "\
-"variant=release "\
-"-d0 "\
-"-q"
+BOOST_URL="http://downloads.sourceforge.net/project/boost/boost/1.56.0/boost_1_56_0.tar.bz2"
+BOOST_ARCHIVE="boost_1_56_0.tar.bz2"
 
 
 # Initialize the build environment.
@@ -73,37 +58,27 @@ else
     echo "Unsupported system: $OS"
     exit 1
 fi
-echo "Make jobs: $PARALLEL"
-echo "Make for system: $OS"
 
 # Define operating system specific settings.
 #------------------------------------------------------------------------------
 if [[ $OS == Darwin ]]; then
-    # Always require clang, common lib linking will otherwise fail.
     export CC="clang"
     export CXX="clang++"
-    LIBC="libc++"
-
-    # Always initialize prefix on OSX so default is useful.
-    PREFIX="/usr/local"
+    STDLIB="c++"
 elif [[ $OS == OpenBSD ]]; then
     make() { gmake "$@"; }
     export CC="egcc"
     export CXX="eg++"
-    LIBC="libestdc++"
-else
-    LIBC="libstdc++"
+    STDLIB="estdc++"
+else # Linux
+    STDLIB="stdc++"
 fi
-echo "Make with cc: $CC"
-echo "Make with cxx: $CXX"
-echo "Make with stdlib: $LIBC"
 
-# Define compiler specific settings.
+# Link to appropriate standard library in non-default scnearios.
 #------------------------------------------------------------------------------
-COMPILER="GCC"
-if [[ $CXX == "clang++" ]]; then
-    BOOST_TOOLS="toolset=clang cxxflags=-stdlib=$LIBC linkflags=-stdlib=$LIBC"  
-    COMPILER="CLANG"
+if [[ ($OS == Linux && $CC == "clang") || ($OS == OpenBSD) ]]; then
+    export LDLIBS="-l$STDLIB $LDLIBS"
+    export CXXFLAGS="-stdlib=lib$STDLIB $CXXFLAGS"
 fi
 
 # Parse command line options that are handled by this script.
@@ -112,11 +87,12 @@ for OPTION in "$@"; do
     case $OPTION in
         # Custom build options (in the form of --build-<option>).
         (--build-icu)      BUILD_ICU="yes";;
+        (--build-zlib)     BUILD_ZLIB="yes";;
         (--build-png)      BUILD_PNG="yes";;
         (--build-qrencode) BUILD_QRENCODE="yes";;
         (--build-boost)    BUILD_BOOST="yes";;
         (--build-dir=*)    BUILD_DIR="${OPTION#*=}";;
-        
+
         # Standard build options.
         (--prefix=*)       PREFIX="${OPTION#*=}";;
         (--disable-shared) DISABLE_SHARED="yes";;
@@ -126,183 +102,138 @@ for OPTION in "$@"; do
         (--with-qrencode)  WITH_QRENCODE="yes";;
     esac
 done
-echo "Build directory: $BUILD_DIR"
-echo "Prefix directory: $PREFIX"
 
-# Warn on configurations that imply static/prefix isolation.
+# Normalize of static and shared options.
 #------------------------------------------------------------------------------
-if [[ $BUILD_ICU == yes ]]; then
-    if [[ !($PREFIX)]]; then
-        echo "Warning: --prefix recommended when building ICU."
-    fi
-    if [[ !($DISABLE_SHARED) ]]; then
-        echo "Warning: --disable-shared recommended when building ICU."
-    fi
-fi
-if [[ $BUILD_QRENCODE == yes ]]; then
-    if [[ !($PREFIX)]]; then
-        echo "Warning: --prefix recommended when building QRENCODE."
-    fi
-    if [[ !($DISABLE_SHARED) ]]; then
-        echo "Warning: --disable-shared recommended when building QRENCODE."
-    fi
-fi
-if [[ $BUILD_PNG == yes ]]; then
-    if [[ !($PREFIX)]]; then
-        echo "Warning: --prefix recommended when building PNG."
-    fi
-    if [[ !($DISABLE_SHARED) ]]; then
-        echo "Warning: --disable-shared recommended when building PNG."
-    fi
-fi
-if [[ $BUILD_BOOST == yes ]]; then
-    if [[ !($PREFIX)]]; then    
-        echo "Warning: --prefix recommended when building boost."
-    fi
-    if [[ !($DISABLE_SHARED) ]]; then
-        echo "Warning: --disable-shared recommended when building boost."
-    fi
+if [[ $DISABLE_SHARED ]]; then
+    CONFIGURE_OPTIONS=("$@" "--enable-static")
+elif [[ $DISABLE_STATIC ]]; then
+    CONFIGURE_OPTIONS=("$@" "--enable-shared")
+else
+    CONFIGURE_OPTIONS=("$@" "--enable-shared")
+    CONFIGURE_OPTIONS=("$@" "--enable-static")
 fi
 
-# Purge custom options so they don't go to configure.
+# Purge custom build options so they don't break configure.
 #------------------------------------------------------------------------------
-CONFIGURE_OPTIONS=( "$@" )
-CUSTOM_OPTIONS=( "--build-icu" "--build-boost" "--build-png" "--build-qrencode" "--build-dir=$BUILD_DIR")
-for CUSTOM_OPTION in "${CUSTOM_OPTIONS[@]}"; do
-    CONFIGURE_OPTIONS=( "${CONFIGURE_OPTIONS[@]/$CUSTOM_OPTION}" )
-done
+CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/--build-*/}")
 
-# Set link variables.
+# Always set a prefix (required on OSX and for lib detection).
 #------------------------------------------------------------------------------
-if [[ $DISABLE_STATIC == yes ]]; then
-    BOOST_LINK="link=shared"
-    ICU_LINK="--enable-shared --disable-static"
-    PNG_LINK="--enable-shared --disable-static"
-    QRENCODE_LINK="--enable-shared --disable-static"
-elif [[ $DISABLE_SHARED == yes ]]; then
-    BOOST_LINK="link=static"
-    ICU_LINK="--disable-shared --enable-static"
-    PNG_LINK="--disable-shared --enable-static"
-    QRENCODE_LINK="--disable-shared --enable-static"
+if [[ !($PREFIX) ]]; then
+    PREFIX="/usr/local"
+    CONFIGURE_OPTIONS=( "${CONFIGURE_OPTIONS[@]}" "--prefix=$PREFIX")
 else
-    BOOST_LINK="link=static,shared"
-    ICU_LINK="--enable-shared --enable-static"
-    PNG_LINK="--enable-shared --enable-static"
-    QRENCODE_LINK="--enable-shared --enable-static"
+    # Incorporate the custom libdir into each object, for runtime resolution.
+    export LD_RUN_PATH="$PREFIX/lib"
 fi
 
 # Incorporate the prefix.
 #------------------------------------------------------------------------------
-if [[ $PREFIX ]]; then
-    # Set the prefix-based package config directory.
-    PREFIX_PKG_CONFIG_DIR="$PREFIX/lib/pkgconfig"
-
-    # Augment PKG_CONFIG_PATH search path with our prefix.
-    export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$PREFIX_PKG_CONFIG_DIR"
-    
-    # Set public prefix variable.
-    prefix="--prefix=$PREFIX"
-    
-    # Set a package config save path that can be passed via our builds.
-    with_pkgconfigdir="--with-pkgconfigdir=$PREFIX_PKG_CONFIG_DIR"
-    
-    if [[ $BUILD_BOOST ]]; then
-        # Boost has no pkg-config, m4 searches in the following order:
-        # --with-boost=<path>, /usr, /usr/local, /opt, /opt/local, $BOOST_ROOT.
-        # We use --with-boost to prioritize the --prefix path when we build it.
-        # Otherwise standard paths suffice for Linux, Homebrew and MacPorts.
-        with_boost="--with-boost=$PREFIX" 
-    fi
+# Set the prefix-based package config directory.
+PREFIX_PKG_CONFIG_DIR="$PREFIX/lib/pkgconfig"
+
+# Augment PKG_CONFIG_PATH search path with our prefix.
+export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$PREFIX_PKG_CONFIG_DIR"
+
+# Set a package config save path that can be passed via our builds.
+with_pkgconfigdir="--with-pkgconfigdir=$PREFIX_PKG_CONFIG_DIR"
+
+if [[ $BUILD_BOOST ]]; then
+    # Boost has no pkg-config, m4 searches in the following order:
+    # --with-boost=<path>, /usr, /usr/local, /opt, /opt/local, $BOOST_ROOT.
+    # We use --with-boost to prioritize the --prefix path when we build it.
+    # Otherwise standard paths suffice for Linux, Homebrew and MacPorts.
+    # ax_boost_base.m4 appends /include and adds to BOOST_CPPFLAGS
+    # ax_boost_base.m4 searches for /lib /lib64 and adds to BOOST_LDFLAGS
+    with_boost="--with-boost=$PREFIX"
 fi
 
-# Echo published dynamic build options.
+# Echo generated values.
 #------------------------------------------------------------------------------
-echo "  prefix: ${prefix}"
-echo "  with_boost: ${with_boost}"
-echo "  with_pkgconfigdir: ${with_pkgconfigdir}"
+echo "Libbitcoin installer configuration."
+echo "--------------------------------------------------------------------"
+echo "OS                    : $OS"
+echo "PARALLEL              : $PARALLEL"
+echo "CC                    : $CC"
+echo "CXX                   : $CXX"
+echo "CPPFLAGS              : $CPPFLAGS"
+echo "CFLAGS                : $CFLAGS"
+echo "CXXFLAGS              : $CXXFLAGS"
+echo "LDFLAGS               : $LDFLAGS"
+echo "LDLIBS                : $LDLIBS"
+echo "WITH_ICU              : $WITH_ICU"
+echo "WITH_PNG              : $WITH_PNG"
+echo "WITH_QRENCODE         : $WITH_QRENCODE"
+echo "BUILD_ICU             : $BUILD_ICU"
+echo "BUILD_ZLIB            : $BUILD_ZLIB"
+echo "BUILD_PNG             : $BUILD_PNG"
+echo "BUILD_QRENCODE        : $BUILD_QRENCODE"
+echo "BUILD_BOOST           : $BUILD_BOOST"
+echo "PREFIX                : $PREFIX"
+echo "BUILD_DIR             : $BUILD_DIR"
+echo "DISABLE_SHARED        : $DISABLE_SHARED"
+echo "DISABLE_STATIC        : $DISABLE_STATIC"
+echo "with_boost            : ${with_boost}"
+echo "with_pkgconfigdir     : ${with_pkgconfigdir}"
+echo "--------------------------------------------------------------------"
 
 
 # Define build options.
 #==============================================================================
-# Define boost options for gcc.
+# Define boost options.
 #------------------------------------------------------------------------------
-BOOST_OPTIONS_GCC=\
-"--with-chrono "\
-"--with-date_time "\
-"--with-filesystem "\
-"--with-iostreams "\
-"--with-locale "\
-"--with-program_options "\
-"--with-regex "\
-"--with-system "\
-"--with-thread "\
-"--with-test "
-
-# Define boost options for clang.
-#------------------------------------------------------------------------------
-BOOST_OPTIONS_CLANG=\
-"--with-chrono "\
-"--with-date_time "\
-"--with-filesystem "\
-"--with-iostreams "\
-"--with-locale "\
-"--with-program_options "\
-"--with-regex "\
-"--with-system "\
-"--with-thread "\
-"--with-test "
+BOOST_OPTIONS=(
+"--with-chrono" \
+"--with-date_time" \
+"--with-filesystem" \
+"--with-iostreams" \
+"--with-locale" \
+"--with-program_options" \
+"--with-regex" \
+"--with-system" \
+"--with-thread" \
+"--with-test")
 
 # Define secp256k1 options.
 #------------------------------------------------------------------------------
-SECP256K1_OPTIONS=\
-"--disable-tests "\
-"--enable-module-recovery "
+SECP256K1_OPTIONS=(
+"--disable-tests" \
+"--enable-module-recovery")
 
 # Define bitcoin options.
 #------------------------------------------------------------------------------
-BITCOIN_OPTIONS=\
-"--without-tests "\
-"--without-examples "\
-"${with_boost} "\
-"${with_pkgconfigdir} "
+BITCOIN_OPTIONS=(
+"--without-tests" \
+"--without-examples" \
+"${with_boost}" \
+"${with_pkgconfigdir}")
 
 # Define bitcoin-network options.
 #------------------------------------------------------------------------------
-BITCOIN_NETWORK_OPTIONS=\
-"${with_boost} "\
-"${with_pkgconfigdir} "
+BITCOIN_NETWORK_OPTIONS=(
+"${with_boost}" \
+"${with_pkgconfigdir}")
 
 
 # Define utility functions.
 #==============================================================================
-circumvent_boost_icu_detection()
-{
-    # Boost expects a directory structure for ICU which is incorrect.
-    # Boost ICU discovery fails when using prefix, can't fix with -sICU_LINK,
-    # so we rewrite the two 'has_icu_test.cpp' files to always return success.
-    
-    if [[ $WITH_ICU ]]; then
-        local SUCCESS="int main() { return 0; }"
-        local REGEX_TEST="libs/regex/build/has_icu_test.cpp"
-        local LOCALE_TEST="libs/locale/build/has_icu_test.cpp"
-        
-        echo $SUCCESS > $REGEX_TEST
-        echo $SUCCESS > $LOCALE_TEST
-
-        echo "hack: ICU detection modified, will always indicate found."
-    fi
-}
-
 configure_options()
 {
-    echo "configure: $@"
+    echo "configure options:"
+    for OPTION in "$@"; do
+        if [[ $OPTION ]]; then
+            echo $OPTION
+        fi
+    done
+
     ./configure "$@"
 }
 
 configure_links()
 {
-    # Configure dynamic linker run-time bindings.
-    if [[ ($OS == Linux) && !($PREFIX) ]]; then
+    # Configure dynamic linker run-time bindings when installing to system.
+    if [[ ($OS == Linux) && ($PREFIX == "/usr/local") ]]; then
         ldconfig
     fi
 }
@@ -317,7 +248,8 @@ create_directory()
 
 display_message()
 {
-    MESSAGE="$1"
+    local MESSAGE="$1"
+
     echo
     echo "********************** $MESSAGE **********************"
     echo
@@ -330,58 +262,7 @@ initialize_git()
     git config user.name anonymous
 }
 
-initialize_boost_icu()
-{
-    if [[ $WITH_ICU ]]; then
-        # Restrict other local options when compiling boost with icu.
-        BOOST_ICU_ONLY="boost.locale.iconv=off boost.locale.posix=off"
-        
-        # Extract ICU prefix directory from package config variable.
-        local ICU_PREFIX=`pkg-config icu-i18n --variable=prefix`
-        BOOST_ICU_PATH="-sICU_PATH=$ICU_PREFIX"
-        BOOTSTRAP_WITH_ICU="--with-icu=$ICU_PREFIX"
-
-        # Extract ICU libs from package config variables and augment with -ldl.
-        local ICU_LIBS="`pkg-config icu-i18n --libs` -ldl"
-        BOOST_ICU_LINK="-sICU_LINK=$ICU_LIBS"
-    fi
-}
-
-initialize_icu_packages()
-{
-    if [[ ($OS == Darwin) && !($BUILD_ICU) ]]; then
-        # Update PKG_CONFIG_PATH for ICU package installations on OSX.
-        # OSX provides libicucore.dylib with no pkgconfig and doesn't support
-        # renaming or important features, so we can't use that.
-        HOMEBREW_ICU_PKG_CONFIG="/usr/local/opt/icu4c/lib/pkgconfig"
-        MACPORTS_ICU_PKG_CONFIG="/opt/local/lib/pkgconfig"
-        
-        if [[ -d "$HOMEBREW_ICU_PKG_CONFIG" ]]; then
-            export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$HOMEBREW_ICU_PKG_CONFIG"
-        elif [[ -d "$MACPORTS_ICU_PKG_CONFIG" ]]; then
-            export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$MACPORTS_ICU_PKG_CONFIG"
-        fi
-    fi
-}
-
-initialize_options()
-{
-    if [[ !($BOOST_OPTIONS) ]]; then
-        # Select compiler-conditional generated configuration parameters.
-        if [[ $COMPILER == CLANG ]]; then
-            BOOST_URL=$BOOST_URL_CLANG
-            BOOST_ARCHIVE=$BOOST_ARCHIVE_CLANG
-            BOOST_STANDARD=$BOOST_STANDARD_CLANG
-            BOOST_OPTIONS=$BOOST_OPTIONS_CLANG
-        else
-            BOOST_URL=$BOOST_URL_GCC
-            BOOST_ARCHIVE=$BOOST_ARCHIVE_GCC
-            BOOST_STANDARD=$BOOST_STANDARD_GCC
-            BOOST_OPTIONS=$BOOST_OPTIONS_GCC
-        fi
-    fi
-}
-
+# make_current_directory jobs [configure_options]
 make_current_directory()
 {
     local JOBS=$1
@@ -394,35 +275,44 @@ make_current_directory()
     configure_links
 }
 
+# make_jobs jobs [make_options]
 make_jobs()
 {
     local JOBS=$1
-    local TARGET=$2
+    shift 1
 
     # Avoid setting -j1 (causes problems on Travis).
     if [[ $JOBS > $SEQUENTIAL ]]; then
-        make -j$JOBS $TARGET
+        make -j$JOBS "$@"
     else
-        make $TARGET
+        make "$@"
     fi
 }
 
+# make_tests jobs
 make_tests()
 {
     local JOBS=$1
 
+    # Disable exit on error.
+    set +e
+
     # Build and run unit tests relative to the primary directory.
-    # VERBOSE=1 ensures test-suite.log output sent to console (gcc).
-    if ! make_jobs $JOBS check VERBOSE=1; then
-        if [ -e "test-suite.log" ]; then
-            echo "<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<"
-            echo "cat test-suite.log"
-            echo "------------------------------"
-            cat "test-suite.log"
-            echo ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>"
-        fi
-        exit 1
+    # VERBOSE=1 ensures test runner output sent to console (gcc).
+    make_jobs $JOBS check "VERBOSE=1"
+    local RESULT=$?
+
+    # Test runners emit to the test.log file.
+    if [[ -e "test.log" ]]; then
+        cat "test.log"
     fi
+
+    if [[ $RESULT -ne 0 ]]; then
+        exit $RESULT
+    fi
+
+    # Reenable exit on error.
+    set -e
 }
 
 pop_directory()
@@ -433,140 +323,333 @@ pop_directory()
 push_directory()
 {
     local DIRECTORY="$1"
-    
+
     pushd "$DIRECTORY" >/dev/null
 }
 
 
-# Build functions.
+# Define build functions.
 #==============================================================================
+
+# Because PKG_CONFIG_PATH doesn't get updated by Homebrew or MacPorts.
+initialize_icu_packages()
+{
+    if [[ ($OS == Darwin) ]]; then
+        # Update PKG_CONFIG_PATH for ICU package installations on OSX.
+        # OSX provides libicucore.dylib with no pkgconfig and doesn't support
+        # renaming or important features, so we can't use that.
+        local HOMEBREW_ICU_PKG_CONFIG="/usr/local/opt/icu4c/lib/pkgconfig"
+        local MACPORTS_ICU_PKG_CONFIG="/opt/local/lib/pkgconfig"
+
+        if [[ -d "$HOMEBREW_ICU_PKG_CONFIG" ]]; then
+            export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$HOMEBREW_ICU_PKG_CONFIG"
+        elif [[ -d "$MACPORTS_ICU_PKG_CONFIG" ]]; then
+            export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$MACPORTS_ICU_PKG_CONFIG"
+        fi
+    fi
+}
+
+# Because ZLIB doesn't actually parse its --disable-shared option.
+# Because ZLIB doesn't follow GNU recommentation for unknown arguments.
+patch_zlib_configuration()
+{
+    sed -i.tmp "s/leave 1/shift/" configure
+    sed -i.tmp "s/--static/--static | --disable-shared/" configure
+    sed -i.tmp "/unknown option/d" configure
+    sed -i.tmp "/help for help/d" configure
+
+    # echo "Hack: ZLIB configuration options modified."
+}
+
+# Because ZLIB can't build shared only.
+clean_zlib_build()
+{
+    if [[ $DISABLE_STATIC ]]; then
+        rm --force "$PREFIX/lib/libz.a"
+    fi
+}
+
+# Standard build from tarball.
 build_from_tarball()
 {
     local URL=$1
     local ARCHIVE=$2
-    local ARCHIVE_TYPE=$3
-    local JOBS=$4
-    local PUSH_DIR=$5
-    local LINK=$6
-    local STANDARD=$7
+    local COMPRESSION=$3
+    local PUSH_DIR=$4
+    local JOBS=$5
+    local BUILD=$6
+    local OPTIONS=$7
     shift 7
 
-    display_message "Download $ARCHIVE"
+    # For some platforms we need to set ICU pkg-config path.
+    if [[ !($BUILD) ]]; then
+        if [[ $ARCHIVE == $ICU_ARCHIVE ]]; then
+            initialize_icu_packages
+        fi
+        return
+    fi
 
-    local EXTRACTED_DIR=`echo $ARCHIVE | sed "s/.tar.$ARCHIVE_TYPE//g"`
+    # Because libpng doesn't actually use pkg-config to locate zlib.
+    # Because ICU tools don't know how to locate internal dependencies.
+    if [[ ($ARCHIVE == $ICU_ARCHIVE) || ($ARCHIVE == $PNG_ARCHIVE) ]]; then
+        local SAVE_LDFLAGS=$LDFLAGS
+        export LDFLAGS="-L$PREFIX/lib $LDFLAGS"
+    fi
+
+    # Because libpng doesn't actually use pkg-config to locate zlib.h.
+    if [[ ($ARCHIVE == $PNG_ARCHIVE) ]]; then
+        local SAVE_CPPFLAGS=$CPPFLAGS
+        export CPPFLAGS="-I$PREFIX/include $CPPFLAGS"
+    fi
+
+    display_message "Download $ARCHIVE"
 
-    create_directory $EXTRACTED_DIR
-    push_directory $EXTRACTED_DIR
+    # Use the suffixed archive name as the extraction directory.
+    local EXTRACT="build-$ARCHIVE"
+    create_directory $EXTRACT
+    push_directory $EXTRACT
 
     # Extract the source locally.
     wget --output-document $ARCHIVE $URL
-    tar --extract --file $ARCHIVE --$ARCHIVE_TYPE --strip-components=1
+    tar --extract --file $ARCHIVE --$COMPRESSION --strip-components=1
     push_directory $PUSH_DIR
 
-    configure_options $LINK $STANDARD ${prefix} "$@"
+    # Enable static only zlib build.
+    if [[ $ARCHIVE == $ZLIB_ARCHIVE ]]; then
+        patch_zlib_configuration
+    fi
+
+    # Join generated and command line options.
+    local CONFIGURATION=("${OPTIONS[@]}" "$@")
+
+    configure_options "${CONFIGURATION[@]}"
     make_jobs $JOBS --silent
     make install
     configure_links
 
+    # Enable shared only zlib build.
+    if [[ $ARCHIVE == $ZLIB_ARCHIVE ]]; then
+        clean_zlib_build
+    fi
+
     pop_directory
     pop_directory
+
+    # Restore flags to prevent side effects.
+    export LDFLAGS=$SAVE_LDFLAGS
+    export CPPFLAGS=$SAVE_LCPPFLAGS
 }
 
+# Because boost ICU detection assumes in incorrect ICU path.
+circumvent_boost_icu_detection()
+{
+    # Boost expects a directory structure for ICU which is incorrect.
+    # Boost ICU discovery fails when using prefix, can't fix with -sICU_LINK,
+    # so we rewrite the two 'has_icu_test.cpp' files to always return success.
+
+    local SUCCESS="int main() { return 0; }"
+    local REGEX_TEST="libs/regex/build/has_icu_test.cpp"
+    local LOCALE_TEST="libs/locale/build/has_icu_test.cpp"
+
+    echo $SUCCESS > $REGEX_TEST
+    echo $SUCCESS > $LOCALE_TEST
+
+    # echo "Hack: ICU detection modified, will always indicate found."
+}
+
+# Because boost doesn't support autoconfig and doesn't like empty settings.
+initialize_boost_configuration()
+{
+    if [[ $DISABLE_STATIC ]]; then
+        BOOST_LINK="shared"
+    elif [[ $DISABLE_SHARED ]]; then
+        BOOST_LINK="static"
+    else
+        BOOST_LINK="static,shared"
+    fi
+
+    if [[ $CC ]]; then
+        BOOST_TOOLSET="toolset=$CC"
+    fi
+
+    if [[ ($OS == Linux && $CC == "clang") || ($OS == OpenBSD) ]]; then
+        STDLIB_FLAG="-stdlib=lib$STDLIB"
+        BOOST_CXXFLAGS="cxxflags=$STDLIB_FLAG"
+        BOOST_LINKFLAGS="linkflags=$STDLIB_FLAG"
+    fi
+}
+
+# Because boost doesn't use pkg-config.
+initialize_boost_icu_configuration()
+{
+    BOOST_ICU_ICONV="on"
+    BOOST_ICU_POSIX="on"
+
+    if [[ $WITH_ICU ]]; then
+        circumvent_boost_icu_detection
+
+        # Restrict other locale options when compiling boost with icu.
+        BOOST_ICU_ICONV="off"
+        BOOST_ICU_POSIX="off"
+
+        # Extract ICU libs from package config variables and augment with -ldl.
+        ICU_LIBS=( `pkg-config icu-i18n --libs` "-ldl" )
+
+        # This is a hack for boost m4 scripts that fail with ICU dependency.
+        # See custom edits in ax-boost-locale.m4 and ax_boost_regex.m4.
+        export BOOST_ICU_LIBS="${ICU_LIBS[@]}"
+
+        # Extract ICU prefix directory from package config variable.
+        ICU_PREFIX=`pkg-config icu-i18n --variable=prefix`
+    fi
+}
+
+# Because boost doesn't use autoconfig.
 build_from_tarball_boost()
 {
     local URL=$1
     local ARCHIVE=$2
-    local REPO=$3
-    local JOBS=$4
-    shift 4
+    local COMPRESSION=$3
+    local PUSH_DIR=$4
+    local JOBS=$5
+    local BUILD=$6
+    shift 6
 
-    if [[ !($BUILD_BOOST) ]]; then
-        display_message "Boost build not enabled"
+    if [[ !($BUILD) ]]; then
         return
     fi
-    
+
     display_message "Download $ARCHIVE"
 
-    create_directory $REPO
-    push_directory $REPO
+    # Use the suffixed archive name as the extraction directory.
+    local EXTRACT="build-$ARCHIVE"
+    create_directory $EXTRACT
+    push_directory $EXTRACT
 
     # Extract the source locally.
     wget --output-document $ARCHIVE $URL
-    tar --extract --file $ARCHIVE --bzip2 --strip-components=1
-    
-    # Circumvent Boost ICU detection bug.
-    circumvent_boost_icu_detection
-
-    initialize_boost_icu
-    
-    # Build and install.
-    BOOSTSTRAP_OPTIONS="${prefix} $BOOTSTRAP_WITH_ICU"
-    B2_OPTIONS="install --reconfigure -j $JOBS ${prefix} $BOOST_LINK $BOOST_TOOLS $BOOST_STANDARD $BOOST_ICU_PATH $BOOST_ICU_LINK $BOOST_ICU_ONLY $@"
-    
-    echo "bootstrap: $BOOSTSTRAP_OPTIONS"
-    echo "b2: $B2_OPTIONS"
-    echo
-    
-    ./bootstrap.sh $BOOSTSTRAP_OPTIONS
-    ./b2 $B2_OPTIONS
-    
-    # Boost has no pkg-config, m4 searches in the following order:
-    # --with-boost=<path>, /usr, /usr/local, /opt, /opt/local, $BOOST_ROOT.
-    # We use --with-boost to prioritize the --prefix path when we build it.
-    # Otherwise standard paths suffice for Linux, Homebrew and MacPorts.
-    with_boost="--with-boost=$PREFIX"
+    tar --extract --file $ARCHIVE --$COMPRESSION --strip-components=1
+
+    initialize_boost_configuration
+    initialize_boost_icu_configuration
+
+    echo "Libbitcoin boost configuration."
+    echo "--------------------------------------------------------------------"
+    echo "variant               : release"
+    echo "threading             : multi"
+    echo "toolset               : $CC"
+    echo "cxxflags              : $STDLIB_FLAG"
+    echo "linkflags             : $STDLIB_FLAG"
+    echo "link                  : $BOOST_LINK"
+    echo "boost.locale.iconv    : $BOOST_ICU_ICONV"
+    echo "boost.locale.posix    : $BOOST_ICU_POSIX"
+    echo "-sNO_BZIP2            : 1" 
+    echo "-sICU_PATH            : $ICU_PREFIX"
+    echo "-sICU_LINK            : ${ICU_LIBS[@]}"
+    echo "-sZLIB_LIBPATH        : $PREFIX/lib"
+    echo "-sZLIB_INCLUDE        : $PREFIX/include"
+    echo "-j                    : $JOBS"
+    echo "-d0                   : [supress informational messages]"
+    echo "-q                    : [stop at the first error]"
+    echo "--reconfigure         : [ignore cached configuration]"
+    echo "--prefix              : $PREFIX"
+    echo "BOOST_OPTIONS         : $@"
+    echo "--------------------------------------------------------------------"
+
+    # boost_iostreams
+    # The zlib options prevent boost linkage to system libs in the case where
+    # we have built zlib in a prefix dir. Disabling zlib in boost is broken in
+    # all versions (through 1.60). https://svn.boost.org/trac/boost/ticket/9156
+    # The bzip2 auto-detection is not implemented, but disabling it works.
+
+    ./bootstrap.sh \
+        "--prefix=$PREFIX" \
+        "--with-icu=$ICU_PREFIX"
+
+    ./b2 install \
+        "variant=release" \
+        "threading=multi" \
+        "$BOOST_TOOLSET" \
+        "$BOOST_CXXFLAGS" \
+        "$BOOST_LINKFLAGS" \
+        "link=$BOOST_LINK" \
+        "boost.locale.iconv=$BOOST_ICU_ICONV" \
+        "boost.locale.posix=$BOOST_ICU_POSIX" \
+        "-sNO_BZIP2=1" \
+        "-sICU_PATH=$ICU_PREFIX" \
+        "-sICU_LINK=${ICU_LIBS[@]}" \
+        "-sZLIB_LIBPATH=$PREFIX/lib" \
+        "-sZLIB_INCLUDE=$PREFIX/include" \
+        "-j $JOBS" \
+        "-d0" \
+        "-q" \
+        "--reconfigure" \
+        "--prefix=$PREFIX" \
+        "$@"
 
     pop_directory
 }
 
+# Standard build from github.
 build_from_github()
 {
     local ACCOUNT=$1
     local REPO=$2
     local BRANCH=$3
     local JOBS=$4
-    shift 4
+    local OPTIONS=$5
+    shift 5
 
     FORK="$ACCOUNT/$REPO"
     display_message "Download $FORK/$BRANCH"
-    
+
     # Clone the repository locally.
     git clone --branch $BRANCH --single-branch "https://github.com/$FORK"
 
+    # Join generated and command line options.
+    local CONFIGURATION=("${OPTIONS[@]}" "$@")
+
     # Build the local repository clone.
     push_directory $REPO
-    make_current_directory $JOBS "$@"
+    make_current_directory $JOBS "${CONFIGURATION[@]}"
     pop_directory
 }
 
+# Standard build of current directory.
 build_from_local()
 {
     local MESSAGE="$1"
     local JOBS=$2
-    shift 2
+    local OPTIONS=$3
+    shift 3
 
     display_message "$MESSAGE"
 
+    # Join generated and command line options.
+    local CONFIGURATION=("${OPTIONS[@]}" "$@")
+
     # Build the current directory.
-    make_current_directory $JOBS "$@"
+    make_current_directory $JOBS "${CONFIGURATION[@]}"
 }
 
+# Because Travis alread has downloaded the primary repo.
 build_from_travis()
 {
     local ACCOUNT=$1
     local REPO=$2
     local BRANCH=$3
     local JOBS=$4
-    shift 4
+    local OPTIONS=$5
+    shift 5
 
     # The primary build is not downloaded if we are running in Travis.
     if [[ $TRAVIS == true ]]; then
         push_directory ".."
-        build_from_local "Local $TRAVIS_REPO_SLUG" $JOBS "$@"
+        build_from_local "Local $TRAVIS_REPO_SLUG" $JOBS "${OPTIONS[@]}" "$@"
         make_tests $JOBS
         pop_directory
     else
-        build_from_github $ACCOUNT $REPO $BRANCH $JOBS "$@"
+        build_from_github $ACCOUNT $REPO $BRANCH $JOBS "${OPTIONS[@]}" "$@"
         push_directory $REPO
         make_tests $JOBS
         pop_directory
@@ -578,10 +661,10 @@ build_from_travis()
 #==============================================================================
 build_all()
 {
-    build_from_tarball_boost $BOOST_URL $BOOST_ARCHIVE boost $PARALLEL $BOOST_OPTIONS
-    build_from_github libbitcoin secp256k1 version4 $PARALLEL "$@" $SECP256K1_OPTIONS
-    build_from_github libbitcoin libbitcoin master $PARALLEL "$@" $BITCOIN_OPTIONS
-    build_from_travis libbitcoin libbitcoin-network master $PARALLEL "$@" $BITCOIN_NETWORK_OPTIONS
+    build_from_tarball_boost $BOOST_URL    $BOOST_ARCHIVE    bzip2 .      $PARALLEL  "$BUILD_BOOST"    "${BOOST_OPTIONS[@]}"
+    build_from_github libbitcoin secp256k1 version4 $PARALLEL ${SECP256K1_OPTIONS[@]} "$@"
+    build_from_github libbitcoin libbitcoin master $PARALLEL ${BITCOIN_OPTIONS[@]} "$@"
+    build_from_travis libbitcoin libbitcoin-network master $PARALLEL ${BITCOIN_NETWORK_OPTIONS[@]} "$@"
 }
 
 
@@ -590,6 +673,5 @@ build_all()
 create_directory "$BUILD_DIR"
 push_directory "$BUILD_DIR"
 initialize_git
-initialize_options
 time build_all "${CONFIGURE_OPTIONS[@]}"
 pop_directory
diff --git a/libbitcoin_network_test_runner.sh b/libbitcoin_network_test_runner.sh
index 4eba808a3..7fa518c18 100755
--- a/libbitcoin_network_test_runner.sh
+++ b/libbitcoin_network_test_runner.sh
@@ -18,4 +18,4 @@ BOOST_UNIT_TEST_OPTIONS=\
 
 # Run tests.
 #==============================================================================
-./test/libbitcoin_network_test ${BOOST_UNIT_TEST_OPTIONS}
+./test/libbitcoin_network_test ${BOOST_UNIT_TEST_OPTIONS} > test.log

From 27f64fe5b115b67b2d7e9f93104a96e0dafbd85c Mon Sep 17 00:00:00 2001
From: evoskuil <eric@voskuil.org>
Date: Fri, 1 Apr 2016 19:45:48 -0700
Subject: [PATCH 2/3] Remove dead code.

---
 m4/ax_boost_chrono.m4          | 118 --------------------------
 m4/ax_boost_date_time.m4       | 113 -------------------------
 m4/ax_boost_filesystem.m4      | 118 --------------------------
 m4/ax_boost_iostreams.m4       | 116 -------------------------
 m4/ax_boost_locale.m4          | 120 --------------------------
 m4/ax_boost_program_options.m4 | 108 ------------------------
 m4/ax_boost_regex.m4           | 111 ------------------------
 m4/ax_boost_system.m4          | 120 --------------------------
 m4/ax_boost_thread.m4          | 149 ---------------------------------
 9 files changed, 1073 deletions(-)
 delete mode 100644 m4/ax_boost_chrono.m4
 delete mode 100644 m4/ax_boost_date_time.m4
 delete mode 100644 m4/ax_boost_filesystem.m4
 delete mode 100644 m4/ax_boost_iostreams.m4
 delete mode 100644 m4/ax_boost_locale.m4
 delete mode 100644 m4/ax_boost_program_options.m4
 delete mode 100644 m4/ax_boost_regex.m4
 delete mode 100644 m4/ax_boost_system.m4
 delete mode 100644 m4/ax_boost_thread.m4

diff --git a/m4/ax_boost_chrono.m4 b/m4/ax_boost_chrono.m4
deleted file mode 100644
index 9b3958ec7..000000000
--- a/m4/ax_boost_chrono.m4
+++ /dev/null
@@ -1,118 +0,0 @@
-# ===========================================================================
-#      http://www.gnu.org/software/autoconf-archive/ax_boost_chrono.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_BOOST_CHRONO
-#
-# DESCRIPTION
-#
-#   Test for System library from the Boost C++ libraries. The macro requires
-#   a preceding call to AX_BOOST_BASE. Further documentation is available at
-#   <http://randspringer.de/boost/index.html>.
-#
-#   This macro calls:
-#
-#     AC_SUBST(BOOST_CHRONO_LIB)
-#
-#   And sets:
-#
-#     HAVE_BOOST_CHRONO
-#
-# LICENSE
-#
-#   Copyright (c) 2012 Xiyue Deng <manphiz@gmail.com>
-#
-#   Copying and distribution of this file, with or without modification, are
-#   permitted in any medium without royalty provided the copyright notice
-#   and this notice are preserved. This file is offered as-is, without any
-#   warranty.
-
-#serial 1
-
-AC_DEFUN([AX_BOOST_CHRONO],
-[
-	AC_ARG_WITH([boost-chrono],
-	AS_HELP_STRING([--with-boost-chrono@<:@=special-lib@:>@],
-                   [use the Chrono library from boost - it is possible to specify a certain library for the linker
-                        e.g. --with-boost-chrono=boost_chrono-gcc-mt ]),
-        [
-        if test "$withval" = "no"; then
-			want_boost="no"
-        elif test "$withval" = "yes"; then
-            want_boost="yes"
-            ax_boost_user_chrono_lib=""
-        else
-		    want_boost="yes"
-		ax_boost_user_chrono_lib="$withval"
-		fi
-        ],
-        [want_boost="yes"]
-	)
-
-	if test "x$want_boost" = "xyes"; then
-        AC_REQUIRE([AC_PROG_CC])
-        AC_REQUIRE([AC_CANONICAL_BUILD])
-		CPPFLAGS_SAVED="$CPPFLAGS"
-		CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
-		export CPPFLAGS
-
-		LDFLAGS_SAVED="$LDFLAGS"
-		LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
-		export LDFLAGS
-
-        AC_CACHE_CHECK(whether the Boost::Chrono library is available,
-					   ax_cv_boost_chrono,
-        [AC_LANG_PUSH([C++])
-			 CXXFLAGS_SAVE=$CXXFLAGS
-
-			 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@%:@include <boost/chrono.hpp>]],
-                                   [[boost::chrono::system_clock::time_point time;]])],
-                   ax_cv_boost_chrono=yes, ax_cv_boost_chrono=no)
-			 CXXFLAGS=$CXXFLAGS_SAVE
-             AC_LANG_POP([C++])
-		])
-		if test "x$ax_cv_boost_chrono" = "xyes"; then
-			AC_SUBST(BOOST_CPPFLAGS)
-
-			AC_DEFINE(HAVE_BOOST_CHRONO,,[define if the Boost::Chrono library is available])
-            BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'`
-
-			LDFLAGS_SAVE=$LDFLAGS
-            if test "x$ax_boost_user_chrono_lib" = "x"; then
-                for libextension in `ls $BOOSTLIBDIR/libboost_chrono*.so* $BOOSTLIBDIR/libboost_chrono*.dylib* $BOOSTLIBDIR/libboost_chrono*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_chrono.*\)\.so.*$;\1;' -e 's;^lib\(boost_chrono.*\)\.dylib.*$;\1;' -e 's;^lib\(boost_chrono.*\)\.a.*$;\1;'` ; do
-                     ax_lib=${libextension}
-				    AC_CHECK_LIB($ax_lib, exit,
-                                 [BOOST_CHRONO_LIB="-l$ax_lib"; AC_SUBST(BOOST_CHRONO_LIB) link_chrono="yes"; break],
-                                 [link_chrono="no"])
-				done
-                if test "x$link_chrono" != "xyes"; then
-                for libextension in `ls $BOOSTLIBDIR/boost_chrono*.dll* $BOOSTLIBDIR/boost_chrono*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_chrono.*\)\.dll.*$;\1;' -e 's;^\(boost_chrono.*\)\.a.*$;\1;'` ; do
-                     ax_lib=${libextension}
-				    AC_CHECK_LIB($ax_lib, exit,
-                                 [BOOST_CHRONO_LIB="-l$ax_lib"; AC_SUBST(BOOST_CHRONO_LIB) link_chrono="yes"; break],
-                                 [link_chrono="no"])
-				done
-                fi
-
-            else
-               for ax_lib in $ax_boost_user_chrono_lib boost_chrono-$ax_boost_user_chrono_lib; do
-				      AC_CHECK_LIB($ax_lib, exit,
-                                   [BOOST_CHRONO_LIB="-l$ax_lib"; AC_SUBST(BOOST_CHRONO_LIB) link_chrono="yes"; break],
-                                   [link_chrono="no"])
-                  done
-
-            fi
-            if test "x$ax_lib" = "x"; then
-                AC_MSG_ERROR(Could not find a version of the library!)
-            fi
-			if test "x$link_chrono" = "xno"; then
-				AC_MSG_ERROR(Could not link against $ax_lib !)
-			fi
-		fi
-
-		CPPFLAGS="$CPPFLAGS_SAVED"
-	LDFLAGS="$LDFLAGS_SAVED"
-	fi
-])
diff --git a/m4/ax_boost_date_time.m4 b/m4/ax_boost_date_time.m4
deleted file mode 100644
index ec9c0445a..000000000
--- a/m4/ax_boost_date_time.m4
+++ /dev/null
@@ -1,113 +0,0 @@
-# ===========================================================================
-#    http://www.gnu.org/software/autoconf-archive/ax_boost_date_time.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_BOOST_DATE_TIME
-#
-# DESCRIPTION
-#
-#   Test for Date_Time library from the Boost C++ libraries. The macro
-#   requires a preceding call to AX_BOOST_BASE. Further documentation is
-#   available at <http://randspringer.de/boost/index.html>.
-#
-#   This macro calls:
-#
-#     AC_SUBST(BOOST_DATE_TIME_LIB)
-#
-#   And sets:
-#
-#     HAVE_BOOST_DATE_TIME
-#
-# LICENSE
-#
-#   Copyright (c) 2008 Thomas Porschberg <thomas@randspringer.de>
-#   Copyright (c) 2008 Michael Tindal
-#
-#   Copying and distribution of this file, with or without modification, are
-#   permitted in any medium without royalty provided the copyright notice
-#   and this notice are preserved. This file is offered as-is, without any
-#   warranty.
-
-#serial 21
-
-AC_DEFUN([AX_BOOST_DATE_TIME],
-[
-	AC_ARG_WITH([boost-date-time],
-	AS_HELP_STRING([--with-boost-date-time@<:@=special-lib@:>@],
-                   [use the Date_Time library from boost - it is possible to specify a certain library for the linker
-                        e.g. --with-boost-date-time=boost_date_time-gcc-mt-d-1_33_1 ]),
-        [
-        if test "$withval" = "no"; then
-			want_boost="no"
-        elif test "$withval" = "yes"; then
-            want_boost="yes"
-            ax_boost_user_date_time_lib=""
-        else
-		    want_boost="yes"
-		ax_boost_user_date_time_lib="$withval"
-		fi
-        ],
-        [want_boost="yes"]
-	)
-
-	if test "x$want_boost" = "xyes"; then
-        AC_REQUIRE([AC_PROG_CC])
-		CPPFLAGS_SAVED="$CPPFLAGS"
-		CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
-		export CPPFLAGS
-
-		LDFLAGS_SAVED="$LDFLAGS"
-		LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
-		export LDFLAGS
-
-        AC_CACHE_CHECK(whether the Boost::Date_Time library is available,
-					   ax_cv_boost_date_time,
-        [AC_LANG_PUSH([C++])
-		 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@%:@include <boost/date_time/gregorian/gregorian_types.hpp>]],
-                                   [[using namespace boost::gregorian; date d(2002,Jan,10);
-                                     return 0;
-                                   ]])],
-         ax_cv_boost_date_time=yes, ax_cv_boost_date_time=no)
-         AC_LANG_POP([C++])
-		])
-		if test "x$ax_cv_boost_date_time" = "xyes"; then
-			AC_DEFINE(HAVE_BOOST_DATE_TIME,,[define if the Boost::Date_Time library is available])
-            BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'`
-            if test "x$ax_boost_user_date_time_lib" = "x"; then
-                for libextension in `ls $BOOSTLIBDIR/libboost_date_time*.so* $BOOSTLIBDIR/libboost_date_time*.dylib* $BOOSTLIBDIR/libboost_date_time*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_date_time.*\)\.so.*$;\1;' -e 's;^lib\(boost_date_time.*\)\.dylib.*$;\1;' -e 's;^lib\(boost_date_time.*\)\.a*$;\1;'` ; do
-                     ax_lib=${libextension}
-				    AC_CHECK_LIB($ax_lib, exit,
-                                 [BOOST_DATE_TIME_LIB="-l$ax_lib"; AC_SUBST(BOOST_DATE_TIME_LIB) link_date_time="yes"; break],
-                                 [link_date_time="no"])
-				done
-                if test "x$link_date_time" != "xyes"; then
-                for libextension in `ls $BOOSTLIBDIR/boost_date_time*.dll* $BOOSTLIBDIR/boost_date_time*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_date_time.*\)\.dll.*$;\1;' -e 's;^\(boost_date_time.*\)\.a.*$;\1;'` ; do
-                     ax_lib=${libextension}
-				    AC_CHECK_LIB($ax_lib, exit,
-                                 [BOOST_DATE_TIME_LIB="-l$ax_lib"; AC_SUBST(BOOST_DATE_TIME_LIB) link_date_time="yes"; break],
-                                 [link_date_time="no"])
-				done
-                fi
-
-            else
-               for ax_lib in $ax_boost_user_date_time_lib boost_date_time-$ax_boost_user_date_time_lib; do
-				      AC_CHECK_LIB($ax_lib, main,
-                                   [BOOST_DATE_TIME_LIB="-l$ax_lib"; AC_SUBST(BOOST_DATE_TIME_LIB) link_date_time="yes"; break],
-                                   [link_date_time="no"])
-                  done
-
-            fi
-            if test "x$ax_lib" = "x"; then
-                AC_MSG_ERROR(Could not find a version of the library!)
-            fi
-			if test "x$link_date_time" != "xyes"; then
-				AC_MSG_ERROR(Could not link against $ax_lib !)
-			fi
-		fi
-
-		CPPFLAGS="$CPPFLAGS_SAVED"
-	LDFLAGS="$LDFLAGS_SAVED"
-	fi
-])
diff --git a/m4/ax_boost_filesystem.m4 b/m4/ax_boost_filesystem.m4
deleted file mode 100644
index f162163cd..000000000
--- a/m4/ax_boost_filesystem.m4
+++ /dev/null
@@ -1,118 +0,0 @@
-# ===========================================================================
-#    http://www.gnu.org/software/autoconf-archive/ax_boost_filesystem.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_BOOST_FILESYSTEM
-#
-# DESCRIPTION
-#
-#   Test for Filesystem library from the Boost C++ libraries. The macro
-#   requires a preceding call to AX_BOOST_BASE. Further documentation is
-#   available at <http://randspringer.de/boost/index.html>.
-#
-#   This macro calls:
-#
-#     AC_SUBST(BOOST_FILESYSTEM_LIB)
-#
-#   And sets:
-#
-#     HAVE_BOOST_FILESYSTEM
-#
-# LICENSE
-#
-#   Copyright (c) 2009 Thomas Porschberg <thomas@randspringer.de>
-#   Copyright (c) 2009 Michael Tindal
-#   Copyright (c) 2009 Roman Rybalko <libtorrent@romanr.info>
-#
-#   Copying and distribution of this file, with or without modification, are
-#   permitted in any medium without royalty provided the copyright notice
-#   and this notice are preserved. This file is offered as-is, without any
-#   warranty.
-
-#serial 26
-
-AC_DEFUN([AX_BOOST_FILESYSTEM],
-[
-	AC_ARG_WITH([boost-filesystem],
-	AS_HELP_STRING([--with-boost-filesystem@<:@=special-lib@:>@],
-                   [use the Filesystem library from boost - it is possible to specify a certain library for the linker
-                        e.g. --with-boost-filesystem=boost_filesystem-gcc-mt ]),
-        [
-        if test "$withval" = "no"; then
-			want_boost="no"
-        elif test "$withval" = "yes"; then
-            want_boost="yes"
-            ax_boost_user_filesystem_lib=""
-        else
-		    want_boost="yes"
-		ax_boost_user_filesystem_lib="$withval"
-		fi
-        ],
-        [want_boost="yes"]
-	)
-
-	if test "x$want_boost" = "xyes"; then
-        AC_REQUIRE([AC_PROG_CC])
-		CPPFLAGS_SAVED="$CPPFLAGS"
-		CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
-		export CPPFLAGS
-
-		LDFLAGS_SAVED="$LDFLAGS"
-		LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
-		export LDFLAGS
-
-		LIBS_SAVED=$LIBS
-		LIBS="$LIBS $BOOST_SYSTEM_LIB"
-		export LIBS
-
-        AC_CACHE_CHECK(whether the Boost::Filesystem library is available,
-					   ax_cv_boost_filesystem,
-        [AC_LANG_PUSH([C++])
-         AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@%:@include <boost/filesystem/path.hpp>]],
-                                   [[using namespace boost::filesystem;
-                                   path my_path( "foo/bar/data.txt" );
-                                   return 0;]])],
-					       ax_cv_boost_filesystem=yes, ax_cv_boost_filesystem=no)
-         AC_LANG_POP([C++])
-		])
-		if test "x$ax_cv_boost_filesystem" = "xyes"; then
-			AC_DEFINE(HAVE_BOOST_FILESYSTEM,,[define if the Boost::Filesystem library is available])
-            BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'`
-            if test "x$ax_boost_user_filesystem_lib" = "x"; then
-                for libextension in `ls -r $BOOSTLIBDIR/libboost_filesystem* 2>/dev/null | sed 's,.*/lib,,' | sed 's,\..*,,'` ; do
-                     ax_lib=${libextension}
-				    AC_CHECK_LIB($ax_lib, exit,
-                                 [BOOST_FILESYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_FILESYSTEM_LIB) link_filesystem="yes"; break],
-                                 [link_filesystem="no"])
-				done
-                if test "x$link_filesystem" != "xyes"; then
-                for libextension in `ls -r $BOOSTLIBDIR/boost_filesystem* 2>/dev/null | sed 's,.*/,,' | sed -e 's,\..*,,'` ; do
-                     ax_lib=${libextension}
-				    AC_CHECK_LIB($ax_lib, exit,
-                                 [BOOST_FILESYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_FILESYSTEM_LIB) link_filesystem="yes"; break],
-                                 [link_filesystem="no"])
-				done
-		    fi
-            else
-               for ax_lib in $ax_boost_user_filesystem_lib boost_filesystem-$ax_boost_user_filesystem_lib; do
-				      AC_CHECK_LIB($ax_lib, exit,
-                                   [BOOST_FILESYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_FILESYSTEM_LIB) link_filesystem="yes"; break],
-                                   [link_filesystem="no"])
-                  done
-
-            fi
-            if test "x$ax_lib" = "x"; then
-                AC_MSG_ERROR(Could not find a version of the library!)
-            fi
-			if test "x$link_filesystem" != "xyes"; then
-				AC_MSG_ERROR(Could not link against $ax_lib !)
-			fi
-		fi
-
-		CPPFLAGS="$CPPFLAGS_SAVED"
-		LDFLAGS="$LDFLAGS_SAVED"
-		LIBS="$LIBS_SAVED"
-	fi
-])
diff --git a/m4/ax_boost_iostreams.m4 b/m4/ax_boost_iostreams.m4
deleted file mode 100644
index 9d736268a..000000000
--- a/m4/ax_boost_iostreams.m4
+++ /dev/null
@@ -1,116 +0,0 @@
-# ===========================================================================
-#    http://www.gnu.org/software/autoconf-archive/ax_boost_iostreams.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_BOOST_IOSTREAMS
-#
-# DESCRIPTION
-#
-#   Test for IOStreams library from the Boost C++ libraries. The macro
-#   requires a preceding call to AX_BOOST_BASE. Further documentation is
-#   available at <http://randspringer.de/boost/index.html>.
-#
-#   This macro calls:
-#
-#     AC_SUBST(BOOST_IOSTREAMS_LIB)
-#
-#   And sets:
-#
-#     HAVE_BOOST_IOSTREAMS
-#
-# LICENSE
-#
-#   Copyright (c) 2008 Thomas Porschberg <thomas@randspringer.de>
-#
-#   Copying and distribution of this file, with or without modification, are
-#   permitted in any medium without royalty provided the copyright notice
-#   and this notice are preserved. This file is offered as-is, without any
-#   warranty.
-
-#serial 20
-
-AC_DEFUN([AX_BOOST_IOSTREAMS],
-[
-	AC_ARG_WITH([boost-iostreams],
-	AS_HELP_STRING([--with-boost-iostreams@<:@=special-lib@:>@],
-                   [use the IOStreams library from boost - it is possible to specify a certain library for the linker
-                        e.g. --with-boost-iostreams=boost_iostreams-gcc-mt-d-1_33_1 ]),
-        [
-        if test "$withval" = "no"; then
-			want_boost="no"
-        elif test "$withval" = "yes"; then
-            want_boost="yes"
-            ax_boost_user_iostreams_lib=""
-        else
-		    want_boost="yes"
-		ax_boost_user_iostreams_lib="$withval"
-		fi
-        ],
-        [want_boost="yes"]
-	)
-
-	if test "x$want_boost" = "xyes"; then
-        AC_REQUIRE([AC_PROG_CC])
-		CPPFLAGS_SAVED="$CPPFLAGS"
-		CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
-		export CPPFLAGS
-
-		LDFLAGS_SAVED="$LDFLAGS"
-		LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
-		export LDFLAGS
-
-        AC_CACHE_CHECK(whether the Boost::IOStreams library is available,
-					   ax_cv_boost_iostreams,
-        [AC_LANG_PUSH([C++])
-		 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@%:@include <boost/iostreams/filtering_stream.hpp>
-											 @%:@include <boost/range/iterator_range.hpp>
-											]],
-                                  [[std::string  input = "Hello World!";
-								 namespace io = boost::iostreams;
-									 io::filtering_istream  in(boost::make_iterator_range(input));
-									 return 0;
-                                   ]])],
-                             ax_cv_boost_iostreams=yes, ax_cv_boost_iostreams=no)
-         AC_LANG_POP([C++])
-		])
-		if test "x$ax_cv_boost_iostreams" = "xyes"; then
-			AC_DEFINE(HAVE_BOOST_IOSTREAMS,,[define if the Boost::IOStreams library is available])
-            BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'`
-            if test "x$ax_boost_user_iostreams_lib" = "x"; then
-                for libextension in `ls $BOOSTLIBDIR/libboost_iostreams*.so* $BOOSTLIBDIR/libboost_iostream*.dylib* $BOOSTLIBDIR/libboost_iostreams*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_iostreams.*\)\.so.*$;\1;' -e 's;^lib\(boost_iostream.*\)\.dylib.*$;\1;' -e 's;^lib\(boost_iostreams.*\)\.a.*$;\1;'` ; do
-                     ax_lib=${libextension}
-				    AC_CHECK_LIB($ax_lib, exit,
-                                 [BOOST_IOSTREAMS_LIB="-l$ax_lib"; AC_SUBST(BOOST_IOSTREAMS_LIB) link_iostreams="yes"; break],
-                                 [link_iostreams="no"])
-				done
-                if test "x$link_iostreams" != "xyes"; then
-                for libextension in `ls $BOOSTLIBDIR/boost_iostreams*.dll* $BOOSTLIBDIR/boost_iostreams*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_iostreams.*\)\.dll.*$;\1;' -e 's;^\(boost_iostreams.*\)\.a.*$;\1;'` ; do
-                     ax_lib=${libextension}
-				    AC_CHECK_LIB($ax_lib, exit,
-                                 [BOOST_IOSTREAMS_LIB="-l$ax_lib"; AC_SUBST(BOOST_IOSTREAMS_LIB) link_iostreams="yes"; break],
-                                 [link_iostreams="no"])
-				done
-                fi
-
-            else
-               for ax_lib in $ax_boost_user_iostreams_lib boost_iostreams-$ax_boost_user_iostreams_lib; do
-				      AC_CHECK_LIB($ax_lib, main,
-                                   [BOOST_IOSTREAMS_LIB="-l$ax_lib"; AC_SUBST(BOOST_IOSTREAMS_LIB) link_iostreams="yes"; break],
-                                   [link_iostreams="no"])
-                  done
-
-            fi
-            if test "x$ax_lib" = "x"; then
-                AC_MSG_ERROR(Could not find a version of the library!)
-            fi
-			if test "x$link_iostreams" != "xyes"; then
-				AC_MSG_ERROR(Could not link against $ax_lib !)
-			fi
-		fi
-
-		CPPFLAGS="$CPPFLAGS_SAVED"
-	LDFLAGS="$LDFLAGS_SAVED"
-	fi
-])
diff --git a/m4/ax_boost_locale.m4 b/m4/ax_boost_locale.m4
deleted file mode 100644
index 23166abd2..000000000
--- a/m4/ax_boost_locale.m4
+++ /dev/null
@@ -1,120 +0,0 @@
-# ===========================================================================
-#      http://www.gnu.org/software/autoconf-archive/ax_boost_locale.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_BOOST_LOCALE
-#
-# DESCRIPTION
-#
-#   Test for System library from the Boost C++ libraries. The macro requires
-#   a preceding call to AX_BOOST_BASE. Further documentation is available at
-#   <http://randspringer.de/boost/index.html>.
-#
-#   This macro calls:
-#
-#     AC_SUBST(BOOST_LOCALE_LIB)
-#
-#   And sets:
-#
-#     HAVE_BOOST_LOCALE
-#
-# LICENSE
-#
-#   Copyright (c) 2012 Xiyue Deng <manphiz@gmail.com>
-#
-#   Copying and distribution of this file, with or without modification, are
-#   permitted in any medium without royalty provided the copyright notice
-#   and this notice are preserved. This file is offered as-is, without any
-#   warranty.
-
-#serial 1
-
-AC_DEFUN([AX_BOOST_LOCALE],
-[
-	AC_ARG_WITH([boost-locale],
-	AS_HELP_STRING([--with-boost-locale@<:@=special-lib@:>@],
-                   [use the Locale library from boost - it is possible to specify a certain library for the linker
-                        e.g. --with-boost-locale=boost_locale-gcc-mt ]),
-        [
-        if test "$withval" = "no"; then
-			want_boost="no"
-        elif test "$withval" = "yes"; then
-            want_boost="yes"
-            ax_boost_user_locale_lib=""
-        else
-		    want_boost="yes"
-		ax_boost_user_locale_lib="$withval"
-		fi
-        ],
-        [want_boost="yes"]
-	)
-
-	if test "x$want_boost" = "xyes"; then
-        AC_REQUIRE([AC_PROG_CC])
-        AC_REQUIRE([AC_CANONICAL_BUILD])
-		CPPFLAGS_SAVED="$CPPFLAGS"
-		CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
-		export CPPFLAGS
-
-		LDFLAGS_SAVED="$LDFLAGS"
-		LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
-		export LDFLAGS
-
-        AC_CACHE_CHECK(whether the Boost::Locale library is available,
-					   ax_cv_boost_locale,
-        [AC_LANG_PUSH([C++])
-			 CXXFLAGS_SAVE=$CXXFLAGS
-
-			 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@%:@include <boost/locale.hpp>]],
-                                   [[boost::locale::generator gen;
-                                   std::locale::global(gen(""));]])],
-                   ax_cv_boost_locale=yes, ax_cv_boost_locale=no)
-			 CXXFLAGS=$CXXFLAGS_SAVE
-             AC_LANG_POP([C++])
-		])
-		if test "x$ax_cv_boost_locale" = "xyes"; then
-			AC_SUBST(BOOST_CPPFLAGS)
-
-			AC_DEFINE(HAVE_BOOST_LOCALE,,[define if the Boost::Locale library is available])
-            BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'`
-
-			LDFLAGS_SAVE=$LDFLAGS
-            if test "x$ax_boost_user_locale_lib" = "x"; then
-                for libextension in `ls $BOOSTLIBDIR/libboost_locale*.so* $BOOSTLIBDIR/libboost_locale*.dylib* $BOOSTLIBDIR/libboost_locale*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_locale.*\)\.so.*$;\1;' -e 's;^lib\(boost_locale.*\)\.dylib.*$;\1;' -e 's;^lib\(boost_locale.*\)\.a.*$;\1;'` ; do
-                     ax_lib=${libextension}
-				    AC_CHECK_LIB($ax_lib, exit,
-                                 [BOOST_LOCALE_LIB="-l$ax_lib"; AC_SUBST(BOOST_LOCALE_LIB) link_locale="yes"; break],
-                                 [link_locale="no"])
-				done
-                if test "x$link_locale" != "xyes"; then
-                for libextension in `ls $BOOSTLIBDIR/boost_locale*.dll* $BOOSTLIBDIR/boost_locale*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_locale.*\)\.dll.*$;\1;' -e 's;^\(boost_locale.*\)\.a.*$;\1;'` ; do
-                     ax_lib=${libextension}
-				    AC_CHECK_LIB($ax_lib, exit,
-                                 [BOOST_LOCALE_LIB="-l$ax_lib"; AC_SUBST(BOOST_LOCALE_LIB) link_locale="yes"; break],
-                                 [link_locale="no"])
-				done
-                fi
-
-            else
-               for ax_lib in $ax_boost_user_locale_lib boost_locale-$ax_boost_user_locale_lib; do
-				      AC_CHECK_LIB($ax_lib, exit,
-                                   [BOOST_LOCALE_LIB="-l$ax_lib"; AC_SUBST(BOOST_LOCALE_LIB) link_locale="yes"; break],
-                                   [link_locale="no"])
-                  done
-
-            fi
-            if test "x$ax_lib" = "x"; then
-                AC_MSG_ERROR(Could not find a version of the library!)
-            fi
-			if test "x$link_locale" = "xno"; then
-				AC_MSG_ERROR(Could not link against $ax_lib !)
-			fi
-		fi
-
-		CPPFLAGS="$CPPFLAGS_SAVED"
-	LDFLAGS="$LDFLAGS_SAVED"
-	fi
-])
-
diff --git a/m4/ax_boost_program_options.m4 b/m4/ax_boost_program_options.m4
deleted file mode 100644
index 65a39c8c7..000000000
--- a/m4/ax_boost_program_options.m4
+++ /dev/null
@@ -1,108 +0,0 @@
-# ============================================================================
-#  http://www.gnu.org/software/autoconf-archive/ax_boost_program_options.html
-# ============================================================================
-#
-# SYNOPSIS
-#
-#   AX_BOOST_PROGRAM_OPTIONS
-#
-# DESCRIPTION
-#
-#   Test for program options library from the Boost C++ libraries. The macro
-#   requires a preceding call to AX_BOOST_BASE. Further documentation is
-#   available at <http://randspringer.de/boost/index.html>.
-#
-#   This macro calls:
-#
-#     AC_SUBST(BOOST_PROGRAM_OPTIONS_LIB)
-#
-#   And sets:
-#
-#     HAVE_BOOST_PROGRAM_OPTIONS
-#
-# LICENSE
-#
-#   Copyright (c) 2009 Thomas Porschberg <thomas@randspringer.de>
-#
-#   Copying and distribution of this file, with or without modification, are
-#   permitted in any medium without royalty provided the copyright notice
-#   and this notice are preserved. This file is offered as-is, without any
-#   warranty.
-
-#serial 22
-
-AC_DEFUN([AX_BOOST_PROGRAM_OPTIONS],
-[
-	AC_ARG_WITH([boost-program-options],
-		AS_HELP_STRING([--with-boost-program-options@<:@=special-lib@:>@],
-                       [use the program options library from boost - it is possible to specify a certain library for the linker
-                        e.g. --with-boost-program-options=boost_program_options-gcc-mt-1_33_1 ]),
-        [
-        if test "$withval" = "no"; then
-			want_boost="no"
-        elif test "$withval" = "yes"; then
-            want_boost="yes"
-            ax_boost_user_program_options_lib=""
-        else
-		    want_boost="yes"
-		ax_boost_user_program_options_lib="$withval"
-		fi
-        ],
-        [want_boost="yes"]
-	)
-
-	if test "x$want_boost" = "xyes"; then
-        AC_REQUIRE([AC_PROG_CC])
-	    export want_boost
-		CPPFLAGS_SAVED="$CPPFLAGS"
-		CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
-		export CPPFLAGS
-		LDFLAGS_SAVED="$LDFLAGS"
-		LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
-		export LDFLAGS
-		AC_CACHE_CHECK([whether the Boost::Program_Options library is available],
-					   ax_cv_boost_program_options,
-					   [AC_LANG_PUSH(C++)
-				AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@%:@include <boost/program_options.hpp>
-                                                          ]],
-                                  [[boost::program_options::options_description generic("Generic options");
-                                   return 0;]])],
-                           ax_cv_boost_program_options=yes, ax_cv_boost_program_options=no)
-					AC_LANG_POP([C++])
-		])
-		if test "$ax_cv_boost_program_options" = yes; then
-				AC_DEFINE(HAVE_BOOST_PROGRAM_OPTIONS,,[define if the Boost::PROGRAM_OPTIONS library is available])
-                  BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'`
-                if test "x$ax_boost_user_program_options_lib" = "x"; then
-                for libextension in `ls $BOOSTLIBDIR/libboost_program_options*.so* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_program_options.*\)\.so.*$;\1;'` `ls $BOOSTLIBDIR/libboost_program_options*.dylib* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_program_options.*\)\.dylib.*$;\1;'` `ls $BOOSTLIBDIR/libboost_program_options*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_program_options.*\)\.a.*$;\1;'` ; do
-                     ax_lib=${libextension}
-				    AC_CHECK_LIB($ax_lib, exit,
-                                 [BOOST_PROGRAM_OPTIONS_LIB="-l$ax_lib"; AC_SUBST(BOOST_PROGRAM_OPTIONS_LIB) link_program_options="yes"; break],
-                                 [link_program_options="no"])
-				done
-                if test "x$link_program_options" != "xyes"; then
-                for libextension in `ls $BOOSTLIBDIR/boost_program_options*.dll* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_program_options.*\)\.dll.*$;\1;'` `ls $BOOSTLIBDIR/boost_program_options*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_program_options.*\)\.a.*$;\1;'` ; do
-                     ax_lib=${libextension}
-				    AC_CHECK_LIB($ax_lib, exit,
-                                 [BOOST_PROGRAM_OPTIONS_LIB="-l$ax_lib"; AC_SUBST(BOOST_PROGRAM_OPTIONS_LIB) link_program_options="yes"; break],
-                                 [link_program_options="no"])
-				done
-                fi
-                else
-                  for ax_lib in $ax_boost_user_program_options_lib boost_program_options-$ax_boost_user_program_options_lib; do
-				      AC_CHECK_LIB($ax_lib, main,
-                                   [BOOST_PROGRAM_OPTIONS_LIB="-l$ax_lib"; AC_SUBST(BOOST_PROGRAM_OPTIONS_LIB) link_program_options="yes"; break],
-                                   [link_program_options="no"])
-                  done
-                fi
-            if test "x$ax_lib" = "x"; then
-                AC_MSG_ERROR(Could not find a version of the library!)
-            fi
-				if test "x$link_program_options" != "xyes"; then
-					AC_MSG_ERROR([Could not link against [$ax_lib] !])
-				fi
-		fi
-		CPPFLAGS="$CPPFLAGS_SAVED"
-	LDFLAGS="$LDFLAGS_SAVED"
-	fi
-])
diff --git a/m4/ax_boost_regex.m4 b/m4/ax_boost_regex.m4
deleted file mode 100644
index 918f16a47..000000000
--- a/m4/ax_boost_regex.m4
+++ /dev/null
@@ -1,111 +0,0 @@
-# ===========================================================================
-#      http://www.gnu.org/software/autoconf-archive/ax_boost_regex.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_BOOST_REGEX
-#
-# DESCRIPTION
-#
-#   Test for Regex library from the Boost C++ libraries. The macro requires
-#   a preceding call to AX_BOOST_BASE. Further documentation is available at
-#   <http://randspringer.de/boost/index.html>.
-#
-#   This macro calls:
-#
-#     AC_SUBST(BOOST_REGEX_LIB)
-#
-#   And sets:
-#
-#     HAVE_BOOST_REGEX
-#
-# LICENSE
-#
-#   Copyright (c) 2008 Thomas Porschberg <thomas@randspringer.de>
-#   Copyright (c) 2008 Michael Tindal
-#
-#   Copying and distribution of this file, with or without modification, are
-#   permitted in any medium without royalty provided the copyright notice
-#   and this notice are preserved. This file is offered as-is, without any
-#   warranty.
-
-#serial 22
-
-AC_DEFUN([AX_BOOST_REGEX],
-[
-	AC_ARG_WITH([boost-regex],
-	AS_HELP_STRING([--with-boost-regex@<:@=special-lib@:>@],
-                   [use the Regex library from boost - it is possible to specify a certain library for the linker
-                        e.g. --with-boost-regex=boost_regex-gcc-mt-d-1_33_1 ]),
-        [
-        if test "$withval" = "no"; then
-			want_boost="no"
-        elif test "$withval" = "yes"; then
-            want_boost="yes"
-            ax_boost_user_regex_lib=""
-        else
-		    want_boost="yes"
-		ax_boost_user_regex_lib="$withval"
-		fi
-        ],
-        [want_boost="yes"]
-	)
-
-	if test "x$want_boost" = "xyes"; then
-        AC_REQUIRE([AC_PROG_CC])
-		CPPFLAGS_SAVED="$CPPFLAGS"
-		CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
-		export CPPFLAGS
-
-		LDFLAGS_SAVED="$LDFLAGS"
-		LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
-		export LDFLAGS
-
-        AC_CACHE_CHECK(whether the Boost::Regex library is available,
-					   ax_cv_boost_regex,
-        [AC_LANG_PUSH([C++])
-			 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@%:@include <boost/regex.hpp>
-												]],
-                                   [[boost::regex r(); return 0;]])],
-                   ax_cv_boost_regex=yes, ax_cv_boost_regex=no)
-         AC_LANG_POP([C++])
-		])
-		if test "x$ax_cv_boost_regex" = "xyes"; then
-			AC_DEFINE(HAVE_BOOST_REGEX,,[define if the Boost::Regex library is available])
-            BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'`
-            if test "x$ax_boost_user_regex_lib" = "x"; then
-                for libextension in `ls $BOOSTLIBDIR/libboost_regex*.so* $BOOSTLIBDIR/libboost_regex*.dylib* $BOOSTLIBDIR/libboost_regex*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_regex.*\)\.so.*$;\1;' -e 's;^lib\(boost_regex.*\)\.dylib.*;\1;' -e 's;^lib\(boost_regex.*\)\.a.*$;\1;'` ; do
-                     ax_lib=${libextension}
-				    AC_CHECK_LIB($ax_lib, exit,
-                                 [BOOST_REGEX_LIB="-l$ax_lib"; AC_SUBST(BOOST_REGEX_LIB) link_regex="yes"; break],
-                                 [link_regex="no"])
-				done
-                if test "x$link_regex" != "xyes"; then
-                for libextension in `ls $BOOSTLIBDIR/boost_regex*.dll* $BOOSTLIBDIR/boost_regex*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_regex.*\)\.dll.*$;\1;' -e 's;^\(boost_regex.*\)\.a.*$;\1;'` ; do
-                     ax_lib=${libextension}
-				    AC_CHECK_LIB($ax_lib, exit,
-                                 [BOOST_REGEX_LIB="-l$ax_lib"; AC_SUBST(BOOST_REGEX_LIB) link_regex="yes"; break],
-                                 [link_regex="no"])
-				done
-                fi
-
-            else
-               for ax_lib in $ax_boost_user_regex_lib boost_regex-$ax_boost_user_regex_lib; do
-				      AC_CHECK_LIB($ax_lib, main,
-                                   [BOOST_REGEX_LIB="-l$ax_lib"; AC_SUBST(BOOST_REGEX_LIB) link_regex="yes"; break],
-                                   [link_regex="no"])
-               done
-            fi
-            if test "x$ax_lib" = "x"; then
-                AC_MSG_ERROR(Could not find a version of the Boost::Regex library!)
-            fi
-			if test "x$link_regex" != "xyes"; then
-				AC_MSG_ERROR(Could not link against $ax_lib !)
-			fi
-		fi
-
-		CPPFLAGS="$CPPFLAGS_SAVED"
-	LDFLAGS="$LDFLAGS_SAVED"
-	fi
-])
diff --git a/m4/ax_boost_system.m4 b/m4/ax_boost_system.m4
deleted file mode 100644
index c4c45559d..000000000
--- a/m4/ax_boost_system.m4
+++ /dev/null
@@ -1,120 +0,0 @@
-# ===========================================================================
-#      http://www.gnu.org/software/autoconf-archive/ax_boost_system.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_BOOST_SYSTEM
-#
-# DESCRIPTION
-#
-#   Test for System library from the Boost C++ libraries. The macro requires
-#   a preceding call to AX_BOOST_BASE. Further documentation is available at
-#   <http://randspringer.de/boost/index.html>.
-#
-#   This macro calls:
-#
-#     AC_SUBST(BOOST_SYSTEM_LIB)
-#
-#   And sets:
-#
-#     HAVE_BOOST_SYSTEM
-#
-# LICENSE
-#
-#   Copyright (c) 2008 Thomas Porschberg <thomas@randspringer.de>
-#   Copyright (c) 2008 Michael Tindal
-#   Copyright (c) 2008 Daniel Casimiro <dan.casimiro@gmail.com>
-#
-#   Copying and distribution of this file, with or without modification, are
-#   permitted in any medium without royalty provided the copyright notice
-#   and this notice are preserved. This file is offered as-is, without any
-#   warranty.
-
-#serial 17
-
-AC_DEFUN([AX_BOOST_SYSTEM],
-[
-	AC_ARG_WITH([boost-system],
-	AS_HELP_STRING([--with-boost-system@<:@=special-lib@:>@],
-                   [use the System library from boost - it is possible to specify a certain library for the linker
-                        e.g. --with-boost-system=boost_system-gcc-mt ]),
-        [
-        if test "$withval" = "no"; then
-			want_boost="no"
-        elif test "$withval" = "yes"; then
-            want_boost="yes"
-            ax_boost_user_system_lib=""
-        else
-		    want_boost="yes"
-		ax_boost_user_system_lib="$withval"
-		fi
-        ],
-        [want_boost="yes"]
-	)
-
-	if test "x$want_boost" = "xyes"; then
-        AC_REQUIRE([AC_PROG_CC])
-        AC_REQUIRE([AC_CANONICAL_BUILD])
-		CPPFLAGS_SAVED="$CPPFLAGS"
-		CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
-		export CPPFLAGS
-
-		LDFLAGS_SAVED="$LDFLAGS"
-		LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
-		export LDFLAGS
-
-        AC_CACHE_CHECK(whether the Boost::System library is available,
-					   ax_cv_boost_system,
-        [AC_LANG_PUSH([C++])
-			 CXXFLAGS_SAVE=$CXXFLAGS
-
-			 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@%:@include <boost/system/error_code.hpp>]],
-                                   [[boost::system::system_category]])],
-                   ax_cv_boost_system=yes, ax_cv_boost_system=no)
-			 CXXFLAGS=$CXXFLAGS_SAVE
-             AC_LANG_POP([C++])
-		])
-		if test "x$ax_cv_boost_system" = "xyes"; then
-			AC_SUBST(BOOST_CPPFLAGS)
-
-			AC_DEFINE(HAVE_BOOST_SYSTEM,,[define if the Boost::System library is available])
-            BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'`
-
-			LDFLAGS_SAVE=$LDFLAGS
-            if test "x$ax_boost_user_system_lib" = "x"; then
-                for libextension in `ls -r $BOOSTLIBDIR/libboost_system* 2>/dev/null | sed 's,.*/lib,,' | sed 's,\..*,,'` ; do
-                     ax_lib=${libextension}
-				    AC_CHECK_LIB($ax_lib, exit,
-                                 [BOOST_SYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_SYSTEM_LIB) link_system="yes"; break],
-                                 [link_system="no"])
-				done
-                if test "x$link_system" != "xyes"; then
-                for libextension in `ls -r $BOOSTLIBDIR/boost_system* 2>/dev/null | sed 's,.*/,,' | sed -e 's,\..*,,'` ; do
-                     ax_lib=${libextension}
-				    AC_CHECK_LIB($ax_lib, exit,
-                                 [BOOST_SYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_SYSTEM_LIB) link_system="yes"; break],
-                                 [link_system="no"])
-				done
-                fi
-
-            else
-               for ax_lib in $ax_boost_user_system_lib boost_system-$ax_boost_user_system_lib; do
-				      AC_CHECK_LIB($ax_lib, exit,
-                                   [BOOST_SYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_SYSTEM_LIB) link_system="yes"; break],
-                                   [link_system="no"])
-                  done
-
-            fi
-            if test "x$ax_lib" = "x"; then
-                AC_MSG_ERROR(Could not find a version of the library!)
-            fi
-			if test "x$link_system" = "xno"; then
-				AC_MSG_ERROR(Could not link against $ax_lib !)
-			fi
-		fi
-
-		CPPFLAGS="$CPPFLAGS_SAVED"
-	LDFLAGS="$LDFLAGS_SAVED"
-	fi
-])
diff --git a/m4/ax_boost_thread.m4 b/m4/ax_boost_thread.m4
deleted file mode 100644
index 79e12cdb4..000000000
--- a/m4/ax_boost_thread.m4
+++ /dev/null
@@ -1,149 +0,0 @@
-# ===========================================================================
-#      http://www.gnu.org/software/autoconf-archive/ax_boost_thread.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_BOOST_THREAD
-#
-# DESCRIPTION
-#
-#   Test for Thread library from the Boost C++ libraries. The macro requires
-#   a preceding call to AX_BOOST_BASE. Further documentation is available at
-#   <http://randspringer.de/boost/index.html>.
-#
-#   This macro calls:
-#
-#     AC_SUBST(BOOST_THREAD_LIB)
-#
-#   And sets:
-#
-#     HAVE_BOOST_THREAD
-#
-# LICENSE
-#
-#   Copyright (c) 2009 Thomas Porschberg <thomas@randspringer.de>
-#   Copyright (c) 2009 Michael Tindal
-#
-#   Copying and distribution of this file, with or without modification, are
-#   permitted in any medium without royalty provided the copyright notice
-#   and this notice are preserved. This file is offered as-is, without any
-#   warranty.
-
-#serial 27
-
-AC_DEFUN([AX_BOOST_THREAD],
-[
-	AC_ARG_WITH([boost-thread],
-	AS_HELP_STRING([--with-boost-thread@<:@=special-lib@:>@],
-                   [use the Thread library from boost - it is possible to specify a certain library for the linker
-                        e.g. --with-boost-thread=boost_thread-gcc-mt ]),
-        [
-        if test "$withval" = "no"; then
-			want_boost="no"
-        elif test "$withval" = "yes"; then
-            want_boost="yes"
-            ax_boost_user_thread_lib=""
-        else
-		    want_boost="yes"
-		ax_boost_user_thread_lib="$withval"
-		fi
-        ],
-        [want_boost="yes"]
-	)
-
-	if test "x$want_boost" = "xyes"; then
-        AC_REQUIRE([AC_PROG_CC])
-        AC_REQUIRE([AC_CANONICAL_BUILD])
-		CPPFLAGS_SAVED="$CPPFLAGS"
-		CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
-		export CPPFLAGS
-
-		LDFLAGS_SAVED="$LDFLAGS"
-		LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
-		export LDFLAGS
-
-        AC_CACHE_CHECK(whether the Boost::Thread library is available,
-					   ax_cv_boost_thread,
-        [AC_LANG_PUSH([C++])
-			 CXXFLAGS_SAVE=$CXXFLAGS
-
-			 if test "x$host_os" = "xsolaris" ; then
-				 CXXFLAGS="-pthreads $CXXFLAGS"
-			 elif test "x$host_os" = "xmingw32" ; then
-				 CXXFLAGS="-mthreads $CXXFLAGS"
-			 else
-				CXXFLAGS="-pthread $CXXFLAGS"
-			 fi
-			 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@%:@include <boost/thread/thread.hpp>]],
-                                   [[boost::thread_group thrds;
-                                   return 0;]])],
-                   ax_cv_boost_thread=yes, ax_cv_boost_thread=no)
-			 CXXFLAGS=$CXXFLAGS_SAVE
-             AC_LANG_POP([C++])
-		])
-		if test "x$ax_cv_boost_thread" = "xyes"; then
-           if test "x$host_os" = "xsolaris" ; then
-			  BOOST_CPPFLAGS="-pthreads $BOOST_CPPFLAGS"
-		   elif test "x$host_os" = "xmingw32" ; then
-			  BOOST_CPPFLAGS="-mthreads $BOOST_CPPFLAGS"
-		   else
-			  BOOST_CPPFLAGS="-pthread $BOOST_CPPFLAGS"
-		   fi
-
-			AC_SUBST(BOOST_CPPFLAGS)
-
-			AC_DEFINE(HAVE_BOOST_THREAD,,[define if the Boost::Thread library is available])
-            BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'`
-
-			LDFLAGS_SAVE=$LDFLAGS
-                        case "x$host_os" in
-                          *bsd* )
-                               LDFLAGS="-pthread $LDFLAGS"
-                          break;
-                          ;;
-                        esac
-            if test "x$ax_boost_user_thread_lib" = "x"; then
-                for libextension in `ls -r $BOOSTLIBDIR/libboost_thread* 2>/dev/null | sed 's,.*/lib,,' | sed 's,\..*,,'`; do
-                     ax_lib=${libextension}
-				    AC_CHECK_LIB($ax_lib, exit,
-                                 [BOOST_THREAD_LIB="-l$ax_lib"; AC_SUBST(BOOST_THREAD_LIB) link_thread="yes"; break],
-                                 [link_thread="no"])
-				done
-                if test "x$link_thread" != "xyes"; then
-                for libextension in `ls -r $BOOSTLIBDIR/boost_thread* 2>/dev/null | sed 's,.*/,,' | sed 's,\..*,,'`; do
-                     ax_lib=${libextension}
-				    AC_CHECK_LIB($ax_lib, exit,
-                                 [BOOST_THREAD_LIB="-l$ax_lib"; AC_SUBST(BOOST_THREAD_LIB) link_thread="yes"; break],
-                                 [link_thread="no"])
-				done
-                fi
-
-            else
-               for ax_lib in $ax_boost_user_thread_lib boost_thread-$ax_boost_user_thread_lib; do
-				      AC_CHECK_LIB($ax_lib, exit,
-                                   [BOOST_THREAD_LIB="-l$ax_lib"; AC_SUBST(BOOST_THREAD_LIB) link_thread="yes"; break],
-                                   [link_thread="no"])
-                  done
-
-            fi
-            if test "x$ax_lib" = "x"; then
-                AC_MSG_ERROR(Could not find a version of the library!)
-            fi
-			if test "x$link_thread" = "xno"; then
-				AC_MSG_ERROR(Could not link against $ax_lib !)
-                        else
-                           case "x$host_os" in
-                              *bsd* )
-				BOOST_LDFLAGS="-pthread $BOOST_LDFLAGS"
-                              break;
-                              ;;
-                           esac
-
-			fi
-		fi
-
-		CPPFLAGS="$CPPFLAGS_SAVED"
-	LDFLAGS="$LDFLAGS_SAVED"
-	fi
-])

From b26c54297ba04dcbaf60973737999179d325cd78 Mon Sep 17 00:00:00 2001
From: evoskuil <eric@voskuil.org>
Date: Fri, 1 Apr 2016 19:58:40 -0700
Subject: [PATCH 3/3] Ensure boost 1.56 is available.

---
 .travis.yml  |  5 ++++-
 configure.ac | 14 ++------------
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index e44e1d32b..9d0fe1651 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -58,6 +58,9 @@ install:
     - if [[ $LINUX && $CLANG ]]; then sudo update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-3.4 50; fi
     - if [[ $LINUX && $CLANG ]]; then sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-3.4 50; fi
 
+    # Download and install packages for osx/clang/dynamic.
+    - if [[ $OSX   && $CLANG && $DYNAMIC ]]; then brew unlink boost; brew install boost; fi
+
 script:
 
     # Download and build libbitcoin-network and all dependencies.
@@ -65,7 +68,7 @@ script:
     - if [[ $LINUX && $CLANG && $STATIC  ]]; then ./install.sh --disable-shared --build-boost --prefix=$TRAVIS_BUILD_DIR/my-prefix CFLAGS='-Os' CXXFLAGS='-Os'; fi
     - if [[ $LINUX && $GCC   && $STATIC  ]]; then ./install.sh --build-boost --disable-shared --build-dir=my-build --prefix=$TRAVIS_BUILD_DIR/my-prefix CFLAGS='-O0 -g --coverage' CXXFLAGS='-O0 -g --coverage'; fi
     - if [[ $OSX   && $CLANG && $DYNAMIC ]]; then ./install.sh ; fi
-    - if [[ $LINUX && $CLANG && $DYNAMIC ]]; then sudo CXX=$CXX CC=$CC ./install.sh --disable-ndebug --disable-static CFLAGS='-Os' CXXFLAGS='-Os'; fi
+    - if [[ $LINUX && $CLANG && $DYNAMIC ]]; then sudo CXX=$CXX CC=$CC ./install.sh --build-boost --disable-ndebug --disable-static CFLAGS='-Os' CXXFLAGS='-Os'; fi
     - if [[ $LINUX && $GCC   && $DYNAMIC ]]; then sudo CXX=$CXX CC=$CC ./install.sh --disable-static --build-boost CFLAGS='-Os -s' CXXFLAGS='-Os -s'; fi
 
 after_success:
diff --git a/configure.ac b/configure.ac
index fc58163f6..edabe1c0a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -106,19 +106,9 @@ AS_CASE([${enable_shared}], [yes], AC_DEFINE([BOOST_TEST_DYN_LINK]))
 
 # Check dependencies.
 #==============================================================================
-# Require Boost of at least version 1.55.0 if in gcc and output ${boost_CPPFLAGS/LDFLAGS}.
+# Require Boost of at least version 1.56.0 and output ${boost_CPPFLAGS/LDFLAGS}.
 #------------------------------------------------------------------------------
-AS_CASE([${CC}], [*gcc*],
-    [AX_BOOST_BASE([1.55.0],
-        [AC_SUBST([boost_CPPFLAGS], [${BOOST_CPPFLAGS}])
-         AC_SUBST([boost_LDFLAGS], [${BOOST_LDFLAGS}])
-         AC_MSG_NOTICE([boost_CPPFLAGS : ${boost_CPPFLAGS}])
-         AC_MSG_NOTICE([boost_LDFLAGS : ${boost_LDFLAGS}])],
-        [AC_MSG_ERROR([Boost 1.55.0 or later is required but was not found.])])])
-
-# Require Boost of at least version 1.56.0 if in clang and output ${boost_CPPFLAGS/LDFLAGS}.
-#------------------------------------------------------------------------------
-AS_CASE([${CC}], [*clang*],
+AS_CASE([${CC}], [*],
     [AX_BOOST_BASE([1.56.0],
         [AC_SUBST([boost_CPPFLAGS], [${BOOST_CPPFLAGS}])
          AC_SUBST([boost_LDFLAGS], [${BOOST_LDFLAGS}])