Skip to content

Commit b54a10e

Browse files
author
MarcoFalke
committed
Merge #21292: build, doc: Fix configure script output indentation and typos
8b08d0f build, doc: Fix configure script output indentation and typos (Hennadii Stepanov) Pull request description: This PR is follow up of #16546, that breaks the `configure` script output indentation for gui/qt/qr lines: ``` Options used to compile and link: external signer = no multiprocess = no with libs = yes with wallet = yes with sqlite = yes with bdb = yes with gui / qt = yes with qr = yes with zmq = yes with test = yes ... ``` With this PR: ``` Options used to compile and link: external signer = no multiprocess = no with libs = yes with wallet = yes with sqlite = yes with bdb = yes with gui / qt = yes with qr = yes with zmq = yes with test = yes ... ``` Also typos are fixed. ACKs for top commit: Sjors: utACK 8b08d0f vasild: ACK 8b08d0f Tree-SHA512: 46dfcfb754192dbcc080348781327d1714e2f9a696f3ed9252746b426e3afc628d84adb197ba3b8080eacaa6053ccac07e670998930ae92cef8ed713dd457c10
2 parents 9307c58 + 8b08d0f commit b54a10e

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

configure.ac

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -863,7 +863,7 @@ if test x$use_hardening != xno; then
863863

864864
dnl -fcf-protection used with Clang 7 causes ld to emit warnings:
865865
dnl ld: error: ... <corrupt x86 feature size: 0x8>
866-
dnl Use CHECK_LINK_FLAG & --fatal-warnings to ensure we wont use the flag in this case.
866+
dnl Use CHECK_LINK_FLAG & --fatal-warnings to ensure we won't use the flag in this case.
867867
AX_CHECK_LINK_FLAG([-fcf-protection=full],[HARDENED_CXXFLAGS="$HARDENED_CXXFLAGS -fcf-protection=full"],, [[$LDFLAG_WERROR]])
868868

869869
dnl stack-clash-protection does not work properly when building for Windows.
@@ -1902,9 +1902,9 @@ if test "x$enable_wallet" != "xno"; then
19021902
echo " with sqlite = $use_sqlite"
19031903
echo " with bdb = $use_bdb"
19041904
fi
1905-
echo " with gui / qt = $bitcoin_enable_qt"
1905+
echo " with gui / qt = $bitcoin_enable_qt"
19061906
if test x$bitcoin_enable_qt != xno; then
1907-
echo " with qr = $use_qr"
1907+
echo " with qr = $use_qr"
19081908
fi
19091909
echo " with zmq = $use_zmq"
19101910
if test x$enable_fuzz == xno; then

doc/external-signer.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,4 +168,4 @@ It then imports descriptors for all support address types, in a BIP44/49/84 comp
168168

169169
The `displayaddress` RPC reuses some code from `getaddressinfo` on the provided address and obtains the inferred descriptor. It then calls `<cmd> --fingerprint=00000000 displayaddress --desc=<descriptor>`.
170170

171-
`sendtoaddress` and `sendmany` check `inputs->bip32_derivs` to see if any inputs have the same `master_fingerprint` as the signer. If so, it calls `<cmd> --fingerprint=00000000 signtransaction <psbt>`. It waits for the device to return a (partially) signed psbt, tries to finalize it and broadcasts the transation.
171+
`sendtoaddress` and `sendmany` check `inputs->bip32_derivs` to see if any inputs have the same `master_fingerprint` as the signer. If so, it calls `<cmd> --fingerprint=00000000 signtransaction <psbt>`. It waits for the device to return a (partially) signed psbt, tries to finalize it and broadcasts the transaction.

0 commit comments

Comments
 (0)