Commit a106a86
committed
Merge bitcoin/bitcoin#27696: build: Do not define
fa5831b build: Do not define `ENABLE_ZMQ` when ZMQ is not available (Hennadii Stepanov)
Pull request description:
A new behavior is consistent with the other optional dependencies.
The source code contains `#if ENABLE_ZMQ` lines only:
```
$ git grep ENABLE_ZMQ -- src/*.cpp
src/init.cpp:#if ENABLE_ZMQ
src/init.cpp:#if ENABLE_ZMQ
src/init.cpp:#if ENABLE_ZMQ
src/init.cpp:#if ENABLE_ZMQ
src/init.cpp:#if ENABLE_ZMQ
```
Change in description line -- "Define to 1..." --> "Define this symbol.." -- is motivated by the fact that the actual value of the defined `ENABLE_ZMQ` macro does not matter at all.
Related to:
- bitcoin/bitcoin#16419
- bitcoin/bitcoin#25302
ACKs for top commit:
TheCharlatan:
ACK fa5831b
jarolrod:
ACK fa5831b
Tree-SHA512: 5e72ff0d34c4b33205338daea0aae8d7aa0e48fd633e21af01af32b7ddb0532ef68dd3dd74deb2c1d2599691929617e8c09676bcbaaf7d669b88816f866f1db2ENABLE_ZMQ when ZMQ is not available2 files changed
+5
-8
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
38 | 38 | | |
39 | 39 | | |
40 | 40 | | |
41 | | - | |
| 41 | + | |
42 | 42 | | |
43 | 43 | | |
44 | 44 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1632 | 1632 | | |
1633 | 1633 | | |
1634 | 1634 | | |
1635 | | - | |
1636 | | - | |
1637 | | - | |
| 1635 | + | |
| 1636 | + | |
1638 | 1637 | | |
1639 | | - | |
1640 | | - | |
1641 | 1638 | | |
1642 | 1639 | | |
1643 | 1640 | | |
| |||
1649 | 1646 | | |
1650 | 1647 | | |
1651 | 1648 | | |
| 1649 | + | |
| 1650 | + | |
1652 | 1651 | | |
1653 | 1652 | | |
1654 | 1653 | | |
| |||
1843 | 1842 | | |
1844 | 1843 | | |
1845 | 1844 | | |
1846 | | - | |
1847 | | - | |
1848 | 1845 | | |
1849 | 1846 | | |
1850 | 1847 | | |
| |||
0 commit comments