No OneTemporary
Actions

Size

50 KB

Subscribers

None

View Options

	diff --git a/configure.ac b/configure.ac
	index f0e0a74fe..24ce0f177 100644
	--- a/configure.ac
	+++ b/configure.ac
	@@ -1,956 +1,962 @@
	dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
	AC_PREREQ([2.60])
	define(_CLIENT_VERSION_MAJOR, 0)
	define(_CLIENT_VERSION_MINOR, 11)
	define(_CLIENT_VERSION_REVISION, 99)
	define(_CLIENT_VERSION_BUILD, 0)
	define(_CLIENT_VERSION_IS_RELEASE, false)
	define(_COPYRIGHT_YEAR, 2015)
	AC_INIT([Bitcoin Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[https://github.com/bitcoin/bitcoin/issues],[bitcoin])
	AC_CONFIG_SRCDIR([src/main.cpp])
	AC_CONFIG_HEADERS([src/config/bitcoin-config.h])
	AC_CONFIG_AUX_DIR([build-aux])
	AC_CONFIG_MACRO_DIR([build-aux/m4])

	AC_CANONICAL_HOST

	AH_TOP([#ifndef BITCOIN_CONFIG_H])
	AH_TOP([#define BITCOIN_CONFIG_H])
	AH_BOTTOM([#endif //BITCOIN_CONFIG_H])

	dnl faketime breaks configure and is only needed for make. Disable it here.
	unset FAKETIME

	dnl Automake init set-up and checks
	AM_INIT_AUTOMAKE([no-define subdir-objects foreign])

	dnl faketime messes with timestamps and causes configure to be re-run.
	dnl --disable-maintainer-mode can be used to bypass this.
	AM_MAINTAINER_MODE([enable])

	dnl make the compilation flags quiet unless V=1 is used
	m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])

	dnl Compiler checks (here before libtool).
	if test "x${CXXFLAGS+set}" = "xset"; then
	CXXFLAGS_overridden=yes
	else
	CXXFLAGS_overridden=no
	fi
	AC_PROG_CXX
	m4_ifdef([AC_PROG_OBJCXX],[AC_PROG_OBJCXX])

	dnl By default, libtool for mingw refuses to link static libs into a dll for
	dnl fear of mixing pic/non-pic objects, and import/export complications. Since
	dnl we have those under control, re-enable that functionality.
	case $host in
	mingw)
	lt_cv_deplibs_check_method="pass_all"
	;;
	esac
	dnl Libtool init checks.
	LT_INIT([pic-only])

	dnl Check/return PATH for base programs.
	AC_PATH_TOOL(AR, ar)
	AC_PATH_TOOL(RANLIB, ranlib)
	AC_PATH_TOOL(STRIP, strip)
	AC_PATH_TOOL(GCOV, gcov)
	AC_PATH_PROG(LCOV, lcov)
	AC_PATH_PROG(JAVA, java)
	AC_PATH_PROG(GENHTML, genhtml)
	AC_PATH_PROG([GIT], [git])
	AC_PATH_PROG(CCACHE,ccache)
	AC_PATH_PROG(XGETTEXT,xgettext)
	AC_PATH_PROG(HEXDUMP,hexdump)

	dnl pkg-config check.
	PKG_PROG_PKG_CONFIG

	# Enable wallet
	AC_ARG_ENABLE([wallet],
	[AS_HELP_STRING([--enable-wallet],
	[enable wallet (default is yes)])],
	[enable_wallet=$enableval],
	[enable_wallet=yes])

	AC_ARG_WITH([miniupnpc],
	[AS_HELP_STRING([--with-miniupnpc],
	[enable UPNP (default is yes if libminiupnpc is found)])],
	[use_upnp=$withval],
	[use_upnp=auto])

	AC_ARG_ENABLE([upnp-default],
	[AS_HELP_STRING([--enable-upnp-default],
	[if UPNP is enabled, turn it on at startup (default is no)])],
	[use_upnp_default=$enableval],
	[use_upnp_default=no])

	AC_ARG_ENABLE(tests,
	AS_HELP_STRING([--enable-tests],[compile tests (default is yes)]),
	[use_tests=$enableval],
	[use_tests=yes])

	+AC_ARG_ENABLE(bench,
	+ AS_HELP_STRING([--enable-bench],[compile benchmarks (default is yes)]),
	+ [use_bench=$enableval],
	+ [use_bench=yes])
	+
	AC_ARG_WITH([comparison-tool],
	AS_HELP_STRING([--with-comparison-tool],[path to java comparison tool (requires --enable-tests)]),
	[use_comparison_tool=$withval],
	[use_comparison_tool=no])

	AC_ARG_ENABLE([comparison-tool-reorg-tests],
	AS_HELP_STRING([--enable-comparison-tool-reorg-tests],[enable expensive reorg tests in the comparison tool (default no)]),
	[use_comparison_tool_reorg_tests=$enableval],
	[use_comparison_tool_reorg_tests=no])

	AC_ARG_WITH([qrencode],
	[AS_HELP_STRING([--with-qrencode],
	[enable QR code support (default is yes if qt is enabled and libqrencode is found)])],
	[use_qr=$withval],
	[use_qr=auto])

	AC_ARG_ENABLE([hardening],
	[AS_HELP_STRING([--enable-hardening],
	[attempt to harden the resulting executables (default is yes)])],
	[use_hardening=$enableval],
	[use_hardening=yes])

	AC_ARG_ENABLE([reduce-exports],
	[AS_HELP_STRING([--enable-reduce-exports],
	[attempt to reduce exported symbols in the resulting executables (default is no)])],
	[use_reduce_exports=$enableval],
	[use_reduce_exports=no])

	AC_ARG_ENABLE([ccache],
	[AS_HELP_STRING([--enable-ccache],
	[use ccache for building (default is yes if ccache is found)])],
	[use_ccache=$enableval],
	[use_ccache=auto])

	AC_ARG_ENABLE([lcov],
	[AS_HELP_STRING([--enable-lcov],
	[enable lcov testing (default is no)])],
	[use_lcov=yes],
	[use_lcov=no])

	AC_ARG_ENABLE([glibc-back-compat],
	[AS_HELP_STRING([--enable-glibc-back-compat],
	[enable backwards compatibility with glibc])],
	[use_glibc_compat=$enableval],
	[use_glibc_compat=no])

	AC_ARG_ENABLE([zmq],
	[AS_HELP_STRING([--disable-zmq],
	[Disable ZMQ notifications])],
	[use_zmq=$enableval],
	[use_zmq=yes])

	AC_ARG_WITH([protoc-bindir],[AS_HELP_STRING([--with-protoc-bindir=BIN_DIR],[specify protoc bin path])], [protoc_bin_path=$withval], [])

	# Enable debug
	AC_ARG_ENABLE([debug],
	[AS_HELP_STRING([--enable-debug],
	[use debug compiler flags and macros (default is no)])],
	[enable_debug=$enableval],
	[enable_debug=no])

	if test "x$enable_debug" = xyes; then
	CPPFLAGS="$CPPFLAGS -DDEBUG -DDEBUG_LOCKORDER"
	if test "x$GCC" = xyes; then
	CFLAGS="$CFLAGS -g3 -O0"
	fi

	if test "x$GXX" = xyes; then
	CXXFLAGS="$CXXFLAGS -g3 -O0"
	fi
	fi

	## TODO: Remove these hard-coded paths and flags. They are here for the sake of
	## compatibility with the legacy buildsystem.
	##
	if test "x$CXXFLAGS_overridden" = "xno"; then
	CXXFLAGS="$CXXFLAGS -Wall -Wextra -Wformat -Wformat-security -Wno-unused-parameter"
	fi
	CPPFLAGS="$CPPFLAGS -DHAVE_BUILD_INFO -D__STDC_FORMAT_MACROS"

	AC_ARG_WITH([utils],
	[AS_HELP_STRING([--with-utils],
	[build bitcoin-cli bitcoin-tx (default=yes)])],
	[build_bitcoin_utils=$withval],
	[build_bitcoin_utils=yes])

	AC_ARG_WITH([libs],
	[AS_HELP_STRING([--with-libs],
	[build libraries (default=yes)])],
	[build_bitcoin_libs=$withval],
	[build_bitcoin_libs=yes])

	AC_ARG_WITH([daemon],
	[AS_HELP_STRING([--with-daemon],
	[build bitcoind daemon (default=yes)])],
	[build_bitcoind=$withval],
	[build_bitcoind=yes])

	AC_LANG_PUSH([C++])

	use_pkgconfig=yes
	case $host in
	mingw)

	#pkgconfig does more harm than good with MinGW
	use_pkgconfig=no

	TARGET_OS=windows
	AC_CHECK_LIB([mingwthrd], [main],, AC_MSG_ERROR(lib missing))
	AC_CHECK_LIB([kernel32], [main],, AC_MSG_ERROR(lib missing))
	AC_CHECK_LIB([user32], [main],, AC_MSG_ERROR(lib missing))
	AC_CHECK_LIB([gdi32], [main],, AC_MSG_ERROR(lib missing))
	AC_CHECK_LIB([comdlg32], [main],, AC_MSG_ERROR(lib missing))
	AC_CHECK_LIB([winspool], [main],, AC_MSG_ERROR(lib missing))
	AC_CHECK_LIB([winmm], [main],, AC_MSG_ERROR(lib missing))
	AC_CHECK_LIB([shell32], [main],, AC_MSG_ERROR(lib missing))
	AC_CHECK_LIB([comctl32], [main],, AC_MSG_ERROR(lib missing))
	AC_CHECK_LIB([ole32], [main],, AC_MSG_ERROR(lib missing))
	AC_CHECK_LIB([oleaut32], [main],, AC_MSG_ERROR(lib missing))
	AC_CHECK_LIB([uuid], [main],, AC_MSG_ERROR(lib missing))
	AC_CHECK_LIB([rpcrt4], [main],, AC_MSG_ERROR(lib missing))
	AC_CHECK_LIB([advapi32], [main],, AC_MSG_ERROR(lib missing))
	AC_CHECK_LIB([ws2_32], [main],, AC_MSG_ERROR(lib missing))
	AC_CHECK_LIB([mswsock], [main],, AC_MSG_ERROR(lib missing))
	AC_CHECK_LIB([shlwapi], [main],, AC_MSG_ERROR(lib missing))
	AC_CHECK_LIB([iphlpapi], [main],, AC_MSG_ERROR(lib missing))
	AC_CHECK_LIB([crypt32], [main],, AC_MSG_ERROR(lib missing))

	# -static is interpreted by libtool, where it has a different meaning.
	# In libtool-speak, it's -all-static.
	AX_CHECK_LINK_FLAG([[-static]],[LIBTOOL_APP_LDFLAGS="$LIBTOOL_APP_LDFLAGS -all-static"])

	AC_PATH_PROG([MAKENSIS], [makensis], none)
	if test x$MAKENSIS = xnone; then
	AC_MSG_WARN("makensis not found. Cannot create installer.")
	fi

	AC_PATH_TOOL(WINDRES, windres, none)
	if test x$WINDRES = xnone; then
	AC_MSG_ERROR("windres not found")
	fi

	CPPFLAGS="$CPPFLAGS -D_MT -DWIN32 -D_WINDOWS -DBOOST_THREAD_USE_LIB"
	LEVELDB_TARGET_FLAGS="TARGET_OS=OS_WINDOWS_CROSSCOMPILE"
	if test "x$CXXFLAGS_overridden" = "xno"; then
	CXXFLAGS="$CXXFLAGS -w"
	fi
	case $host in
	i?86-*) WINDOWS_BITS=32 ;;
	x86_64-*) WINDOWS_BITS=64 ;;
	*) AC_MSG_ERROR("Could not determine win32/win64 for installer") ;;
	esac
	AC_SUBST(WINDOWS_BITS)

	dnl libtool insists upon adding -nostdlib and a list of objects/libs to link against.
	dnl That breaks our ability to build dll's with static libgcc/libstdc++/libssp. Override
	dnl its command here, with the predeps/postdeps removed, and -static inserted. Postdeps are
	dnl also overridden to prevent their insertion later.
	dnl This should only affect dll's.
	archive_cmds_CXX="\$CC -shared \$libobjs \$deplibs \$compiler_flags -static -o \$output_objdir/\$soname \${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker \$lib"
	postdeps_CXX=

	;;
	darwin)
	TARGET_OS=darwin
	LEVELDB_TARGET_FLAGS="TARGET_OS=Darwin"
	if test x$cross_compiling != xyes; then
	BUILD_OS=darwin
	AC_CHECK_PROG([PORT],port, port)
	if test x$PORT = xport; then
	dnl add default macports paths
	CPPFLAGS="$CPPFLAGS -isystem /opt/local/include"
	LIBS="$LIBS -L/opt/local/lib"
	if test -d /opt/local/include/db48; then
	CPPFLAGS="$CPPFLAGS -I/opt/local/include/db48"
	LIBS="$LIBS -L/opt/local/lib/db48"
	fi
	fi

	AC_CHECK_PROG([BREW],brew, brew)
	if test x$BREW = xbrew; then
	dnl These Homebrew packages may be keg-only, meaning that they won't be found
	dnl in expected paths because they may conflict with system files. Ask
	dnl Homebrew where each one is located, then adjust paths accordingly.
	dnl It's safe to add these paths even if the functionality is disabled by
	dnl the user (--without-wallet or --without-gui for example).

	openssl_prefix=`$BREW --prefix openssl 2>/dev/null`
	bdb_prefix=`$BREW --prefix berkeley-db4 2>/dev/null`
	qt5_prefix=`$BREW --prefix qt5 2>/dev/null`
	if test x$openssl_prefix != x; then
	PKG_CONFIG_PATH="$openssl_prefix/lib/pkgconfig:$PKG_CONFIG_PATH"
	export PKG_CONFIG_PATH
	fi
	if test x$bdb_prefix != x; then
	CPPFLAGS="$CPPFLAGS -I$bdb_prefix/include"
	LIBS="$LIBS -L$bdb_prefix/lib"
	fi
	if test x$qt5_prefix != x; then
	PKG_CONFIG_PATH="$qt5_prefix/lib/pkgconfig:$PKG_CONFIG_PATH"
	export PKG_CONFIG_PATH
	fi
	fi
	else
	case $build_os in
	darwin)
	BUILD_OS=darwin
	;;
	*)
	AC_PATH_TOOL([INSTALLNAMETOOL], [install_name_tool], install_name_tool)
	AC_PATH_TOOL([OTOOL], [otool], otool)
	AC_PATH_PROGS([GENISOIMAGE], [genisoimage mkisofs],genisoimage)

	dnl libtool will try to strip the static lib, which is a problem for
	dnl cross-builds because strip attempts to call a hard-coded ld,
	dnl which may not exist in the path. Stripping the .a is not
	dnl necessary, so just disable it.
	old_striplib=
	;;
	esac
	fi

	AX_CHECK_LINK_FLAG([[-Wl,-headerpad_max_install_names]], [LDFLAGS="$LDFLAGS -Wl,-headerpad_max_install_names"])
	CPPFLAGS="$CPPFLAGS -DMAC_OSX"
	;;
	linux)
	TARGET_OS=linux
	;;
	*)
	;;
	esac

	if test x$use_comparison_tool != xno; then
	AC_SUBST(JAVA_COMPARISON_TOOL, $use_comparison_tool)
	fi

	if test x$use_comparison_tool_reorg_tests != xno; then
	if test x$use_comparison_tool = x; then
	AC_MSG_ERROR("comparison tool reorg tests but comparison tool was not specified")
	fi
	AC_SUBST(COMPARISON_TOOL_REORG_TESTS, 1)
	else
	AC_SUBST(COMPARISON_TOOL_REORG_TESTS, 0)
	fi

	if test x$use_lcov = xyes; then
	if test x$LCOV = x; then
	AC_MSG_ERROR("lcov testing requested but lcov not found")
	fi
	if test x$GCOV = x; then
	AC_MSG_ERROR("lcov testing requested but gcov not found")
	fi
	if test x$JAVA = x; then
	AC_MSG_ERROR("lcov testing requested but java not found")
	fi
	if test x$GENHTML = x; then
	AC_MSG_ERROR("lcov testing requested but genhtml not found")
	fi
	if test x$use_comparison_tool = x; then
	AC_MSG_ERROR("lcov testing requested but comparison tool was not specified")
	fi
	LCOV="$LCOV --gcov-tool=$GCOV"
	AX_CHECK_COMPILE_FLAG([--coverage],[CXXFLAGS="$CXXFLAGS --coverage"],
	[AC_MSG_ERROR("lcov testing requested but --coverage flag does not work")])
	fi

	dnl Check for endianness
	AC_C_BIGENDIAN

	dnl Check for pthread compile/link requirements
	AX_PTHREAD

	# The following macro will add the necessary defines to bitcoin-config.h, but
	# they also need to be passed down to any subprojects. Pull the results out of
	# the cache and add them to CPPFLAGS.
	AC_SYS_LARGEFILE
	# detect POSIX or GNU variant of strerror_r
	AC_FUNC_STRERROR_R

	if test x$ac_cv_sys_file_offset_bits != x &&
	test x$ac_cv_sys_file_offset_bits != xno &&
	test x$ac_cv_sys_file_offset_bits != xunknown; then
	CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits"
	fi

	if test x$ac_cv_sys_large_files != x &&
	test x$ac_cv_sys_large_files != xno &&
	test x$ac_cv_sys_large_files != xunknown; then
	CPPFLAGS="$CPPFLAGS -D_LARGE_FILES=$ac_cv_sys_large_files"
	fi

	AX_CHECK_LINK_FLAG([[-Wl,--large-address-aware]], [LDFLAGS="$LDFLAGS -Wl,--large-address-aware"])

	AX_GCC_FUNC_ATTRIBUTE([visibility])
	AX_GCC_FUNC_ATTRIBUTE([dllexport])
	AX_GCC_FUNC_ATTRIBUTE([dllimport])

	if test x$use_glibc_compat != xno; then

	#__fdelt_chk's params and return type have changed from long unsigned int to long int.
	# See which one is present here.
	AC_MSG_CHECKING(__fdelt_chk type)
	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#ifdef _FORTIFY_SOURCE
	#undef _FORTIFY_SOURCE
	#endif
	#define _FORTIFY_SOURCE 2
	#include <sys/select.h>
	extern "C" long unsigned int __fdelt_warn(long unsigned int);]],[[]])],
	[ fdelt_type="long unsigned int"],
	[ fdelt_type="long int"])
	AC_MSG_RESULT($fdelt_type)
	AC_DEFINE_UNQUOTED(FDELT_TYPE, $fdelt_type,[parameter and return value type for __fdelt_chk])

	fi

	if test x$use_hardening != xno; then
	AX_CHECK_COMPILE_FLAG([-Wstack-protector],[HARDENED_CXXFLAGS="$HARDENED_CXXFLAGS -Wstack-protector"])
	AX_CHECK_COMPILE_FLAG([-fstack-protector-all],[HARDENED_CXXFLAGS="$HARDENED_CXXFLAGS -fstack-protector-all"])

	AX_CHECK_PREPROC_FLAG([-D_FORTIFY_SOURCE=2],[
	AX_CHECK_PREPROC_FLAG([-U_FORTIFY_SOURCE],[
	HARDENED_CPPFLAGS="$HARDENED_CPPFLAGS -U_FORTIFY_SOURCE"
	])
	HARDENED_CPPFLAGS="$HARDENED_CPPFLAGS -D_FORTIFY_SOURCE=2"
	])

	AX_CHECK_LINK_FLAG([[-Wl,--dynamicbase]], [HARDENED_LDFLAGS="$HARDENED_LDFLAGS -Wl,--dynamicbase"])
	AX_CHECK_LINK_FLAG([[-Wl,--nxcompat]], [HARDENED_LDFLAGS="$HARDENED_LDFLAGS -Wl,--nxcompat"])
	AX_CHECK_LINK_FLAG([[-Wl,-z,relro]], [HARDENED_LDFLAGS="$HARDENED_LDFLAGS -Wl,-z,relro"])
	AX_CHECK_LINK_FLAG([[-Wl,-z,now]], [HARDENED_LDFLAGS="$HARDENED_LDFLAGS -Wl,-z,now"])

	if test x$TARGET_OS != xwindows; then
	# All windows code is PIC, forcing it on just adds useless compile warnings
	AX_CHECK_COMPILE_FLAG([-fPIE],[HARDENED_CXXFLAGS="$HARDENED_CXXFLAGS -fPIE"])
	AX_CHECK_LINK_FLAG([[-pie]], [HARDENED_LDFLAGS="$HARDENED_LDFLAGS -pie"])
	fi

	case $host in
	mingw)
	AC_CHECK_LIB([ssp], [main],, AC_MSG_ERROR(lib missing))
	;;
	esac

	CXXFLAGS="$CXXFLAGS $HARDENED_CXXFLAGS"
	CPPFLAGS="$CPPFLAGS $HARDENED_CPPFLAGS"
	LDFLAGS="$LDFLAGS $HARDENED_LDFLAGS"
	OBJCXXFLAGS="$CXXFLAGS"
	fi

	dnl this flag screws up non-darwin gcc even when the check fails. special-case it.
	if test x$TARGET_OS = xdarwin; then
	AX_CHECK_LINK_FLAG([[-Wl,-dead_strip]], [LDFLAGS="$LDFLAGS -Wl,-dead_strip"])
	fi

	AC_CHECK_HEADERS([endian.h sys/endian.h byteswap.h stdio.h stdlib.h unistd.h strings.h sys/types.h sys/stat.h sys/select.h sys/prctl.h])
	AC_SEARCH_LIBS([getaddrinfo_a], [anl], [AC_DEFINE(HAVE_GETADDRINFO_A, 1, [Define this symbol if you have getaddrinfo_a])])
	AC_SEARCH_LIBS([inet_pton], [nsl resolv], [AC_DEFINE(HAVE_INET_PTON, 1, [Define this symbol if you have inet_pton])])

	AC_CHECK_DECLS([strnlen])

	AC_CHECK_DECLS([le16toh, le32toh, le64toh, htole16, htole32, htole64, be16toh, be32toh, be64toh, htobe16, htobe32, htobe64],,,
	[#if HAVE_ENDIAN_H
	#include <endian.h>
	#elif HAVE_SYS_ENDIAN_H
	#include <sys/endian.h>
	#endif])

	AC_CHECK_DECLS([bswap_16, bswap_32, bswap_64],,,
	[#if HAVE_BYTESWAP_H
	#include <byteswap.h>
	#endif])

	dnl Check for MSG_NOSIGNAL
	AC_MSG_CHECKING(for MSG_NOSIGNAL)
	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/socket.h>]],
	[[ int f = MSG_NOSIGNAL; ]])],
	[ AC_MSG_RESULT(yes); AC_DEFINE(HAVE_MSG_NOSIGNAL, 1,[Define this symbol if you have MSG_NOSIGNAL]) ],
	[ AC_MSG_RESULT(no)]
	)

	AC_SEARCH_LIBS([clock_gettime],[rt])

	AC_MSG_CHECKING([for visibility attribute])
	AC_LINK_IFELSE([AC_LANG_SOURCE([
	int foo_def( void ) __attribute__((visibility("default")));
	int main(){}
	])],
	[
	AC_DEFINE(HAVE_VISIBILITY_ATTRIBUTE,1,[Define if the visibility attribute is supported.])
	AC_MSG_RESULT(yes)
	],
	[
	AC_MSG_RESULT(no)
	if test x$use_reduce_exports = xyes; then
	AC_MSG_ERROR([Cannot find a working visibility attribute. Use --disable-reduce-exports.])
	fi
	]
	)

	if test x$use_reduce_exports = xyes; then
	AX_CHECK_COMPILE_FLAG([-fvisibility=hidden],[RE_CXXFLAGS="-fvisibility=hidden"],
	[AC_MSG_ERROR([Cannot set default symbol visibility. Use --disable-reduce-exports.])])
	fi

	LEVELDB_CPPFLAGS=
	LIBLEVELDB=
	LIBMEMENV=
	AM_CONDITIONAL([EMBEDDED_LEVELDB],[true])
	AC_SUBST(LEVELDB_CPPFLAGS)
	AC_SUBST(LIBLEVELDB)
	AC_SUBST(LIBMEMENV)

	if test x$enable_wallet != xno; then
	dnl Check for libdb_cxx only if wallet enabled
	BITCOIN_FIND_BDB48
	fi

	dnl Check for libminiupnpc (optional)
	if test x$use_upnp != xno; then
	AC_CHECK_HEADERS(
	[miniupnpc/miniwget.h miniupnpc/miniupnpc.h miniupnpc/upnpcommands.h miniupnpc/upnperrors.h],
	[AC_CHECK_LIB([miniupnpc], [main],[MINIUPNPC_LIBS=-lminiupnpc], [have_miniupnpc=no])],
	[have_miniupnpc=no]
	)
	fi

	BITCOIN_QT_INIT

	dnl sets $bitcoin_enable_qt, $bitcoin_enable_qt_test, $bitcoin_enable_qt_dbus
	BITCOIN_QT_CONFIGURE([$use_pkgconfig], [qt4])

	if test x$build_bitcoin_utils$build_bitcoind$bitcoin_enable_qt$use_tests = xnononono; then
	use_boost=no
	else
	use_boost=yes
	fi

	if test x$use_boost = xyes; then

	dnl Check for boost libs
	AX_BOOST_BASE
	AX_BOOST_SYSTEM
	AX_BOOST_FILESYSTEM
	AX_BOOST_PROGRAM_OPTIONS
	AX_BOOST_THREAD
	AX_BOOST_CHRONO


	if test x$use_reduce_exports = xyes; then
	AC_MSG_CHECKING([for working boost reduced exports])
	TEMP_CPPFLAGS="$CPPFLAGS"
	CPPFLAGS="$BOOST_CPPFLAGS $CPPFLAGS"
	AC_PREPROC_IFELSE([AC_LANG_PROGRAM([[
	@%:@include <boost/version.hpp>
	]], [[
	#if BOOST_VERSION >= 104900
	// Everything is okay
	#else
	# error Boost version is too old
	#endif
	]])],[
	AC_MSG_RESULT(yes)
	],[
	AC_MSG_ERROR([boost versions < 1.49 are known to be broken with reduced exports. Use --disable-reduce-exports.])
	])
	CPPFLAGS="$TEMP_CPPFLAGS"
	fi
	fi

	if test x$use_reduce_exports = xyes; then
	CXXFLAGS="$CXXFLAGS $RE_CXXFLAGS"
	AX_CHECK_LINK_FLAG([[-Wl,--exclude-libs,ALL]], [RELDFLAGS="-Wl,--exclude-libs,ALL"])
	fi

	if test x$use_tests = xyes; then

	if test x$HEXDUMP = x; then
	AC_MSG_ERROR(hexdump is required for tests)
	fi


	if test x$use_boost = xyes; then

	AX_BOOST_UNIT_TEST_FRAMEWORK

	dnl Determine if -DBOOST_TEST_DYN_LINK is needed
	AC_MSG_CHECKING([for dynamic linked boost test])
	TEMP_LIBS="$LIBS"
	LIBS="$LIBS $BOOST_LDFLAGS $BOOST_UNIT_TEST_FRAMEWORK_LIB"
	TEMP_CPPFLAGS="$CPPFLAGS"
	CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
	AC_LINK_IFELSE([AC_LANG_SOURCE([
	#define BOOST_TEST_DYN_LINK
	#define BOOST_TEST_MAIN
	#include <boost/test/unit_test.hpp>

	])],
	[AC_MSG_RESULT(yes)]
	[TESTDEFS="$TESTDEFS -DBOOST_TEST_DYN_LINK"],
	[AC_MSG_RESULT(no)])
	LIBS="$TEMP_LIBS"
	CPPFLAGS="$TEMP_CPPFLAGS"

	fi
	fi

	if test x$use_boost = xyes; then

	BOOST_LIBS="$BOOST_LDFLAGS $BOOST_SYSTEM_LIB $BOOST_FILESYSTEM_LIB $BOOST_PROGRAM_OPTIONS_LIB $BOOST_THREAD_LIB $BOOST_CHRONO_LIB"

	dnl Boost >= 1.50 uses sleep_for rather than the now-deprecated sleep, however
	dnl it was broken from 1.50 to 1.52 when backed by nanosleep. Use sleep_for if
	dnl a working version is available, else fall back to sleep. sleep was removed
	dnl after 1.56.
	dnl If neither is available, abort.
	TEMP_LIBS="$LIBS"
	LIBS="$BOOST_LIBS $LIBS"
	TEMP_CPPFLAGS="$CPPFLAGS"
	CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
	AC_LINK_IFELSE([AC_LANG_PROGRAM([[
	#include <boost/thread/thread.hpp>
	#include <boost/version.hpp>
	]],[[
	#if BOOST_VERSION >= 105000 && (!defined(BOOST_HAS_NANOSLEEP) \|\| BOOST_VERSION >= 105200)
	boost::this_thread::sleep_for(boost::chrono::milliseconds(0));
	#else
	choke me
	#endif
	]])],
	[boost_sleep=yes;
	AC_DEFINE(HAVE_WORKING_BOOST_SLEEP_FOR, 1, [Define this symbol if boost sleep_for works])],
	[boost_sleep=no])
	LIBS="$TEMP_LIBS"
	CPPFLAGS="$TEMP_CPPFLAGS"

	if test x$boost_sleep != xyes; then
	TEMP_LIBS="$LIBS"
	LIBS="$BOOST_LIBS $LIBS"
	TEMP_CPPFLAGS="$CPPFLAGS"
	CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
	AC_LINK_IFELSE([AC_LANG_PROGRAM([[
	#include <boost/version.hpp>
	#include <boost/thread.hpp>
	#include <boost/date_time/posix_time/posix_time_types.hpp>
	]],[[
	#if BOOST_VERSION <= 105600
	boost::this_thread::sleep(boost::posix_time::milliseconds(0));
	#else
	choke me
	#endif
	]])],
	[boost_sleep=yes; AC_DEFINE(HAVE_WORKING_BOOST_SLEEP, 1, [Define this symbol if boost sleep works])],
	[boost_sleep=no])
	LIBS="$TEMP_LIBS"
	CPPFLAGS="$TEMP_CPPFLAGS"
	fi

	if test x$boost_sleep != xyes; then
	AC_MSG_ERROR(No working boost sleep implementation found.)
	fi

	fi

	if test x$use_pkgconfig = xyes; then

	if test x"$PKG_CONFIG" = "x"; then
	AC_MSG_ERROR(pkg-config not found.)
	fi

	: #NOP
	m4_ifdef(
	[PKG_CHECK_MODULES],
	[
	PKG_CHECK_MODULES([SSL], [libssl],, [AC_MSG_ERROR(openssl not found.)])
	PKG_CHECK_MODULES([CRYPTO], [libcrypto],,[AC_MSG_ERROR(libcrypto not found.)])
	BITCOIN_QT_CHECK([PKG_CHECK_MODULES([PROTOBUF], [protobuf], [have_protobuf=yes], [BITCOIN_QT_FAIL(libprotobuf not found)])])
	if test x$use_qr != xno; then
	BITCOIN_QT_CHECK([PKG_CHECK_MODULES([QR], [libqrencode], [have_qrencode=yes], [have_qrencode=no])])
	fi
	if test x$build_bitcoin_utils$build_bitcoind$bitcoin_enable_qt$use_tests != xnononono; then
	PKG_CHECK_MODULES([EVENT], [libevent],, [AC_MSG_ERROR(libevent not found.)])
	if test x$TARGET_OS != xwindows; then
	PKG_CHECK_MODULES([EVENT_PTHREADS], [libevent_pthreads],, [AC_MSG_ERROR(libevent_pthreads not found.)])
	fi
	fi
	]
	)
	else
	AC_CHECK_HEADER([openssl/crypto.h],,AC_MSG_ERROR(libcrypto headers missing))
	AC_CHECK_LIB([crypto], [main],CRYPTO_LIBS=-lcrypto, AC_MSG_ERROR(libcrypto missing))

	AC_CHECK_HEADER([openssl/ssl.h],, AC_MSG_ERROR(libssl headers missing),)
	AC_CHECK_LIB([ssl], [main],SSL_LIBS=-lssl, AC_MSG_ERROR(libssl missing))

	if test x$build_bitcoin_utils$build_bitcoind$bitcoin_enable_qt$use_tests != xnononono; then
	AC_CHECK_HEADER([event2/event.h],, AC_MSG_ERROR(libevent headers missing),)
	AC_CHECK_LIB([event],[main],EVENT_LIBS=-levent,AC_MSG_ERROR(libevent missing))
	if test x$TARGET_OS != xwindows; then
	AC_CHECK_LIB([event_pthreads],[main],EVENT_PTHREADS_LIBS=-levent_pthreads,AC_MSG_ERROR(libevent_pthreads missing))
	fi
	fi

	BITCOIN_QT_CHECK(AC_CHECK_LIB([protobuf] ,[main],[PROTOBUF_LIBS=-lprotobuf], BITCOIN_QT_FAIL(libprotobuf not found)))
	if test x$use_qr != xno; then
	BITCOIN_QT_CHECK([AC_CHECK_LIB([qrencode], [main],[QR_LIBS=-lqrencode], [have_qrencode=no])])
	BITCOIN_QT_CHECK([AC_CHECK_HEADER([qrencode.h],, have_qrencode=no)])
	fi
	fi

	CFLAGS_TEMP="$CFLAGS"
	LIBS_TEMP="$LIBS"
	CFLAGS="$CFLAGS $SSL_CFLAGS $CRYPTO_CFLAGS"
	LIBS="$LIBS $SSL_LIBS $CRYPTO_LIBS"
	AC_CHECK_HEADER([openssl/ec.h],, AC_MSG_ERROR(OpenSSL ec header missing),)

	AC_MSG_CHECKING(for a supported OpenSSL version)
	AC_LINK_IFELSE([AC_LANG_PROGRAM([[
	#include <openssl/rand.h>
	]],
	[[RAND_egd(NULL);]])],
	[AC_MSG_RESULT(yes)],
	[
	AC_ARG_WITH([libressl],
	[AS_HELP_STRING([--with-libressl],[Build with system LibreSSL (default is no; DANGEROUS; NOT SUPPORTED)])],
	[AC_MSG_WARN([Detected LibreSSL: This is NOT supported, and may break consensus compatibility!])],
	[AC_MSG_ERROR([Detected LibreSSL: This is NOT supported, and may break consensus compatibility!])]
	)]
	)

	CFLAGS="$CFLAGS_TEMP"
	LIBS="$LIBS_TEMP"

	BITCOIN_QT_PATH_PROGS([PROTOC], [protoc],$protoc_bin_path)

	AC_MSG_CHECKING([whether to build bitcoind])
	AM_CONDITIONAL([BUILD_BITCOIND], [test x$build_bitcoind = xyes])
	AC_MSG_RESULT($build_bitcoind)

	AC_MSG_CHECKING([whether to build utils (bitcoin-cli bitcoin-tx)])
	AM_CONDITIONAL([BUILD_BITCOIN_UTILS], [test x$build_bitcoin_utils = xyes])
	AC_MSG_RESULT($build_bitcoin_utils)

	AC_MSG_CHECKING([whether to build libraries])
	AM_CONDITIONAL([BUILD_BITCOIN_LIBS], [test x$build_bitcoin_libs = xyes])
	if test x$build_bitcoin_libs = xyes; then
	AC_DEFINE(HAVE_CONSENSUS_LIB, 1, [Define this symbol if the consensus lib has been built])
	AC_CONFIG_FILES([libbitcoinconsensus.pc:libbitcoinconsensus.pc.in])
	fi
	AC_MSG_RESULT($build_bitcoin_libs)

	AC_LANG_POP

	if test "x$use_ccache" != "xno"; then
	AC_MSG_CHECKING(if ccache should be used)
	if test x$CCACHE = x; then
	if test "x$use_ccache" = "xyes"; then
	AC_MSG_ERROR([ccache not found.]);
	else
	use_ccache=no
	fi
	else
	use_ccache=yes
	CC="$ac_cv_path_CCACHE $CC"
	CXX="$ac_cv_path_CCACHE $CXX"
	fi
	AC_MSG_RESULT($use_ccache)
	fi
	if test "x$use_ccache" = "xyes"; then
	AX_CHECK_PREPROC_FLAG([-Qunused-arguments],[CPPFLAGS="-Qunused-arguments $CPPFLAGS"])
	fi

	dnl enable wallet
	AC_MSG_CHECKING([if wallet should be enabled])
	if test x$enable_wallet != xno; then
	AC_MSG_RESULT(yes)
	AC_DEFINE_UNQUOTED([ENABLE_WALLET],[1],[Define to 1 to enable wallet functions])

	else
	AC_MSG_RESULT(no)
	fi

	dnl enable upnp support
	AC_MSG_CHECKING([whether to build with support for UPnP])
	if test x$have_miniupnpc = xno; then
	if test x$use_upnp = xyes; then
	AC_MSG_ERROR("UPnP requested but cannot be built. use --without-miniupnpc")
	fi
	AC_MSG_RESULT(no)
	else
	if test x$use_upnp != xno; then
	AC_MSG_RESULT(yes)
	AC_MSG_CHECKING([whether to build with UPnP enabled by default])
	use_upnp=yes
	upnp_setting=0
	if test x$use_upnp_default != xno; then
	use_upnp_default=yes
	upnp_setting=1
	fi
	AC_MSG_RESULT($use_upnp_default)
	AC_DEFINE_UNQUOTED([USE_UPNP],[$upnp_setting],[UPnP support not compiled if undefined, otherwise value (0 or 1) determines default state])
	if test x$TARGET_OS = xwindows; then
	MINIUPNPC_CPPFLAGS="-DSTATICLIB -DMINIUPNP_STATICLIB"
	fi
	else
	AC_MSG_RESULT(no)
	fi
	fi

	dnl these are only used when qt is enabled
	if test x$bitcoin_enable_qt != xno; then
	BUILD_QT=qt
	dnl enable dbus support
	AC_MSG_CHECKING([whether to build GUI with support for D-Bus])
	if test x$bitcoin_enable_qt_dbus != xno; then
	AC_DEFINE([USE_DBUS],[1],[Define if dbus support should be compiled in])
	fi
	AC_MSG_RESULT($bitcoin_enable_qt_dbus)

	dnl enable qr support
	AC_MSG_CHECKING([whether to build GUI with support for QR codes])
	if test x$have_qrencode = xno; then
	if test x$use_qr = xyes; then
	AC_MSG_ERROR("QR support requested but cannot be built. use --without-qrencode")
	fi
	AC_MSG_RESULT(no)
	else
	if test x$use_qr != xno; then
	AC_MSG_RESULT(yes)
	AC_DEFINE([USE_QRCODE],[1],[Define if QR support should be compiled in])
	use_qr=yes
	else
	AC_MSG_RESULT(no)
	fi
	fi

	if test x$XGETTEXT = x; then
	AC_MSG_WARN("xgettext is required to update qt translations")
	fi

	AC_MSG_CHECKING([whether to build test_bitcoin-qt])
	if test x$use_tests$bitcoin_enable_qt_test = xyesyes; then
	AC_MSG_RESULT([yes])
	BUILD_TEST_QT="test"
	else
	AC_MSG_RESULT([no])
	fi
	fi

	# conditional search for and use libzmq
	AC_MSG_CHECKING([whether to build ZMQ support])
	if test "x$use_zmq" = "xyes"; then
	AC_MSG_RESULT([yes])
	PKG_CHECK_MODULES([ZMQ],[libzmq],
	[AC_DEFINE([ENABLE_ZMQ],[1],[Define to 1 to enable ZMQ functions])],
	[AC_DEFINE([ENABLE_ZMQ],[0],[Define to 1 to enable ZMQ functions])
	AC_MSG_WARN([libzmq not found, disabling])
	use_zmq=no])
	else
	AC_MSG_RESULT([no, --disable-zmq used])
	AC_DEFINE_UNQUOTED([ENABLE_ZMQ],[0],[Define to 1 to enable ZMQ functions])
	fi

	AM_CONDITIONAL([ENABLE_ZMQ], [test "x$use_zmq" = "xyes"])

	AC_MSG_CHECKING([whether to build test_bitcoin])
	if test x$use_tests = xyes; then
	AC_MSG_RESULT([yes])
	BUILD_TEST="test"
	else
	AC_MSG_RESULT([no])
	fi

	AC_MSG_CHECKING([whether to reduce exports])
	if test x$use_reduce_exports = xyes; then
	AC_MSG_RESULT([yes])
	else
	AC_MSG_RESULT([no])
	fi

	if test x$build_bitcoin_utils$build_bitcoin_libs$build_bitcoind$bitcoin_enable_qt$use_tests = xnonononono; then
	AC_MSG_ERROR([No targets! Please specify at least one of: --with-utils --with-libs --with-daemon --with-gui or --enable-tests])
	fi

	AM_CONDITIONAL([TARGET_DARWIN], [test x$TARGET_OS = xdarwin])
	AM_CONDITIONAL([BUILD_DARWIN], [test x$BUILD_OS = xdarwin])
	AM_CONDITIONAL([TARGET_WINDOWS], [test x$TARGET_OS = xwindows])
	AM_CONDITIONAL([ENABLE_WALLET],[test x$enable_wallet = xyes])
	AM_CONDITIONAL([ENABLE_TESTS],[test x$use_tests = xyes])
	AM_CONDITIONAL([ENABLE_QT],[test x$bitcoin_enable_qt = xyes])
	AM_CONDITIONAL([ENABLE_QT_TESTS],[test x$use_tests$bitcoin_enable_qt_test = xyesyes])
	+AM_CONDITIONAL([ENABLE_BENCH],[test x$use_bench = xyes])
	AM_CONDITIONAL([USE_QRCODE], [test x$use_qr = xyes])
	AM_CONDITIONAL([USE_LCOV],[test x$use_lcov = xyes])
	AM_CONDITIONAL([USE_COMPARISON_TOOL],[test x$use_comparison_tool != xno])
	AM_CONDITIONAL([USE_COMPARISON_TOOL_REORG_TESTS],[test x$use_comparison_tool_reorg_test != xno])
	AM_CONDITIONAL([GLIBC_BACK_COMPAT],[test x$use_glibc_compat = xyes])

	AC_DEFINE(CLIENT_VERSION_MAJOR, _CLIENT_VERSION_MAJOR, [Major version])
	AC_DEFINE(CLIENT_VERSION_MINOR, _CLIENT_VERSION_MINOR, [Minor version])
	AC_DEFINE(CLIENT_VERSION_REVISION, _CLIENT_VERSION_REVISION, [Build revision])
	AC_DEFINE(CLIENT_VERSION_BUILD, _CLIENT_VERSION_BUILD, [Version Build])
	AC_DEFINE(CLIENT_VERSION_IS_RELEASE, _CLIENT_VERSION_IS_RELEASE, [Version is release])
	AC_DEFINE(COPYRIGHT_YEAR, _COPYRIGHT_YEAR, [Version is release])
	AC_SUBST(CLIENT_VERSION_MAJOR, _CLIENT_VERSION_MAJOR)
	AC_SUBST(CLIENT_VERSION_MINOR, _CLIENT_VERSION_MINOR)
	AC_SUBST(CLIENT_VERSION_REVISION, _CLIENT_VERSION_REVISION)
	AC_SUBST(CLIENT_VERSION_BUILD, _CLIENT_VERSION_BUILD)
	AC_SUBST(CLIENT_VERSION_IS_RELEASE, _CLIENT_VERSION_IS_RELEASE)
	AC_SUBST(COPYRIGHT_YEAR, _COPYRIGHT_YEAR)

	AC_SUBST(RELDFLAGS)
	AC_SUBST(LIBTOOL_APP_LDFLAGS)
	AC_SUBST(USE_UPNP)
	AC_SUBST(USE_QRCODE)
	AC_SUBST(BOOST_LIBS)
	AC_SUBST(TESTDEFS)
	AC_SUBST(LEVELDB_TARGET_FLAGS)
	AC_SUBST(BUILD_TEST)
	AC_SUBST(BUILD_QT)
	AC_SUBST(BUILD_TEST_QT)
	AC_SUBST(MINIUPNPC_CPPFLAGS)
	AC_SUBST(MINIUPNPC_LIBS)
	AC_CONFIG_FILES([Makefile src/Makefile share/setup.nsi share/qt/Info.plist src/test/buildenv.py])
	AC_CONFIG_FILES([qa/pull-tester/run-bitcoind-for-test.sh],[chmod +x qa/pull-tester/run-bitcoind-for-test.sh])
	AC_CONFIG_FILES([qa/pull-tester/tests-config.sh],[chmod +x qa/pull-tester/tests-config.sh])

	dnl boost's m4 checks do something really nasty: they export these vars. As a
	dnl result, they leak into secp256k1's configure and crazy things happen.
	dnl Until this is fixed upstream and we've synced, we'll just un-export them.
	CPPFLAGS_TEMP="$CPPFLAGS"
	unset CPPFLAGS
	CPPFLAGS="$CPPFLAGS_TEMP"

	LDFLAGS_TEMP="$LDFLAGS"
	unset LDFLAGS
	LDFLAGS="$LDFLAGS_TEMP"

	LIBS_TEMP="$LIBS"
	unset LIBS
	LIBS="$LIBS_TEMP"

	PKGCONFIG_PATH_TEMP="$PKG_CONFIG_PATH"
	unset PKG_CONFIG_PATH
	PKG_CONFIG_PATH="$PKGCONFIG_PATH_TEMP"

	PKGCONFIG_LIBDIR_TEMP="$PKG_CONFIG_LIBDIR"
	unset PKG_CONFIG_LIBDIR
	PKG_CONFIG_LIBDIR="$PKGCONFIG_LIBDIR_TEMP"

	ac_configure_args="${ac_configure_args} --disable-shared --with-pic --with-bignum=no"
	AC_CONFIG_SUBDIRS([src/secp256k1])

	AC_OUTPUT

	dnl Taken from https://wiki.debian.org/RpathIssue
	case $host in
	--linux-gnu)
	AC_MSG_RESULT([Fixing libtool for -rpath problems.])
	sed < libtool > libtool-2 \
	's/^hardcode_libdir_flag_spec.*$'/'hardcode_libdir_flag_spec=" -D__LIBTOOL_IS_A_FOOL__ "/'
	mv libtool-2 libtool
	chmod 755 libtool
	;;
	esac
	diff --git a/src/Makefile.am b/src/Makefile.am
	index 67e848be3..45346df95 100644
	--- a/src/Makefile.am
	+++ b/src/Makefile.am
	@@ -1,454 +1,459 @@
	DIST_SUBDIRS = secp256k1
	AM_LDFLAGS = $(PTHREAD_CFLAGS) $(LIBTOOL_LDFLAGS)


	if EMBEDDED_LEVELDB
	LEVELDB_CPPFLAGS += -I$(srcdir)/leveldb/include
	LEVELDB_CPPFLAGS += -I$(srcdir)/leveldb/helpers/memenv
	LIBLEVELDB += $(builddir)/leveldb/libleveldb.a
	LIBMEMENV += $(builddir)/leveldb/libmemenv.a

	# NOTE: This dependency is not strictly necessary, but without it make may try to build both in parallel, which breaks the LevelDB build system in a race
	$(LIBLEVELDB): $(LIBMEMENV)

	$(LIBLEVELDB) $(LIBMEMENV):
	@echo "Building LevelDB ..." && $(MAKE) -C $(@D) $(@F) CXX="$(CXX)" \
	CC="$(CC)" PLATFORM=$(TARGET_OS) AR="$(AR)" $(LEVELDB_TARGET_FLAGS) \
	OPT="$(CXXFLAGS) $(CPPFLAGS) -D__STDC_LIMIT_MACROS"
	endif

	BITCOIN_CONFIG_INCLUDES=-I$(builddir)/config
	BITCOIN_INCLUDES=-I$(builddir) -I$(builddir)/obj $(BOOST_CPPFLAGS) $(LEVELDB_CPPFLAGS) $(CRYPTO_CFLAGS) $(SSL_CFLAGS)

	BITCOIN_INCLUDES += -I$(srcdir)/secp256k1/include

	LIBBITCOIN_SERVER=libbitcoin_server.a
	LIBBITCOIN_WALLET=libbitcoin_wallet.a
	LIBBITCOIN_COMMON=libbitcoin_common.a
	LIBBITCOIN_CLI=libbitcoin_cli.a
	LIBBITCOIN_UTIL=libbitcoin_util.a
	LIBBITCOIN_CRYPTO=crypto/libbitcoin_crypto.a
	LIBBITCOIN_UNIVALUE=univalue/libbitcoin_univalue.a
	LIBBITCOINQT=qt/libbitcoinqt.a
	LIBSECP256K1=secp256k1/libsecp256k1.la

	$(LIBSECP256K1): $(wildcard secp256k1/src/) $(wildcard secp256k1/include/)
	$(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F)

	# Make is not made aware of per-object dependencies to avoid limiting building parallelization
	# But to build the less dependent modules first, we manually select their order here:
	EXTRA_LIBRARIES = \
	crypto/libbitcoin_crypto.a \
	libbitcoin_util.a \
	libbitcoin_common.a \
	univalue/libbitcoin_univalue.a \
	libbitcoin_server.a \
	libbitcoin_cli.a
	if ENABLE_WALLET
	BITCOIN_INCLUDES += $(BDB_CPPFLAGS)
	EXTRA_LIBRARIES += libbitcoin_wallet.a
	endif
	if ENABLE_ZMQ
	EXTRA_LIBRARIES += libbitcoin_zmq.a
	endif

	if BUILD_BITCOIN_LIBS
	lib_LTLIBRARIES = libbitcoinconsensus.la
	LIBBITCOIN_CONSENSUS=libbitcoinconsensus.la
	else
	LIBBITCOIN_CONSENSUS=
	endif

	bin_PROGRAMS =
	TESTS =
	+BENCHMARKS =

	if BUILD_BITCOIND
	bin_PROGRAMS += bitcoind
	endif

	if BUILD_BITCOIN_UTILS
	bin_PROGRAMS += bitcoin-cli bitcoin-tx
	endif

	.PHONY: FORCE
	# bitcoin core #
	BITCOIN_CORE_H = \
	addrman.h \
	alert.h \
	amount.h \
	arith_uint256.h \
	base58.h \
	bloom.h \
	chain.h \
	chainparams.h \
	chainparamsbase.h \
	chainparamsseeds.h \
	checkpoints.h \
	checkqueue.h \
	clientversion.h \
	coincontrol.h \
	coins.h \
	compat.h \
	compat/byteswap.h \
	compat/endian.h \
	compat/sanity.h \
	compressor.h \
	consensus/consensus.h \
	consensus/params.h \
	consensus/validation.h \
	core_io.h \
	core_memusage.h \
	eccryptoverify.h \
	ecwrapper.h \
	hash.h \
	httprpc.h \
	httpserver.h \
	init.h \
	key.h \
	keystore.h \
	leveldbwrapper.h \
	limitedmap.h \
	main.h \
	memusage.h \
	merkleblock.h \
	miner.h \
	mruset.h \
	net.h \
	netbase.h \
	noui.h \
	policy/fees.h \
	policy/policy.h \
	pow.h \
	primitives/block.h \
	primitives/transaction.h \
	protocol.h \
	pubkey.h \
	random.h \
	reverselock.h \
	rpcclient.h \
	rpcprotocol.h \
	rpcserver.h \
	scheduler.h \
	script/interpreter.h \
	script/script.h \
	script/script_error.h \
	script/sigcache.h \
	script/sign.h \
	script/standard.h \
	serialize.h \
	streams.h \
	support/allocators/secure.h \
	support/allocators/zeroafterfree.h \
	support/cleanse.h \
	support/pagelocker.h \
	sync.h \
	threadsafety.h \
	timedata.h \
	tinyformat.h \
	txdb.h \
	txmempool.h \
	ui_interface.h \
	uint256.h \
	undo.h \
	util.h \
	utilmoneystr.h \
	utilstrencodings.h \
	utiltime.h \
	validationinterface.h \
	version.h \
	wallet/crypter.h \
	wallet/db.h \
	wallet/wallet.h \
	wallet/wallet_ismine.h \
	wallet/walletdb.h \
	zmq/zmqabstractnotifier.h \
	zmq/zmqconfig.h\
	zmq/zmqnotificationinterface.h \
	zmq/zmqpublishnotifier.h


	obj/build.h: FORCE
	@$(MKDIR_P) $(builddir)/obj
	@$(top_srcdir)/share/genbuild.sh $(abs_top_builddir)/src/obj/build.h \
	$(abs_top_srcdir)
	libbitcoin_util_a-clientversion.$(OBJEXT): obj/build.h

	# server: shared between bitcoind and bitcoin-qt
	libbitcoin_server_a_CPPFLAGS = $(BITCOIN_INCLUDES) $(MINIUPNPC_CPPFLAGS) $(EVENT_CFLAGS) $(EVENT_PTHREADS_CFLAGS)
	libbitcoin_server_a_SOURCES = \
	addrman.cpp \
	alert.cpp \
	bloom.cpp \
	chain.cpp \
	checkpoints.cpp \
	httprpc.cpp \
	httpserver.cpp \
	init.cpp \
	leveldbwrapper.cpp \
	main.cpp \
	merkleblock.cpp \
	miner.cpp \
	net.cpp \
	noui.cpp \
	policy/fees.cpp \
	policy/policy.cpp \
	pow.cpp \
	rest.cpp \
	rpcblockchain.cpp \
	rpcmining.cpp \
	rpcmisc.cpp \
	rpcnet.cpp \
	rpcrawtransaction.cpp \
	rpcserver.cpp \
	script/sigcache.cpp \
	timedata.cpp \
	txdb.cpp \
	txmempool.cpp \
	validationinterface.cpp \
	$(BITCOIN_CORE_H)

	if ENABLE_ZMQ
	LIBBITCOIN_ZMQ=libbitcoin_zmq.a

	libbitcoin_zmq_a_CPPFLAGS = $(BITCOIN_INCLUDES)
	libbitcoin_zmq_a_SOURCES = \
	zmq/zmqabstractnotifier.cpp \
	zmq/zmqnotificationinterface.cpp \
	zmq/zmqpublishnotifier.cpp
	endif


	# wallet: shared between bitcoind and bitcoin-qt, but only linked
	# when wallet enabled
	libbitcoin_wallet_a_CPPFLAGS = $(BITCOIN_INCLUDES)
	libbitcoin_wallet_a_SOURCES = \
	wallet/crypter.cpp \
	wallet/db.cpp \
	wallet/rpcdump.cpp \
	wallet/rpcwallet.cpp \
	wallet/wallet.cpp \
	wallet/wallet_ismine.cpp \
	wallet/walletdb.cpp \
	$(BITCOIN_CORE_H)

	# crypto primitives library
	crypto_libbitcoin_crypto_a_CPPFLAGS = $(BITCOIN_CONFIG_INCLUDES)
	crypto_libbitcoin_crypto_a_SOURCES = \
	crypto/common.h \
	crypto/hmac_sha256.cpp \
	crypto/hmac_sha256.h \
	crypto/hmac_sha512.cpp \
	crypto/hmac_sha512.h \
	crypto/ripemd160.cpp \
	crypto/ripemd160.h \
	crypto/sha1.cpp \
	crypto/sha1.h \
	crypto/sha256.cpp \
	crypto/sha256.h \
	crypto/sha512.cpp \
	crypto/sha512.h

	# univalue JSON library
	univalue_libbitcoin_univalue_a_SOURCES = \
	univalue/univalue.cpp \
	univalue/univalue.h \
	univalue/univalue_escapes.h \
	univalue/univalue_read.cpp \
	univalue/univalue_write.cpp

	# common: shared between bitcoind, and bitcoin-qt and non-server tools
	libbitcoin_common_a_CPPFLAGS = $(BITCOIN_INCLUDES)
	libbitcoin_common_a_SOURCES = \
	amount.cpp \
	arith_uint256.cpp \
	base58.cpp \
	chainparams.cpp \
	coins.cpp \
	compressor.cpp \
	core_read.cpp \
	core_write.cpp \
	eccryptoverify.cpp \
	ecwrapper.cpp \
	hash.cpp \
	key.cpp \
	keystore.cpp \
	netbase.cpp \
	primitives/block.cpp \
	primitives/transaction.cpp \
	protocol.cpp \
	pubkey.cpp \
	scheduler.cpp \
	script/interpreter.cpp \
	script/script.cpp \
	script/script_error.cpp \
	script/sign.cpp \
	script/standard.cpp \
	$(BITCOIN_CORE_H)

	# util: shared between all executables.
	# This library must be included to make sure that the glibc
	# backward-compatibility objects and their sanity checks are linked.
	libbitcoin_util_a_CPPFLAGS = $(BITCOIN_INCLUDES)
	libbitcoin_util_a_SOURCES = \
	support/pagelocker.cpp \
	chainparamsbase.cpp \
	clientversion.cpp \
	compat/glibc_sanity.cpp \
	compat/glibcxx_sanity.cpp \
	compat/strnlen.cpp \
	random.cpp \
	rpcprotocol.cpp \
	support/cleanse.cpp \
	sync.cpp \
	uint256.cpp \
	util.cpp \
	utilmoneystr.cpp \
	utilstrencodings.cpp \
	utiltime.cpp \
	$(BITCOIN_CORE_H)

	if GLIBC_BACK_COMPAT
	libbitcoin_util_a_SOURCES += compat/glibc_compat.cpp
	endif

	# cli: shared between bitcoin-cli and bitcoin-qt
	libbitcoin_cli_a_CPPFLAGS = $(BITCOIN_INCLUDES)
	libbitcoin_cli_a_SOURCES = \
	rpcclient.cpp \
	$(BITCOIN_CORE_H)

	nodist_libbitcoin_util_a_SOURCES = $(srcdir)/obj/build.h
	#

	# bitcoind binary #
	bitcoind_SOURCES = bitcoind.cpp
	bitcoind_CPPFLAGS = $(BITCOIN_INCLUDES)
	bitcoind_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS)

	if TARGET_WINDOWS
	bitcoind_SOURCES += bitcoind-res.rc
	endif

	bitcoind_LDADD = \
	$(LIBBITCOIN_SERVER) \
	$(LIBBITCOIN_COMMON) \
	$(LIBBITCOIN_UNIVALUE) \
	$(LIBBITCOIN_UTIL) \
	$(LIBBITCOIN_CRYPTO) \
	$(LIBLEVELDB) \
	$(LIBMEMENV) \
	$(LIBSECP256K1)

	if ENABLE_ZMQ
	bitcoind_LDADD += $(LIBBITCOIN_ZMQ) $(ZMQ_LIBS)
	endif

	if ENABLE_WALLET
	bitcoind_LDADD += libbitcoin_wallet.a
	endif

	bitcoind_LDADD += $(BOOST_LIBS) $(BDB_LIBS) $(SSL_LIBS) $(CRYPTO_LIBS) $(MINIUPNPC_LIBS) $(EVENT_PTHREADS_LIBS) $(EVENT_LIBS)

	# bitcoin-cli binary #
	bitcoin_cli_SOURCES = bitcoin-cli.cpp
	bitcoin_cli_CPPFLAGS = $(BITCOIN_INCLUDES) $(EVENT_CFLAGS)
	bitcoin_cli_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS)

	if TARGET_WINDOWS
	bitcoin_cli_SOURCES += bitcoin-cli-res.rc
	endif

	bitcoin_cli_LDADD = \
	$(LIBBITCOIN_CLI) \
	$(LIBBITCOIN_UNIVALUE) \
	$(LIBBITCOIN_UTIL) \
	$(LIBSECP256K1)

	bitcoin_cli_LDADD += $(BOOST_LIBS) $(SSL_LIBS) $(CRYPTO_LIBS) $(EVENT_LIBS)
	#

	# bitcoin-tx binary #
	bitcoin_tx_SOURCES = bitcoin-tx.cpp
	bitcoin_tx_CPPFLAGS = $(BITCOIN_INCLUDES)
	bitcoin_tx_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS)

	if TARGET_WINDOWS
	bitcoin_tx_SOURCES += bitcoin-tx-res.rc
	endif

	bitcoin_tx_LDADD = \
	$(LIBBITCOIN_UNIVALUE) \
	$(LIBBITCOIN_COMMON) \
	$(LIBBITCOIN_UTIL) \
	$(LIBBITCOIN_CRYPTO) \
	$(LIBSECP256K1)

	bitcoin_tx_LDADD += $(BOOST_LIBS) $(CRYPTO_LIBS)
	#

	# bitcoinconsensus library #
	if BUILD_BITCOIN_LIBS
	include_HEADERS = script/bitcoinconsensus.h
	libbitcoinconsensus_la_SOURCES = \
	crypto/hmac_sha512.cpp \
	crypto/ripemd160.cpp \
	crypto/sha1.cpp \
	crypto/sha256.cpp \
	crypto/sha512.cpp \
	eccryptoverify.cpp \
	ecwrapper.cpp \
	hash.cpp \
	primitives/transaction.cpp \
	pubkey.cpp \
	script/bitcoinconsensus.cpp \
	script/interpreter.cpp \
	script/script.cpp \
	uint256.cpp \
	utilstrencodings.cpp

	if GLIBC_BACK_COMPAT
	libbitcoinconsensus_la_SOURCES += compat/glibc_compat.cpp
	endif

	libbitcoinconsensus_la_LDFLAGS = -no-undefined $(RELDFLAGS)
	libbitcoinconsensus_la_LIBADD = $(CRYPTO_LIBS)
	libbitcoinconsensus_la_CPPFLAGS = $(CRYPTO_CFLAGS) -I$(builddir)/obj -DBUILD_BITCOIN_INTERNAL

	endif
	#

	CLEANFILES = leveldb/libleveldb.a leveldb/libmemenv.a .gcda .gcno

	DISTCLEANFILES = obj/build.h

	EXTRA_DIST = leveldb

	clean-local:
	-$(MAKE) -C leveldb clean
	-$(MAKE) -C secp256k1 clean
	rm -f leveldb//.gcno leveldb/helpers/memenv/*.gcno
	-rm -f config.h

	.rc.o:
	@test -f $(WINDRES)
	$(AM_V_GEN) $(WINDRES) -DWINDRES_PREPROC -i $< -o $@

	.mm.o:
	$(AM_V_CXX) $(OBJCXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
	$(CPPFLAGS) $(AM_CXXFLAGS) $(QT_INCLUDES) $(CXXFLAGS) -c -o $@ $<

	%.pb.cc %.pb.h: %.proto
	@test -f $(PROTOC)
	$(AM_V_GEN) $(PROTOC) --cpp_out=$(@D) --proto_path=$(abspath $(<D) $<)

	if ENABLE_TESTS
	include Makefile.test.include
	endif

	+if ENABLE_BENCH
	+include Makefile.bench.include
	+endif
	+
	if ENABLE_QT
	include Makefile.qt.include
	endif

	if ENABLE_QT_TESTS
	include Makefile.qttest.include
	endif
	diff --git a/src/Makefile.bench.include b/src/Makefile.bench.include
	new file mode 100644
	index 000000000..126e3a102
	--- /dev/null
	+++ b/src/Makefile.bench.include
	@@ -0,0 +1,45 @@
	+bin_PROGRAMS += bench/bench_bitcoin
	+BENCH_SRCDIR = bench
	+BENCH_BINARY = bench/bench_bitcoin$(EXEEXT)
	+
	+
	+bench_bench_bitcoin_SOURCES = \
	+ bench/bench_bitcoin.cpp \
	+ bench/bench.cpp \
	+ bench/bench.h \
	+ bench/MilliSleep.cpp
	+
	+bench_bench_bitcoin_CPPFLAGS = $(BITCOIN_INCLUDES) $(EVENT_CLFAGS) $(EVENT_PTHREADS_CFLAGS) -I$(builddir)/bench/
	+bench_bench_bitcoin_LDADD = \
	+ $(LIBBITCOIN_SERVER) \
	+ $(LIBBITCOIN_COMMON) \
	+ $(LIBBITCOIN_UNIVALUE) \
	+ $(LIBBITCOIN_UTIL) \
	+ $(LIBBITCOIN_CRYPTO) \
	+ $(LIBLEVELDB) \
	+ $(LIBMEMENV) \
	+ $(LIBSECP256K1)
	+
	+if ENABLE_ZMQ
	+bench_bench_bitcoin_LDADD += $(LIBBITCOIN_ZMQ) $(ZMQ_LIBS)
	+endif
	+
	+if ENABLE_WALLET
	+bench_bench_bitcoin_LDADD += $(LIBBITCOIN_WALLET)
	+endif
	+
	+bench_bench_bitcoin_LDADD += $(BOOST_LIBS) $(BDB_LIBS) $(SSL_LIBS) $(CRYPTO_LIBS) $(MINIUPNPC_LIBS) $(EVENT_PTHREADS_LIBS) $(EVENT_LIBS)
	+bench_bench_bitcoin_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS)
	+
	+
	+CLEAN_BITCOIN_BENCH = bench/.gcda bench/.gcno
	+
	+CLEANFILES += $(CLEAN_BITCOIN_BENCH)
	+
	+bitcoin_bench: $(BENCH_BINARY)
	+
	+bench: $(BENCH_BINARY) FORCE
	+ $(BENCH_BINARY)
	+
	+bitcoin_bench_clean : FORCE
	+ rm -f $(CLEAN_BITCOIN_BENCH) $(bench_bench_bitcoin_OBJECTS) $(BENCH_BINARY)
	diff --git a/src/bench/MilliSleep.cpp b/src/bench/MilliSleep.cpp
	new file mode 100644
	index 000000000..991397a23
	--- /dev/null
	+++ b/src/bench/MilliSleep.cpp
	@@ -0,0 +1,16 @@
	+// Copyright (c) 2015 The Bitcoin Core developers
	+// Distributed under the MIT software license, see the accompanying
	+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
	+
	+#include "bench.h"
	+#include "main.h"
	+#include "utiltime.h"
	+
	+static void Sleep100ms(benchmark::State& state)
	+{
	+ while (state.KeepRunning()) {
	+ MilliSleep(100);
	+ }
	+}
	+
	+BENCHMARK(Sleep100ms);
	diff --git a/src/bench/bench.cpp b/src/bench/bench.cpp
	new file mode 100644
	index 000000000..572080760
	--- /dev/null
	+++ b/src/bench/bench.cpp
	@@ -0,0 +1,60 @@
	+// Copyright (c) 2015 The Bitcoin Core developers
	+// Distributed under the MIT software license, see the accompanying
	+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
	+#include "bench.h"
	+#include <iostream>
	+#include <sys/time.h>
	+
	+using namespace benchmark;
	+
	+std::map<std::string, BenchFunction> BenchRunner::benchmarks;
	+
	+static double gettimedouble(void) {
	+ struct timeval tv;
	+ gettimeofday(&tv, NULL);
	+ return tv.tv_usec * 0.000001 + tv.tv_sec;
	+}
	+
	+BenchRunner::BenchRunner(std::string name, BenchFunction func)
	+{
	+ benchmarks.insert(std::make_pair(name, func));
	+}
	+
	+void
	+BenchRunner::RunAll(double elapsedTimeForOne)
	+{
	+ std::cout << "Benchmark" << "," << "count" << "," << "min" << "," << "max" << "," << "average" << "\n";
	+
	+ for (std::map<std::string,BenchFunction>::iterator it = benchmarks.begin();
	+ it != benchmarks.end(); ++it) {
	+
	+ State state(it->first, elapsedTimeForOne);
	+ BenchFunction& func = it->second;
	+ func(state);
	+ }
	+}
	+
	+bool State::KeepRunning()
	+{
	+ double now = gettimedouble();
	+ if (count == 0) {
	+ beginTime = now;
	+ }
	+ else {
	+ double elapsedOne = now - lastTime;
	+ if (elapsedOne < minTime) minTime = elapsedOne;
	+ if (elapsedOne > maxTime) maxTime = elapsedOne;
	+ }
	+ lastTime = now;
	+ ++count;
	+
	+ if (now - beginTime < maxElapsed) return true; // Keep going
	+
	+ --count;
	+
	+ // Output results
	+ double average = (now-beginTime)/count;
	+ std::cout << name << "," << count << "," << minTime << "," << maxTime << "," << average << "\n";
	+
	+ return false;
	+}
	diff --git a/src/bench/bench.h b/src/bench/bench.h
	new file mode 100644
	index 000000000..fee9b8c38
	--- /dev/null
	+++ b/src/bench/bench.h
	@@ -0,0 +1,69 @@
	+// Copyright (c) 2015 The Bitcoin Core developers
	+// Distributed under the MIT software license, see the accompanying
	+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
	+#ifndef BITCOIN_BENCH_H
	+#define BITCOIN_BENCH_H
	+
	+// Simple micro-benchmarking framework; API mostly matches a subset of the Google Benchmark
	+// framework (see https://github.com/google/benchmark)
	+// Wny not use the Google Benchmark framework? Because adding Yet Another Dependency
	+// (that uses cmake as its build system and has lots of features we don't need) isn't
	+// worth it.
	+
	+/*
	+ * Usage:
	+
	+static void CODE_TO_TIME(benchmark::State& state)
	+{
	+ ... do any setup needed...
	+ while (state.KeepRunning()) {
	+ ... do stuff you want to time...
	+ }
	+ ... do any cleanup needed...
	+}
	+
	+BENCHMARK(CODE_TO_TIME);
	+
	+ */
	+
	+
	+#include <boost/function.hpp>
	+#include <boost/preprocessor/cat.hpp>
	+#include <boost/preprocessor/stringize.hpp>
	+#include <map>
	+#include <string>
	+
	+namespace benchmark {
	+
	+ class State {
	+ std::string name;
	+ double maxElapsed;
	+ double beginTime;
	+ double lastTime, minTime, maxTime;
	+ int64_t count;
	+ public:
	+ State(std::string _name, double _maxElapsed) : name(_name), maxElapsed(_maxElapsed), count(0) {
	+ minTime = std::numeric_limits<double>::max();
	+ maxTime = std::numeric_limits<double>::min();
	+ }
	+ bool KeepRunning();
	+ };
	+
	+ typedef boost::function<void(State&)> BenchFunction;
	+
	+ class BenchRunner
	+ {
	+ static std::map<std::string, BenchFunction> benchmarks;
	+
	+ public:
	+ BenchRunner(std::string name, BenchFunction func);
	+
	+ static void RunAll(double elapsedTimeForOne=1.0);
	+ };
	+}
	+
	+// BENCHMARK(foo) expands to: benchmark::BenchRunner bench_11foo("foo", foo);
	+#define BENCHMARK(n) \
	+ benchmark::BenchRunner BOOST_PP_CAT(bench_, BOOST_PP_CAT(__LINE__, n))(BOOST_PP_STRINGIZE(n), n);
	+
	+#endif // BITCOIN_BENCH_H
	diff --git a/src/bench/bench_bitcoin.cpp b/src/bench/bench_bitcoin.cpp
	new file mode 100644
	index 000000000..db1402216
	--- /dev/null
	+++ b/src/bench/bench_bitcoin.cpp
	@@ -0,0 +1,21 @@
	+// Copyright (c) 2015 The Bitcoin Core developers
	+// Distributed under the MIT software license, see the accompanying
	+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
	+
	+#include "bench.h"
	+
	+#include "key.h"
	+#include "main.h"
	+#include "util.h"
	+
	+int
	+main(int argc, char** argv)
	+{
	+ ECC_Start();
	+ SetupEnvironment();
	+ fPrintToDebugLog = false; // don't want to write to debug.log file
	+
	+ benchmark::BenchRunner::RunAll();
	+
	+ ECC_Stop();
	+}

File Metadata

Mime Type: text/x-diff
Expires: Tue, May 13, 01:35 (1 d, 2 h)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 5777019
Default Alt Text: (50 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions