Permalink
Browse files

Merge pull request #1 from bitcoin/master

Update from Bitcoin Core upstream
  • Loading branch information...
CypherGrue committed Apr 25, 2016
2 parents c3a724f + 46880ed commit 40e364377d71fa78d5e6fcf4ec4e261877d362a9
Showing with 8,247 additions and 5,080 deletions.
  1. +3 −0 .travis.yml
  2. +6 −6 Makefile.am
  3. +15 −5 build-aux/m4/ax_boost_base.m4
  4. +3 −4 build-aux/m4/ax_boost_program_options.m4
  5. +3 −2 build-aux/m4/ax_boost_system.m4
  6. +7 −5 build-aux/m4/ax_check_compile_flag.m4
  7. +8 −5 build-aux/m4/ax_check_link_flag.m4
  8. +7 −5 build-aux/m4/ax_check_preproc_flag.m4
  9. +7 −1 build-aux/m4/ax_gcc_func_attribute.m4
  10. +345 −192 build-aux/m4/ax_pthread.m4
  11. +44 −16 configure.ac
  12. +8 −5 contrib/README.md
  13. +34 −18 contrib/devtools/github-merge.py
  14. +17 −17 contrib/devtools/security-check.py
  15. +32 −31 contrib/devtools/symbol-check.py
  16. +1 −1 contrib/gitian-descriptors/gitian-linux.yml
  17. +1 −1 contrib/gitian-descriptors/gitian-osx.yml
  18. +1 −1 contrib/gitian-descriptors/gitian-win.yml
  19. 0 contrib/{gitian-downloader → gitian-keys}/achow101-key.pgp
  20. BIN contrib/{gitian-downloader → gitian-keys}/aschildbach-key.pgp
  21. BIN contrib/{gitian-downloader → gitian-keys}/bluematt-key.pgp
  22. 0 contrib/{gitian-downloader → gitian-keys}/btcdrak-key.pgp
  23. BIN contrib/{gitian-downloader → gitian-keys}/cdecker-key.pgp
  24. 0 contrib/{gitian-downloader → gitian-keys}/centaur1-key.pgp
  25. 0 contrib/{gitian-downloader → gitian-keys}/cfields-key.pgp
  26. BIN contrib/{gitian-downloader → gitian-keys}/devrandom-key.pgp
  27. BIN contrib/{gitian-downloader → gitian-keys}/erkmos.pgp
  28. 0 contrib/{gitian-downloader → gitian-keys}/fanquake-key.pgp
  29. BIN contrib/{gitian-downloader → gitian-keys}/gavinandresen-key.pgp
  30. +105 −0 contrib/gitian-keys/jl2012-key.pgp
  31. 0 contrib/{gitian-downloader → gitian-keys}/jonasschnelli-key.pgp
  32. 0 contrib/{gitian-downloader → gitian-keys}/laanwj-key.pgp
  33. BIN contrib/{gitian-downloader → gitian-keys}/luke-jr-key.pgp
  34. +69 −0 contrib/gitian-keys/marcofalke-key.pgp
  35. 0 contrib/{gitian-downloader → gitian-keys}/michagogo-key.pgp
  36. 0 contrib/{gitian-downloader → gitian-keys}/petertodd-key.pgp
  37. 0 contrib/{gitian-downloader → gitian-keys}/prab-key.pgp
  38. BIN contrib/{gitian-downloader → gitian-keys}/sipa-key.pgp
  39. BIN contrib/{gitian-downloader → gitian-keys}/tcatm-key.pgp
  40. 0 contrib/{gitian-downloader → gitian-keys}/wtogami-key.pgp
  41. +3 −3 contrib/macdeploy/custom_dsstore.py
  42. +68 −68 contrib/macdeploy/macdeployqtplus
  43. +185 −0 contrib/rpm/README.md
  44. +24 −0 contrib/rpm/bitcoin-0.12.0-libressl.patch
  45. +8 −0 contrib/rpm/bitcoin.fc
  46. +157 −0 contrib/rpm/bitcoin.if
  47. +444 −0 contrib/rpm/bitcoin.spec
  48. +81 −0 contrib/rpm/bitcoin.te
  49. +1 −0 contrib/verify-commits/trusted-keys
  50. +8 −1 contrib/{verifysfbinaries → verifybinaries}/README.md
  51. +2 −4 contrib/{verifysfbinaries → verifybinaries}/verify.sh
  52. +9 −5 contrib/zmq/zmq_sub.py
  53. +20 −4 depends/Makefile
  54. +2 −0 depends/README.md
  55. +47 −43 depends/config.guess
  56. +6 −6 depends/config.sub
  57. +11 −7 depends/funcs.mk
  58. +2 −2 depends/packages/miniupnpc.mk
  59. +4 −0 depends/packages/native_cctools.mk
  60. +2 −2 depends/packages/qt.mk
  61. +2 −1 doc/bips.md
  62. +12 −2 doc/build-osx.md
  63. +41 −0 doc/build-unix.md
  64. +6 −0 doc/developer-notes.md
  65. +19 −15 doc/gitian-building.md
  66. BIN doc/gitian-building/all_files_in_one_partition.png
  67. BIN doc/gitian-building/create_vm_file_location_size.png
  68. BIN doc/gitian-building/select_startup_disk.png
  69. +42 −0 doc/release-notes.md
  70. +176 −118 doc/release-process.md
  71. +1 −1 doc/tor.md
  72. +5 −0 doc/zmq.md
  73. +71 −68 qa/pull-tester/rpc-tests.py
  74. +6 −0 qa/rpc-tests/abandonconflict.py
  75. +3 −4 qa/rpc-tests/bip65-cltv-p2p.py
  76. +539 −0 qa/rpc-tests/bip68-112-113-p2p.py
  77. +45 −7 qa/rpc-tests/bip68-sequence.py
  78. +213 −0 qa/rpc-tests/bip9-softforks.py
  79. +4 −5 qa/rpc-tests/bipdersig-p2p.py
  80. +1 −0 qa/rpc-tests/blockchain.py
  81. +11 −13 qa/rpc-tests/decodescript.py
  82. +14 −0 qa/rpc-tests/disablewallet.py
  83. +98 −27 qa/rpc-tests/fundrawtransaction.py
  84. +0 −22 qa/rpc-tests/getblocktemplate_longpoll.py
  85. +3 −31 qa/rpc-tests/getblocktemplate_proposals.py
  86. +20 −21 qa/rpc-tests/httpbasics.py
  87. +142 −0 qa/rpc-tests/importprunedfunds.py
  88. +5 −5 qa/rpc-tests/invalidblockrequest.py
  89. +3 −3 qa/rpc-tests/invalidtxrequest.py
  90. +3 −25 qa/rpc-tests/keypool.py
  91. +30 −52 qa/rpc-tests/listtransactions.py
  92. +26 −30 qa/rpc-tests/maxblocksinflight.py
  93. +1 −2 qa/rpc-tests/maxuploadtarget.py
  94. +6 −7 qa/rpc-tests/multi_rpc.py
  95. +1 −1 qa/rpc-tests/p2p-acceptblock.py
  96. +99 −0 qa/rpc-tests/p2p-feefilter.py
  97. +18 −18 qa/rpc-tests/p2p-fullblocktest.py
  98. +46 −34 qa/rpc-tests/proxy_test.py
  99. +4 −4 qa/rpc-tests/pruning.py
  100. +4 −6 qa/rpc-tests/rawtransactions.py
  101. +7 −33 qa/rpc-tests/receivedby.py
  102. +27 −33 qa/rpc-tests/replace-by-fee.py
  103. +10 −10 qa/rpc-tests/rest.py
  104. +2 −2 qa/rpc-tests/smartfees.py
  105. +8 −4 qa/rpc-tests/test_framework/authproxy.py
  106. +4 −3 qa/rpc-tests/test_framework/blockstore.py
  107. +4 −4 qa/rpc-tests/test_framework/blocktools.py
  108. +10 −20 qa/rpc-tests/test_framework/comptool.py
  109. +215 −149 qa/rpc-tests/test_framework/mininode.py
  110. +22 −6 qa/rpc-tests/test_framework/netutil.py
  111. +2 −2 qa/rpc-tests/test_framework/script.py
  112. +2 −2 qa/rpc-tests/test_framework/socks5.py
  113. +5 −2 qa/rpc-tests/test_framework/test_framework.py
  114. +87 −21 qa/rpc-tests/test_framework/util.py
  115. +58 −10 qa/rpc-tests/wallet.py
  116. +2 −8 qa/rpc-tests/zapwallettxes.py
  117. +24 −11 qa/rpc-tests/zmq_test.py
  118. +7 −2 share/qt/extract_strings_qt.py
  119. +12 −16 share/setup.nsi.in
  120. +11 −21 src/Makefile.am
  121. +81 −0 src/Makefile.leveldb.include
  122. +5 −4 src/Makefile.qt.include
  123. +8 −6 src/Makefile.test.include
  124. +0 −266 src/alert.cpp
  125. +0 −113 src/alert.h
  126. +16 −6 src/amount.cpp
  127. +14 −7 src/amount.h
  128. +9 −4 src/base58.cpp
  129. +2 −2 src/base58.h
  130. +18 −5 src/chainparams.cpp
  131. +0 −3 src/chainparams.h
  132. +2 −3 src/coincontrol.h
  133. +6 −2 src/coins.cpp
  134. +20 −13 src/coins.h
  135. +1 −0 src/consensus/params.h
  136. +2 −2 src/core_write.cpp
  137. +1 −1 src/crypto/ripemd160.h
  138. +1 −1 src/crypto/sha1.h
  139. +1 −1 src/crypto/sha256.h
  140. +1 −1 src/crypto/sha512.h
  141. +27 −28 src/dbwrapper.cpp
  142. +39 −33 src/dbwrapper.h
  143. +15 −108 src/init.cpp
  144. +0 −2 src/init.h
  145. +3 −3 src/key.cpp
  146. +19 −2 src/key.h
  147. +1 −0 src/keystore.cpp
  148. +198 −148 src/main.cpp
  149. +21 −14 src/main.h
  150. +8 −6 src/merkleblock.cpp
  151. +5 −4 src/merkleblock.h
  152. +29 −25 src/net.cpp
  153. +11 −5 src/net.h
  154. +27 −21 src/netbase.cpp
  155. +12 −11 src/netbase.h
  156. +19 −0 src/policy/fees.cpp
  157. +15 −2 src/policy/fees.h
  158. +3 −3 src/policy/policy.cpp
  159. +8 −7 src/policy/rbf.cpp
  160. +7 −1 src/policy/rbf.h
  161. +5 −14 src/prevector.h
  162. +1 −1 src/primitives/block.cpp
  163. +9 −1 src/primitives/transaction.h
  164. +3 −3 src/protocol.cpp
  165. +6 −8 src/protocol.h
  166. +3 −3 src/pubkey.cpp
  167. +28 −2 src/pubkey.h
  168. +1 −0 src/qt/bitcoin.qrc
  169. +11 −26 src/qt/clientmodel.cpp
  170. +2 −2 src/qt/clientmodel.h
  171. +1 −1 src/qt/coincontroldialog.cpp
  172. +5 −2 src/qt/forms/debugwindow.ui
  173. +2 −0 src/qt/guiconstants.h
  174. BIN src/qt/res/icons/transaction_abandoned.png
  175. +3 −1 src/qt/rpcconsole.cpp
  176. +3 −2 src/qt/transactiondesc.cpp
  177. +5 −4 src/qt/transactionrecord.cpp
  178. +3 −2 src/qt/transactionrecord.h
  179. +10 −0 src/qt/transactiontablemodel.cpp
  180. +31 −2 src/qt/transactionview.cpp
  181. +2 −0 src/qt/transactionview.h
  182. +18 −3 src/qt/walletmodel.cpp
  183. +3 −0 src/qt/walletmodel.h
  184. +3 −0 src/rest.cpp
  185. +129 −18 src/rpc/blockchain.cpp
  186. +4 −2 src/rpc/client.cpp
  187. +100 −33 src/rpc/mining.cpp
  188. +18 −0 src/rpc/misc.cpp
  189. +29 −5 src/rpc/net.cpp
  190. +25 −3 src/rpc/rawtransaction.cpp
  191. +32 −0 src/rpc/register.h
  192. +14 −64 src/rpc/server.cpp
  193. +1 −59 src/rpc/server.h
  194. +6 −6 src/script/interpreter.cpp
  195. +1 −1 src/{wallet/wallet_ismine.cpp → script/ismine.cpp}
  196. +3 −3 src/{wallet/wallet_ismine.h → script/ismine.h}
  197. +1 −1 src/script/standard.h
  198. +44 −11 src/sync.cpp
  199. +21 −12 src/sync.h
  200. +2 −179 src/test/alert_tests.cpp
  201. +71 −0 src/test/amount_tests.cpp
  202. +1 −1 src/test/bctest.py
  203. +16 −0 src/test/bip32_tests.cpp
  204. +1 −1 src/test/bitcoin-util-test.py
  205. +14 −9 src/test/bloom_tests.cpp
  206. +0 −2 src/test/coins_tests.cpp
  207. BIN src/test/data/alertTests.raw
  208. +0 −877 src/test/data/script_invalid.json
  209. +1,824 −0 src/test/data/script_tests.json
  210. +0 −911 src/test/data/script_valid.json
  211. +4 −4 src/test/dbwrapper_tests.cpp
  212. +1 −11 src/test/multisig_tests.cpp
  213. +5 −3 src/test/pmt_tests.cpp
  214. +13 −2 src/test/prevector_tests.cpp
  215. +25 −1 src/test/rpc_tests.cpp
  216. +1 −8 src/test/script_P2SH_tests.cpp
  217. +301 −332 src/test/script_tests.cpp
  218. +21 −0 src/test/serialize_tests.cpp
  219. +5 −26 src/test/test_bitcoin.cpp
  220. +1 −2 src/test/test_bitcoin.h
  221. +1 −1 src/test/txvalidationcache_tests.cpp
  222. +1 −1 src/timedata.cpp
  223. +2 −0 src/timedata.h
  224. +1 −1 src/torcontrol.cpp
  225. +40 −42 src/txdb.cpp
  226. +25 −1 src/txdb.h
  227. +10 −0 src/txmempool.cpp
  228. +21 −20 src/txmempool.h
  229. +24 −0 src/ui_interface.cpp
  230. +10 −3 src/ui_interface.h
  231. +5 −3 src/uint256.h
  232. +1 −3 src/util.cpp
  233. +1 −1 src/utiltime.cpp
  234. +4 −1 src/version.h
  235. +1 −1 src/versionbits.cpp
  236. +105 −0 src/wallet/rpcdump.cpp
  237. +76 −32 src/wallet/rpcwallet.cpp
  238. +3 −1 src/wallet/rpcwallet.h
  239. +2 −2 src/{ → wallet}/test/accounting_tests.cpp
  240. +2 −2 src/{ → wallet}/test/rpc_wallet_tests.cpp
  241. +28 −0 src/wallet/test/wallet_test_fixture.cpp
  242. +18 −0 src/wallet/test/wallet_test_fixture.h
  243. +3 −3 src/wallet/test/wallet_tests.cpp
  244. +176 −71 src/wallet/wallet.cpp
  245. +23 −15 src/wallet/wallet.h
  246. +39 −0 src/wallet/walletdb.cpp
  247. +1 −0 src/wallet/walletdb.h
  248. +26 −8 src/zmq/zmqpublishnotifier.cpp
  249. +12 −0 src/zmq/zmqpublishnotifier.h
View
@@ -64,6 +64,7 @@ before_script:
- if [ -n "$OSX_SDK" -a -f depends/sdk-sources/MacOSX${OSX_SDK}.sdk.tar.gz ]; then tar -C depends/SDKs -xf depends/sdk-sources/MacOSX${OSX_SDK}.sdk.tar.gz; fi
- make $MAKEJOBS -C depends HOST=$HOST $DEP_OPTS
script:
+ - export TRAVIS_COMMIT_LOG=`git log --format=fuller -1`
- if [ -n "$USE_SHELL" ]; then export CONFIG_SHELL="$USE_SHELL"; fi
- OUTDIR=$BASE_OUTDIR/$TRAVIS_PULL_REQUEST/$TRAVIS_JOB_NUMBER-$HOST
- BITCOIN_CONFIG_ALL="--disable-dependency-tracking --prefix=$TRAVIS_BUILD_DIR/depends/$HOST --bindir=$OUTDIR/bin --libdir=$OUTDIR/lib"
@@ -79,4 +80,6 @@ script:
- if [ "$RUN_TESTS" = "true" ]; then make check; fi
- if [ "$RUN_TESTS" = "true" ]; then qa/pull-tester/rpc-tests.py --coverage; fi
after_script:
+ - echo $TRAVIS_COMMIT_RANGE
+ - echo $TRAVIS_COMMIT_LOG
- if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then (echo "Upload goes here. Something like: scp -r $BASE_OUTDIR server" || echo "upload failed"); fi
View
@@ -10,9 +10,9 @@ pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libbitcoinconsensus.pc
endif
-BITCOIND_BIN=$(top_builddir)/src/bitcoind$(EXEEXT)
-BITCOIN_QT_BIN=$(top_builddir)/src/qt/bitcoin-qt$(EXEEXT)
-BITCOIN_CLI_BIN=$(top_builddir)/src/bitcoin-cli$(EXEEXT)
+BITCOIND_BIN=$(top_builddir)/src/$(BITCOIN_DAEMON_NAME)$(EXEEXT)
+BITCOIN_QT_BIN=$(top_builddir)/src/qt/$(BITCOIN_GUI_NAME)$(EXEEXT)
+BITCOIN_CLI_BIN=$(top_builddir)/src/$(BITCOIN_CLI_NAME)$(EXEEXT)
BITCOIN_WIN_INSTALLER=$(PACKAGE)-$(PACKAGE_VERSION)-win$(WINDOWS_BITS)-setup$(EXEEXT)
empty :=
@@ -110,7 +110,7 @@ osx_volname:
if BUILD_DARWIN
$(OSX_DMG): $(OSX_APP_BUILT) $(OSX_PACKAGING)
- $(OSX_DEPLOY_SCRIPT) $(OSX_APP) -add-qt-tr $(OSX_QT_TRANSLATIONS) -translations-dir=$(QT_TRANSLATION_DIR) -dmg -fancy $(OSX_FANCY_PLIST) -verbose 2 -volname $(OSX_VOLNAME)
+ $(PYTHON) $(OSX_DEPLOY_SCRIPT) $(OSX_APP) -add-qt-tr $(OSX_QT_TRANSLATIONS) -translations-dir=$(QT_TRANSLATION_DIR) -dmg -fancy $(OSX_FANCY_PLIST) -verbose 2 -volname $(OSX_VOLNAME)
deploydir: $(OSX_DMG)
else
@@ -134,10 +134,10 @@ $(APP_DIST_DIR)/.background/$(OSX_BACKGROUND_IMAGE): $(OSX_BACKGROUND_IMAGE_DPIF
$(TIFFCP) -c none $(OSX_BACKGROUND_IMAGE_DPIFILES) $@
$(APP_DIST_DIR)/.DS_Store: $(OSX_DSSTORE_GEN)
- $< "$@" "$(OSX_VOLNAME)"
+ $(PYTHON) $< "$@" "$(OSX_VOLNAME)"
$(APP_DIST_DIR)/$(OSX_APP)/Contents/MacOS/Bitcoin-Qt: $(OSX_APP_BUILT) $(OSX_PACKAGING)
- INSTALLNAMETOOL=$(INSTALLNAMETOOL) OTOOL=$(OTOOL) STRIP=$(STRIP) $(OSX_DEPLOY_SCRIPT) $(OSX_APP) -translations-dir=$(QT_TRANSLATION_DIR) -add-qt-tr $(OSX_QT_TRANSLATIONS) -verbose 2
+ INSTALLNAMETOOL=$(INSTALLNAMETOOL) OTOOL=$(OTOOL) STRIP=$(STRIP) $(PYTHON) $(OSX_DEPLOY_SCRIPT) $(OSX_APP) -translations-dir=$(QT_TRANSLATION_DIR) -add-qt-tr $(OSX_QT_TRANSLATIONS) -verbose 2
deploydir: $(APP_DIST_EXTRAS)
endif
@@ -33,7 +33,7 @@
# and this notice are preserved. This file is offered as-is, without any
# warranty.
-#serial 23
+#serial 26
AC_DEFUN([AX_BOOST_BASE],
[
@@ -95,8 +95,8 @@ if test "x$want_boost" = "xyes"; then
x86_64)
libsubdirs="lib64 libx32 lib lib64"
;;
- ppc64|s390x|sparc64|aarch64)
- libsubdirs="lib64 lib lib64"
+ ppc64|s390x|sparc64|aarch64|ppc64le)
+ libsubdirs="lib64 lib lib64 ppc64le"
;;
esac
@@ -170,7 +170,7 @@ if test "x$want_boost" = "xyes"; then
AC_MSG_RESULT(yes)
succeeded=yes
found_system=yes
- ],[:
+ ],[
])
AC_LANG_POP([C++])
@@ -179,6 +179,10 @@ if test "x$want_boost" = "xyes"; then
dnl if we found no boost with system layout we search for boost libraries
dnl built and installed without the --layout=system option or for a staged(not installed) version
if test "x$succeeded" != "xyes"; then
+ CPPFLAGS="$CPPFLAGS_SAVED"
+ LDFLAGS="$LDFLAGS_SAVED"
+ BOOST_CPPFLAGS=
+ BOOST_LDFLAGS=
_version=0
if test "$ac_boost_path" != ""; then
if test -d "$ac_boost_path" && test -r "$ac_boost_path"; then
@@ -191,6 +195,12 @@ if test "x$want_boost" = "xyes"; then
VERSION_UNDERSCORE=`echo $_version | sed 's/\./_/'`
BOOST_CPPFLAGS="-I$ac_boost_path/include/boost-$VERSION_UNDERSCORE"
done
+ dnl if nothing found search for layout used in Windows distributions
+ if test -z "$BOOST_CPPFLAGS"; then
+ if test -d "$ac_boost_path/boost" && test -r "$ac_boost_path/boost"; then
+ BOOST_CPPFLAGS="-I$ac_boost_path"
+ fi
+ fi
fi
else
if test "$cross_compiling" != yes; then
@@ -253,7 +263,7 @@ if test "x$want_boost" = "xyes"; then
AC_MSG_RESULT(yes)
succeeded=yes
found_system=yes
- ],[:
+ ],[
])
AC_LANG_POP([C++])
fi
@@ -29,7 +29,7 @@
# and this notice are preserved. This file is offered as-is, without any
# warranty.
-#serial 22
+#serial 24
AC_DEFUN([AX_BOOST_PROGRAM_OPTIONS],
[
@@ -63,9 +63,9 @@ AC_DEFUN([AX_BOOST_PROGRAM_OPTIONS],
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>
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@%:@include <boost/program_options/errors.hpp>
]],
- [[boost::program_options::options_description generic("Generic options");
+ [[boost::program_options::error err("Error message");
return 0;]])],
ax_cv_boost_program_options=yes, ax_cv_boost_program_options=no)
AC_LANG_POP([C++])
@@ -74,7 +74,6 @@ AC_DEFUN([AX_BOOST_PROGRAM_OPTIONS],
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
- ax_lib=
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,
@@ -31,7 +31,7 @@
# and this notice are preserved. This file is offered as-is, without any
# warranty.
-#serial 17
+#serial 18
AC_DEFUN([AX_BOOST_SYSTEM],
[
@@ -68,9 +68,10 @@ AC_DEFUN([AX_BOOST_SYSTEM],
ax_cv_boost_system,
[AC_LANG_PUSH([C++])
CXXFLAGS_SAVE=$CXXFLAGS
+ CXXFLAGS=
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@%:@include <boost/system/error_code.hpp>]],
- [[boost::system::system_category]])],
+ [[boost::system::error_category *a = 0;]])],
ax_cv_boost_system=yes, ax_cv_boost_system=no)
CXXFLAGS=$CXXFLAGS_SAVE
AC_LANG_POP([C++])
@@ -4,7 +4,7 @@
#
# SYNOPSIS
#
-# AX_CHECK_COMPILE_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS])
+# AX_CHECK_COMPILE_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS], [INPUT])
#
# DESCRIPTION
#
@@ -19,6 +19,8 @@
# the flags: "CFLAGS EXTRA-FLAGS FLAG". This can for example be used to
# force the compiler to issue an error when a bad flag is given.
#
+# INPUT gives an alternative input source to AC_COMPILE_IFELSE.
+#
# NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. Please keep this
# macro in sync with AX_CHECK_{PREPROC,LINK}_FLAG.
#
@@ -53,19 +55,19 @@
# modified version of the Autoconf Macro, you may extend this special
# exception to the GPL to apply to your modified version as well.
-#serial 2
+#serial 4
AC_DEFUN([AX_CHECK_COMPILE_FLAG],
-[AC_PREREQ(2.59)dnl for _AC_LANG_PREFIX
+[AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_IF
AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_[]_AC_LANG_ABBREV[]flags_$4_$1])dnl
AC_CACHE_CHECK([whether _AC_LANG compiler accepts $1], CACHEVAR, [
ax_check_save_flags=$[]_AC_LANG_PREFIX[]FLAGS
_AC_LANG_PREFIX[]FLAGS="$[]_AC_LANG_PREFIX[]FLAGS $4 $1"
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM()],
+ AC_COMPILE_IFELSE([m4_default([$5],[AC_LANG_PROGRAM()])],
[AS_VAR_SET(CACHEVAR,[yes])],
[AS_VAR_SET(CACHEVAR,[no])])
_AC_LANG_PREFIX[]FLAGS=$ax_check_save_flags])
-AS_IF([test x"AS_VAR_GET(CACHEVAR)" = xyes],
+AS_VAR_IF(CACHEVAR,yes,
[m4_default([$2], :)],
[m4_default([$3], :)])
AS_VAR_POPDEF([CACHEVAR])dnl
@@ -4,7 +4,7 @@
#
# SYNOPSIS
#
-# AX_CHECK_LINK_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS])
+# AX_CHECK_LINK_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS], [INPUT])
#
# DESCRIPTION
#
@@ -19,6 +19,8 @@
# EXTRA-FLAGS FLAG". This can for example be used to force the linker to
# issue an error when a bad flag is given.
#
+# INPUT gives an alternative input source to AC_LINK_IFELSE.
+#
# NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. Please keep this
# macro in sync with AX_CHECK_{PREPROC,COMPILE}_FLAG.
#
@@ -53,18 +55,19 @@
# modified version of the Autoconf Macro, you may extend this special
# exception to the GPL to apply to your modified version as well.
-#serial 2
+#serial 4
AC_DEFUN([AX_CHECK_LINK_FLAG],
-[AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_ldflags_$4_$1])dnl
+[AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_IF
+AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_ldflags_$4_$1])dnl
AC_CACHE_CHECK([whether the linker accepts $1], CACHEVAR, [
ax_check_save_flags=$LDFLAGS
LDFLAGS="$LDFLAGS $4 $1"
- AC_LINK_IFELSE([AC_LANG_PROGRAM()],
+ AC_LINK_IFELSE([m4_default([$5],[AC_LANG_PROGRAM()])],
[AS_VAR_SET(CACHEVAR,[yes])],
[AS_VAR_SET(CACHEVAR,[no])])
LDFLAGS=$ax_check_save_flags])
-AS_IF([test x"AS_VAR_GET(CACHEVAR)" = xyes],
+AS_VAR_IF(CACHEVAR,yes,
[m4_default([$2], :)],
[m4_default([$3], :)])
AS_VAR_POPDEF([CACHEVAR])dnl
@@ -4,7 +4,7 @@
#
# SYNOPSIS
#
-# AX_CHECK_PREPROC_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS])
+# AX_CHECK_PREPROC_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS], [INPUT])
#
# DESCRIPTION
#
@@ -19,6 +19,8 @@
# "CPPFLAGS EXTRA-FLAGS FLAG". This can for example be used to force the
# preprocessor to issue an error when a bad flag is given.
#
+# INPUT gives an alternative input source to AC_PREPROC_IFELSE.
+#
# NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. Please keep this
# macro in sync with AX_CHECK_{COMPILE,LINK}_FLAG.
#
@@ -53,19 +55,19 @@
# modified version of the Autoconf Macro, you may extend this special
# exception to the GPL to apply to your modified version as well.
-#serial 2
+#serial 4
AC_DEFUN([AX_CHECK_PREPROC_FLAG],
-[AC_PREREQ(2.59)dnl for _AC_LANG_PREFIX
+[AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_IF
AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_[]_AC_LANG_ABBREV[]cppflags_$4_$1])dnl
AC_CACHE_CHECK([whether _AC_LANG preprocessor accepts $1], CACHEVAR, [
ax_check_save_flags=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $4 $1"
- AC_PREPROC_IFELSE([AC_LANG_PROGRAM()],
+ AC_PREPROC_IFELSE([m4_default([$5],[AC_LANG_PROGRAM()])],
[AS_VAR_SET(CACHEVAR,[yes])],
[AS_VAR_SET(CACHEVAR,[no])])
CPPFLAGS=$ax_check_save_flags])
-AS_IF([test x"AS_VAR_GET(CACHEVAR)" = xyes],
+AS_VAR_IF(CACHEVAR,yes,
[m4_default([$2], :)],
[m4_default([$3], :)])
AS_VAR_POPDEF([CACHEVAR])dnl
@@ -31,6 +31,7 @@
# cold
# const
# constructor
+# constructor_priority for constructor attribute with priority
# deprecated
# destructor
# dllexport
@@ -73,7 +74,7 @@
# and this notice are preserved. This file is offered as-is, without any
# warranty.
-#serial 2
+#serial 3
AC_DEFUN([AX_GCC_FUNC_ATTRIBUTE], [
AS_VAR_PUSHDEF([ac_var], [ax_cv_have_func_attribute_$1])
@@ -103,6 +104,9 @@ AC_DEFUN([AX_GCC_FUNC_ATTRIBUTE], [
[const], [
int foo( void ) __attribute__(($1));
],
+ [constructor_priority], [
+ int foo( void ) __attribute__((__constructor__(65535/2)));
+ ],
[constructor], [
int foo( void ) __attribute__(($1));
],
@@ -180,6 +184,8 @@ AC_DEFUN([AX_GCC_FUNC_ATTRIBUTE], [
[visibility], [
int foo_def( void ) __attribute__(($1("default")));
int foo_hid( void ) __attribute__(($1("hidden")));
+ int foo_int( void ) __attribute__(($1("internal")));
+ int foo_pro( void ) __attribute__(($1("protected")));
],
[warning], [
int foo( void ) __attribute__(($1("")));
Oops, something went wrong.

0 comments on commit 40e3643

Please sign in to comment.