bitcoin_qt.m4: Minor fixes and clean-ups. #11711

pull fanquake wants to merge 5 commits into bitcoin:master from fanquake:bitcoin-qt-m4-cleanup changing 1 files +110 −84

fanquake commented at 2:27 PM on November 17, 2017: member

Replaces #11222.

Dropped the last commit, and converted e90d91c (now 06abcbf) into a scripted-diff using @theuni's suggestion.

bitcoin_qt.m4: Improve QT_VERSION tests.

Use '<QtCore/qconfig.h> and '<QtCore/qglobal.h>' for testing QT_VERSION.
This makes the tests work with both Qt4 and Qt5, even if '-fPIC' or '-fPIE'
is not used (the compiler might choke otherwise if QT_REDUCE_RELOCATIONS is
active).

db32a4fd6b

bitcoin_qt.m4: Use correct M4 quoting characters. 8695315fb2
bitcoin_qt.m4: Add missing braces around variables in autoconf messages. 079f4b2a24
bitcoin_qt.m4: Add missing dollar sign for variable. e0496d3b9a

scripted-diff: Orthogonalize string quoting

Add double qoutes to string tests where arguments could (theoretically)
contain spaces.

Remove double quotes where not necessary.

-BEGIN VERIFY SCRIPT-
sed -iE -e 's/"x\(yes\|no\|auto\)\?"/x\1/g' -e 's/test \(x\$[^ ]*\)/test "\1"/g' build-aux/m4/bitcoin_qt.m4
-END VERIFY SCRIPT-

06abcbf9ba

fanquake added the label Build system on Nov 17, 2017
fanquake requested review from theuni on Nov 17, 2017

in build-aux/m4/bitcoin_qt.m4:324 in 06abcbf9ba

 326 |      ]])],
 327 |      [bitcoin_cv_static_qt=yes],
 328 |      [bitcoin_cv_static_qt=no])
 329 |    ])
 330 | -  if test xbitcoin_cv_static_qt = xyes; then
 331 | +  if test "x$bitcoin_cv_static_qt" = xyes; then

fanquake commented at 2:33 PM on November 17, 2017:

Did you still want to delete this test @theuni ?

theuni commented at 11:11 PM on December 20, 2017:

Nah, this is ok.

theuni approved
theuni commented at 11:12 PM on December 20, 2017: member

utACK 06abcbf9bacf7db8a64a969578b8bfe3322f2949

Thanks for following up here!
laanwj merged this on Jan 29, 2018
laanwj closed this on Jan 29, 2018
laanwj referenced this in commit 6378e5c514 on Jan 29, 2018
fanquake deleted the branch on Jan 30, 2018
PastaPastaPasta referenced this in commit 33f47c7158 on Jan 17, 2020
PastaPastaPasta referenced this in commit 865dafe626 on Jan 22, 2020
PastaPastaPasta referenced this in commit db9890646f on Jan 22, 2020
PastaPastaPasta referenced this in commit da961e7122 on Jan 29, 2020
PastaPastaPasta referenced this in commit 99da06d40e on Jan 29, 2020
PastaPastaPasta referenced this in commit 661d8816ac on Jan 29, 2020
PastaPastaPasta referenced this in commit 4e230811b6 on Jan 31, 2020
ckti referenced this in commit 563644c178 on Mar 28, 2021
DrahtBot locked this on Sep 8, 2021

Contributors

fanquake

theuni

Labels

Build system

Linked (view graph)

#11222 bitcoin_qt.m4: Minor fixes and clean-ups.