Update 9999.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xF52D4BBA

4 files changed, 266 insertions, 25 deletions

diff --git a/dev-util/bitcoin-tx/ChangeLog b/dev-util/bitcoin-tx/ChangeLog
index 78f6b2eda7ec..026e4ef90517 100644
--- a/dev-util/bitcoin-tx/ChangeLog
+++ b/dev-util/bitcoin-tx/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/bitcoin-tx
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/bitcoin-tx/ChangeLog,v 1.4 2015/05/27 00:48:43 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/bitcoin-tx/ChangeLog,v 1.5 2015/07/17 20:15:27 blueness Exp $
+
+  17 Jul 2015; Anthony G. Basile <blueness@gentoo.org>
+  +files/9999-syslibs.patch, bitcoin-tx-9999.ebuild:
+  Update 9999.
 
 *bitcoin-tx-0.10.1 (27 May 2015)
 
diff --git a/dev-util/bitcoin-tx/Manifest b/dev-util/bitcoin-tx/Manifest
index 9797b755e88c..43b18e8ecd6b 100644
--- a/dev-util/bitcoin-tx/Manifest
+++ b/dev-util/bitcoin-tx/Manifest
@@ -2,29 +2,30 @@
 Hash: SHA256
 
 AUX 9999-sys_libsecp256k1.patch 2804 SHA256 ddeb293959184d82beed8bf9117916a28d49c0d0a324287ea026bdcaa7505871 SHA512 970a851f564cddf5ca2ad453ce6ba767b3815be9bcc4dd09c5fba6f42e1b70a9de7438d31e8dcf15875cb4c06ff2f04b0a2361b6b413b2146b2c2c78b908ea17 WHIRLPOOL 634cb832458551b61caf8d852335260ce4f2253a516dddc8b723ce89be05fd4254f4f6b49f8c6697da4120e723a068308d0cdfb57c16c199329cceb83a9be2b1
+AUX 9999-syslibs.patch 9143 SHA256 a91cb64a820e2e0eaa573fc3c7e408d68f344f9f0d25a4ba110d0443cb622bc6 SHA512 595717f059b6ad11dc790a7c2f343ca66fcf237311cbf5f60cd9569624755295d5efb57127cc82bf3e0bb972ee432e0d2211155b26c71546808faa68c78d55df WHIRLPOOL 805ebe3de20d9a417ead593274297d2b074af55cccf63bc73b4a8884f5c27bd0c27d0f8c92636769bce88637677924149ef8b8520e907c64486f7c666f2e1a04
 DIST bitcoin-0.10.0.ljr20150311.patches.tar.xz 34836 SHA256 353b82a933d234daaaed3f807f940a701646c7c9669867fbf5cdb48a1065312c SHA512 dc2a24f141d591f288e846f29a3263dea463f77dda22b92f91e781a8500c695be8b6f497251b6c960e1acdf43e839a7f0bc06fb7a18cdbda90b3d6a61f21c4af WHIRLPOOL 3b898c529e7967750dabcbb235657c19bab0ce75b6f47017ae7bdc7943acb8001cc19eff2d319e1ad405037ecf0674759a575116b1b0c1f32fde89a98f0052a3
 DIST bitcoin-0.10.1.ljr20150428.patches.tar.xz 34980 SHA256 f3770c478bd541fcc75c1f64664ae810aa67da7535f11859034dcc7067546713 SHA512 edf7c8aa81c8890da61224eddde61cec62058514fa76a50ab25cc7db272f6c656f5c46f8b9468f6059eb7c1be624de834867c0a7c1c2559a5231b763e40c13a2 WHIRLPOOL 2b8d878bf3d599393da177403e2199e63bb2634d14438079b5c8821c07441e26fb8b5cd150281c9923534f474763d9f3c2cab9424ab7a319de059c1b3bb49c4e
 DIST bitcoin-v0.10.0.tgz 5022212 SHA256 ecff92e184fac4a96684085590a67554a27db72d0ac235b7cc054887644c0b70 SHA512 f362a9d4ba405c02b2d01024a61b68f984dd6e441ef2254d05bf65cfe803c8b084bd3b14a76a3472251d96087e450091f95f26a691c248836c6d0b43dece8255 WHIRLPOOL 2185413c6d073b0dcb30001c8fb56301390206680ffc6d705ed99e102e68e5c4c1d08c495c38703631696fa9a4a3784befd71acfbec0e94b164bbbfde76158c3
 DIST bitcoin-v0.10.1.tgz 5053846 SHA256 51bff5ba2372ca53782c5fec3d9b4b4226e94b5ac0b1b4b2b5949b97082af256 SHA512 f89330b93f22ba5f393c9a7a48ce28196be0e16468e5d99c459e889c458cc3a7c3f6e4537996571aa8ccb0ebb2eedf80ad028da136a2e08e2f8631f69ac5f2fc WHIRLPOOL 0cfb182f355151cde75601d2260cc92801e2dc1231ae2fca67610e699bb5f0cae826b09f456ca8afa283730954f11a8b180f43ae5a5297d129093fc0f9f53b4e
 EBUILD bitcoin-tx-0.10.0.ebuild 666 SHA256 24773a6b95575de00e7b49f48689e534c6f8682b369d2cc83c6ddaf2cbd39446 SHA512 049b4cc7ea77288ab1b8b5a2f62e535baba9319bdf4336791da5c3bce8855cf5147699ace1a6d63719bfdb3f92cee70f768a36dc5280946fc6a6d3de2e8ae88e WHIRLPOOL 9b8aee45ba45d6afc4e8de34fa8fee69d924c78f773c1c832f68d860a0ff948449dfac7865c15069df2dc42ebc6446dc52424cbdfb925e2e07ad89b3a49558f7
 EBUILD bitcoin-tx-0.10.1.ebuild 666 SHA256 d4be74f498dbc42f38673046006d642fd497a701811ccd91994c1b13d0ca96c0 SHA512 a7eaf06704b32711428d5811439f245cec244f4bfa2db229d1debbb8ad966a4bf380448df9a804df9ffba1c60c7bfa6b14e6feb7ce99fdf4ddeb286a422e6fff WHIRLPOOL bc6b232ea8a3da8013756680e91b0b5fc26f14112d4cbf1cb2186f16f71b70315a0791508a78df443c4b1369ddbbb621a08031c3282bbe2f53250a2d02d08075
-EBUILD bitcoin-tx-9999.ebuild 582 SHA256 8f74e3871265a27504e9cd0705f81e991f491457b71c5f7692266fc378f2e95c SHA512 c15d5bfac2e4d2333a3a73839d0e5203d2b636986eb685950eba485cc0b22fb13ad5ea708467bc875e4c7ca1d2c7c3f6a058a65e1db897f3fefabf16b77fd6c5 WHIRLPOOL f6a838532af7f062c425ca7ba513c05f23217ecf34d72e8c241c1db737dcd28971c45c9cfcde3e653dd938c4d5addcb8d0fdf78a88310f5ac4033517b22378ed
-MISC ChangeLog 872 SHA256 23a43d515a84f99989994a7e7962bbfe6ba00758a66d1e7b64ecd7a3ce917e36 SHA512 5bdb7901f8baab712c6347729137e6bc2caba09eeaa9a27394ac331f17897de4485c26c918d13c19e6daa849ef2e6edb1f73436ec172dd86c40197b4ac96b209 WHIRLPOOL dd431eb6beca48bd687fd85c7c44c7fcf7f7e5c28277cf5f0eb5032bf86a9fba192013f2ac37a4442238d9e2fc07145a9f2d06fbcfadaf05b0ddac24107ed7b9
+EBUILD bitcoin-tx-9999.ebuild 455 SHA256 ba95d91b8d2a0f5a5fea9dcd8f663b82e82d9ac60e591c6a26abeb97a8f8dd6c SHA512 818525f85d085f6a0cff28d5ebc62e4903490e8cd04ce8084e4acad3adf4ff242ad2c80eba512fdfb750ff0e88d90e9d7af744e175628539ae26d419ff7bce94 WHIRLPOOL 539479be09de26cbced49e8a10cba0eed721acdd0f534607a56c2d92600d02acba9b9a48a021c1fb9b5834f4559c5444f6da2ad6828c8ddd4206c1c2af80ee73
+MISC ChangeLog 996 SHA256 3b3f53e14313916e2de347ad0e65b4cfeb3a9a99376845508b56e1625a23d33e SHA512 d0f60f71806d7473af454640673d0a0f9ad41aab36c31d83b513462d274e257b1c7386ec2ab9621ec419a820103fa6cee12e7390bfdc6d6fdf96de03154b7bd7 WHIRLPOOL 273d780ba574c8377c999f305c3b9e829e161ffd1df5f7f70014b383cc5e6134c8c093585db81e06a90ba1381b485c008a039753bdefcae97d94f150c9331f1e
 MISC metadata.xml 374 SHA256 5098edf30adee84f59968d5b6c45adcfa410a32001905dea9c093a5ce74a44b3 SHA512 4315e762ca8061694dd652ddcd1a9f9f4b51a06126207c644a52557fb977b94eda2bea826f326763f99cd7da5e813fd07251d039bece31fc13f8686d7113cea2 WHIRLPOOL a629000079acf2866848adb5f66496970dc515badbd9e624437ea89d06d7a7f106ac50a22eeefaac28012667f86d5938c8e4ebba3df837c70763b93e3e239b6e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVZRS3AAoJEJOE+m71LUu6fVkP/2iXoU1dM2uVBu3gmx7fcriC
-JEYRf+uuY+/QifghV2H1qALW9mnrAbqb3soGGoWQXDGhXxFlexUAknhyzheyZIgr
-9T+5v5PRdCUP/OlT0om4P76XhncQX6o/q+bP5CBLT00FTjBsrOkCNwYOxgxlfTxk
-5n3hnzjZh4A9eWnqPe7V51YXLlpxW2QTQM3vUr+nlI8KSiqplMdsL3196881WdjF
-NYeT1kpraO8eA8AnQXWToRB1q7vukog3t33cNBs/X3M34y+dyRZkUmZAuzztJYpo
-DdmMpIE70LepE26UKVueMudQrpxmpOdyyZHdLLt70j1jRPagwbiNgeiHqOO5xb9t
-kfu8b8EbHMM11zBIbvu9BLORvIFL+hECGKH/4702vyvIXhvZCdJGcIa5qdtBSuSj
-ybncqVZLUEBn9FRs85XiWMM5lYhQPKOMvAUn5MDTxrKT04xFak5JMu0FV30XGFtt
-PKhozwxYifyQ1H7uf+XM1A73WvnR94At9flcvikMQkWkUAeJrqe3v2nWJP8Q87st
-caqxCZBowOsQjMsZDtgpgZJ0wglwHsvd4m0pwaTsimQpU1IaJhK/b1gwV5UwHbtU
-weX00dPD5qbQaC1SJkVmWMJsICSbJKh3nfblR+RlxtaLHJnD7l8CTF2rJb4NSgrG
-5JtrDK/DRP7xTVx+kzX2
-=qk8D
+iQIcBAEBCAAGBQJVqWLzAAoJEJOE+m71LUu6O/kP/1mSdH4ngP6z7FAB+BYHe6VU
+BOCcBDI5Ad6794m0noJCkfnaHhfSheNzvHwnv0vYkKjt9A/2i+gDsb35WRqvq3/0
+Vl+OcX4eP+om+y1SMBHqY4Gimawe2pLQks/+YyJHphyN+2qqLhxsa3NOLXmj8tP2
+C6VvFUCIZ3IC9ot8jszg95A7cqJap5Ew2PGMcOCCDSf8fAJkgXsb2vFuSGmPNhl9
+24XS2T7ke5FaM4bKAtIOyrGv/TMyqZgNoPl1B26HcmAyZuwveEh6+Dsv3fR1Zhzb
+je+ATvtnfTwkt3s4LuBpVtQXLZIaV7r/w+vTGwM3u3Hv0JKf5k+t2bjlKvueglfc
+meKYzHYZCm52BrI6wB2++Sv9BxV6h1LLqIS/Fqilu459hmi3G4JWx3ASquzJT5uX
+LBtbigT2BnffIVfB/DTNTvlLicejVESw2fNezGyg4+bCG2Kaw9C5PnWfH4svuLzI
+lpXiu3fKDhlV14UPmyHlWJq5rukCV5mIEkBJA4B9TQlA1zPie+kKiQxuafEYkWA1
+oG0414U80X0MbkHZhrvIv1Xp25tAuRKWgyFxyrbsqFtXjwuyo7QkoXMzXvRdnTlp
+mEqemJnSkmfRi4AVbV7yhsKNFXuZUsErxpIaDSp2jm3MivdDeYqnXFUCylZZJePw
+LdF5RW6e6Ax5S2d4bJWb
+=LypC
 -----END PGP SIGNATURE-----
diff --git a/dev-util/bitcoin-tx/bitcoin-tx-9999.ebuild b/dev-util/bitcoin-tx/bitcoin-tx-9999.ebuild
index 8edb39555d7e..27f7f6d6a407 100644
--- a/dev-util/bitcoin-tx/bitcoin-tx-9999.ebuild
+++ b/dev-util/bitcoin-tx/bitcoin-tx-9999.ebuild
@@ -1,10 +1,9 @@
 # Copyright 2010-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/bitcoin-tx/bitcoin-tx-9999.ebuild,v 1.2 2015/03/03 23:49:34 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/bitcoin-tx/bitcoin-tx-9999.ebuild,v 1.3 2015/07/17 20:15:27 blueness Exp $
 
 EAPI=5
 
-BITCOINCORE_NO_SYSLIBS=1
 BITCOINCORE_IUSE=""
 BITCOINCORE_NEED_LIBSECP256K1=1
 inherit bitcoincore
@@ -14,13 +13,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS=""
 
-src_prepare() {
-	bitcoincore_prepare
-	sed -i 's/bitcoin-cli//' src/Makefile.am
-	bitcoincore_autoreconf
-}
-
 src_configure() {
 	bitcoincore_conf \
-		--with-utils
+		--enable-util-tx
 }
diff --git a/dev-util/bitcoin-tx/files/9999-syslibs.patch b/dev-util/bitcoin-tx/files/9999-syslibs.patch
new file mode 100644
index 000000000000..2cdf2ab9837b
--- /dev/null
+++ b/dev-util/bitcoin-tx/files/9999-syslibs.patch
@@ -0,0 +1,243 @@
+diff --git a/build-aux/m4/bitcoin_subdir_to_include.m4 b/build-aux/m4/bitcoin_subdir_to_include.m4
+index 66f106c..5f0a3b1 100644
+--- a/build-aux/m4/bitcoin_subdir_to_include.m4
++++ b/build-aux/m4/bitcoin_subdir_to_include.m4
+@@ -5,7 +5,7 @@ AC_DEFUN([BITCOIN_SUBDIR_TO_INCLUDE],[
+     AC_MSG_RESULT([default])
+   else
+     echo "#include <$2$3.h>" >conftest.cpp
+-    newinclpath=`${CXXCPP} ${CPPFLAGS} -M conftest.cpp 2>/dev/null | [ tr -d '\\n\\r\\\\' | sed -e 's/^.*[[:space:]:]\(\/[^[:space:]]*\)]$3[\.h[[:space:]].*$/\1/' -e t -e d`]
++    newinclpath=$(${CXXCPP} ${CPPFLAGS} -M conftest.cpp 2>/dev/null | sed [-E -e ':a' -e '/\\$/!b b' -e N -e 's/\\\n/ /' -e 't a' -e ':b' -e 's/^[^:]*:[[:space:]]*(([^[:space:]\]|\\.)*[[:space:]])*(([^[:space:]\]|\\.)*)]$3\.h[([[:space:]].*)?$/\3/' -e 't' -e d])
+     AC_MSG_RESULT([${newinclpath}])
+     if test "x${newinclpath}" != "x"; then
+       eval "$1=\"\$$1\"' -I${newinclpath}'"
+diff --git a/configure.ac b/configure.ac
+index 37fe47e..14e5c34 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -170,6 +170,18 @@ AC_ARG_WITH([utils],
+   [build_bitcoin_utils=$withval],
+   [build_bitcoin_utils=yes])
+ 
++AC_ARG_ENABLE([util-cli],
++  [AS_HELP_STRING([--enable-util-cli],
++  [build bitcoin-cli])],
++  [build_bitcoin_cli=$enableval],
++  [build_bitcoin_cli=$build_bitcoin_utils])
++
++AC_ARG_ENABLE([util-tx],
++  [AS_HELP_STRING([--enable-util-tx],
++  [build bitcoin-tx])],
++  [build_bitcoin_tx=$enableval],
++  [build_bitcoin_tx=$build_bitcoin_utils])
++
+ AC_ARG_WITH([libs],
+   [AS_HELP_STRING([--with-libs],
+   [build libraries (default=yes)])],
+@@ -488,14 +500,65 @@ if test x$use_reduce_exports = xyes; then
+   [AC_MSG_ERROR([Cannot set default symbol visibility. Use --disable-reduce-exports.])])
+ fi
+ 
++dnl Check for leveldb, only if explicitly requested
+ LEVELDB_CPPFLAGS=
+ LIBLEVELDB=
+ LIBMEMENV=
+-AM_CONDITIONAL([EMBEDDED_LEVELDB],[true])
++AC_ARG_WITH([system-leveldb],
++  [AS_HELP_STRING([--with-system-leveldb],
++  [Build with system LevelDB (default is no; DANGEROUS; NOT SUPPORTED)])],
++  [system_leveldb=$withval],
++  [system_leveldb=no]
++)
++if test x$system_leveldb != xno; then
++  LEVELDB_CPPFLAGS=
++  AC_CHECK_LIB([leveldb],[main],[
++    LIBLEVELDB=-lleveldb
++  ],[
++    AC_MSG_ERROR([leveldb library not found; using --with-system-leveldb is not supported anyway])
++  ])
++  TEMP_LIBS="$LIBS"
++  LIBS="$LIBS $LIBLEVELDB"
++  AC_CHECK_LIB([memenv],[main],[
++    LIBMEMENV=-lmemenv
++  ],[
++    AC_MSG_ERROR([LevelDB's memenv library not found; using --with-system-leveldb is not supported anyway])
++  ])
++  LIBS="$TEMP_LIBS"
++  AC_CHECK_HEADER([leveldb/filter_policy.h],[],[
++    AC_MSG_ERROR([LevelDB headers not found; using --with-system-leveldb is not supported anyway])
++  ])
++  AC_CHECK_HEADER([leveldb/helpers/memenv.h],[
++    AC_MSG_CHECKING([for memenv.h path])
++    BITCOIN_SUBDIR_TO_INCLUDE([LEVELDB_CPPFLAGS],[leveldb/helpers/],[memenv])
++  ],[
++    AC_CHECK_HEADER([memenv.h],[],[
++      AC_MSG_ERROR([LevelDB headers not found; using --with-system-leveldb is not supported anyway])
++    ])
++  ])
++fi
++AM_CONDITIONAL([EMBEDDED_LEVELDB],[test x$system_leveldb = xno])
+ AC_SUBST(LEVELDB_CPPFLAGS)
+ AC_SUBST(LIBLEVELDB)
+ AC_SUBST(LIBMEMENV)
+ 
++dnl Check for libsecp256k1, only if explicitly requested
++AC_ARG_WITH([system-libsecp256k1],
++  [AS_HELP_STRING([--with-system-libsecp256k1],
++  [Build with system libsecp256k1 (default is no; DANGEROUS; NOT SUPPORTED)])],
++  [system_libsecp256k1=$withval],
++  [system_libsecp256k1=no]
++)
++if test x$system_libsecp256k1 != xno; then
++  PKG_CHECK_MODULES([libsecp256k1],[libsecp256k1],,[true])
++else
++  libsecp256k1_CFLAGS='-I$(srcdir)/secp256k1/include'
++  libsecp256k1_LIBS='secp256k1/libsecp256k1.la'
++fi
++AM_CONDITIONAL([EMBEDDED_LIBSECP256K1],[test x$system_libsecp256k1 = xno])
++AC_SUBST(libsecp256k1_CFLAGS)
++AC_SUBST(libsecp256k1_LIBS)
++
+ if test x$enable_wallet != xno; then
+     dnl Check for libdb_cxx only if wallet enabled
+     BITCOIN_FIND_BDB48
+@@ -515,7 +578,7 @@ 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
++if test x$build_bitcoin_cli$build_bitcoin_tx$build_bitcoind$bitcoin_enable_qt$use_tests = xnonononono; then
+     use_boost=no
+ else
+     use_boost=yes
+@@ -701,9 +764,13 @@ 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 bitcoin-cli])
++AM_CONDITIONAL([BUILD_BITCOIN_CLI], [test x$build_bitcoin_cli = xyes])
++AC_MSG_RESULT($build_bitcoin_cli)
++
++AC_MSG_CHECKING([whether to build bitcoin-tx])
++AM_CONDITIONAL([BUILD_BITCOIN_TX], [test x$build_bitcoin_tx = xyes])
++AC_MSG_RESULT($build_bitcoin_tx)
+ 
+ AC_MSG_CHECKING([whether to build libraries])
+ AM_CONDITIONAL([BUILD_BITCOIN_LIBS], [test x$build_bitcoin_libs = xyes])
+@@ -826,7 +893,7 @@ else
+   AC_MSG_RESULT([no])
+ fi
+ 
+-if test x$build_bitcoin_utils$build_bitcoin_libs$build_bitcoind$bitcoin_enable_qt$use_tests = xnonononono; then
++if test x$build_bitcoin_cli$build_bitcoin_tx$build_bitcoin_libs$build_bitcoind$bitcoin_enable_qt$use_tests = xnononononono; then
+   AC_MSG_ERROR([No targets! Please specify at least one of: --with-utils --with-libs --with-daemon --with-gui or --enable-tests])
+ fi
+ 
+@@ -895,8 +962,10 @@ PKGCONFIG_LIBDIR_TEMP="$PKG_CONFIG_LIBDIR"
+ unset PKG_CONFIG_LIBDIR
+ PKG_CONFIG_LIBDIR="$PKGCONFIG_LIBDIR_TEMP"
+ 
++if test x$system_libsecp256k1 = xno; then
+ ac_configure_args="${ac_configure_args} --disable-shared --with-pic --with-bignum=no"
+ AC_CONFIG_SUBDIRS([src/secp256k1])
++fi
+ 
+ AC_OUTPUT
+ 
+diff --git a/qa/pull-tester/rpc-tests.sh b/qa/pull-tester/rpc-tests.sh
+index 9b31865..5bb187c 100755
+--- a/qa/pull-tester/rpc-tests.sh
++++ b/qa/pull-tester/rpc-tests.sh
+@@ -57,7 +57,7 @@ testScriptsExt=(
+ extArg="-extended"
+ passOn=${@#$extArg}
+ 
+-if [ "x${ENABLE_BITCOIND}${ENABLE_UTILS}${ENABLE_WALLET}" = "x111" ]; then
++if [ "x${ENABLE_BITCOIND}${ENABLE_CLI}${ENABLE_WALLET}" = "x111" ]; then
+     for (( i = 0; i < ${#testScripts[@]}; i++ ))
+     do
+         if [ -z "$1" ] || [ "${1:0:1}" == "-" ] || [ "$1" == "${testScripts[$i]}" ] || [ "$1.py" == "${testScripts[$i]}" ]
+diff --git a/qa/pull-tester/tests-config.sh.in b/qa/pull-tester/tests-config.sh.in
+index 10f4d33..e0e407d 100755
+--- a/qa/pull-tester/tests-config.sh.in
++++ b/qa/pull-tester/tests-config.sh.in
+@@ -8,7 +8,7 @@ EXEEXT="@EXEEXT@"
+ 
+ # These will turn into comments if they were disabled when configuring.
+ @ENABLE_WALLET_TRUE@ENABLE_WALLET=1
+-@BUILD_BITCOIN_UTILS_TRUE@ENABLE_UTILS=1
++@BUILD_BITCOIN_CLI_TRUE@ENABLE_CLI=1
+ @BUILD_BITCOIND_TRUE@ENABLE_BITCOIND=1
+ 
+ REAL_BITCOIND="$BUILDDIR/src/bitcoind${EXEEXT}"
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 1c2f770..4d60ddf 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -1,4 +1,6 @@
++if EMBEDDED_LIBSECP256K1
+ DIST_SUBDIRS = secp256k1
++endif
+ AM_LDFLAGS = $(PTHREAD_CFLAGS) $(LIBTOOL_LDFLAGS)
+ 
+ 
+@@ -20,7 +22,7 @@ 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
++BITCOIN_INCLUDES += $(libsecp256k1_CFLAGS)
+ 
+ LIBBITCOIN_SERVER=libbitcoin_server.a
+ LIBBITCOIN_WALLET=libbitcoin_wallet.a
+@@ -30,10 +32,16 @@ LIBBITCOIN_UTIL=libbitcoin_util.a
+ LIBBITCOIN_CRYPTO=crypto/libbitcoin_crypto.a
+ LIBBITCOIN_UNIVALUE=univalue/libbitcoin_univalue.a
+ LIBBITCOINQT=qt/libbitcoinqt.a
++if EMBEDDED_LIBSECP256K1
+ LIBSECP256K1=secp256k1/libsecp256k1.la
++else
++LIBSECP256K1=$(libsecp256k1_LIBS)
++endif
+ 
++if EMBEDDED_LIBSECP256K1
+ $(LIBSECP256K1): $(wildcard secp256k1/src/*) $(wildcard secp256k1/include/*)
+ 	$(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F)
++endif
+ 
+ # 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:
+@@ -63,8 +71,11 @@ if BUILD_BITCOIND
+   bin_PROGRAMS += bitcoind
+ endif
+ 
+-if BUILD_BITCOIN_UTILS
+-  bin_PROGRAMS += bitcoin-cli bitcoin-tx
++if BUILD_BITCOIN_CLI
++  bin_PROGRAMS += bitcoin-cli
++endif
++if BUILD_BITCOIN_TX
++  bin_PROGRAMS += bitcoin-tx
+ endif
+ 
+ .PHONY: FORCE
+diff --git a/src/Makefile.test.include b/src/Makefile.test.include
+index 0997148..14b4deb 100644
+--- a/src/Makefile.test.include
++++ b/src/Makefile.test.include
+@@ -111,10 +111,12 @@ bitcoin_test_check: $(TEST_BINARY) FORCE
+ bitcoin_test_clean : FORCE
+ 	rm -f $(CLEAN_BITCOIN_TEST) $(test_test_bitcoin_OBJECTS) $(TEST_BINARY)
+ 
++if EMBEDDED_LIBSECP256K1
+ check-local:
+ 	@echo "Running test/bitcoin-util-test.py..."
+ 	$(AM_V_at)srcdir=$(srcdir) PYTHONPATH=$(builddir)/test $(srcdir)/test/bitcoin-util-test.py
+ 	$(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C secp256k1 check
++endif
+ 
+ %.json.h: %.json
+ 	@$(MKDIR_P) $(@D)