autotools: move checking for zmq library to common area in configure.ac#6743
autotools: move checking for zmq library to common area in configure.ac#6743laanwj merged 1 commit intobitcoin:masterfrom
Conversation
|
Looks like Windows builds are failing, but probably not due to Windows per se. I suspect the new configure.ac logic is not properly shutting off ENABLE_ZMQ when the library is not found. |
|
I think you need to keep the |
|
Ah, missed that, thanks. |
|
That didn't work. Calling @theuni ... |
|
The fix required implementing the logic to test for zmq or not when use_pkgconfig was set to no. |
|
@jmcorgan yep, that was the right fix. Although, the non-pkg-config check isn't testing versions. Can you change the AC_CHECK_LIB to test for something new in v4? If there's not a new symbol to check for, we'll have to resort to a quick compile test. Edit: If this is to be believed, a check for |
|
Nit: Please move the new check up above the protobuf check, so it's not mixed in with the qt stuff. |
|
Understood about check for a 4.x only function in the non-pkgconfig section, but I'm confused by your request for moving the checks to a different place. Can you be more specific about which lines of code you want to move and to which location? |
That whole block Up about 5 lines, so it's before |
|
Done. |
* Fixes bitcoin#6679 * Tested with --disable-zmq * Tested with and without pkgconfig * Tested with and without zmq installed Signed-off-by: Johnathan Corgan <[email protected]>
|
@theuni This should all be good to go now. |
|
Looks good, ut ACK |
dd28089 autotools: move checking for zmq library to common area in configure.ac (Johnathan Corgan)
Add ZeroMQ notifications Cherry-picked from the following upstream PRs: - bitcoin/bitcoin#6103 - bitcoin/bitcoin#6684 - bitcoin/bitcoin#6686 - bitcoin/bitcoin#6736 - bitcoin/bitcoin#6739 - bitcoin/bitcoin#6743 - bitcoin/bitcoin#6768 - bitcoin/bitcoin#6779 - bitcoin/bitcoin#6810 - bitcoin/bitcoin#6927 - bitcoin/bitcoin#6980 (only upgrading zeromq) - bitcoin/bitcoin#6680 - bitcoin/bitcoin#7058 - bitcoin/bitcoin#7621 - bitcoin/bitcoin#7335 (only parts affecting `zmq_test.py`) - bitcoin/bitcoin#7853 (only parts affecting `zmq_test.py`) - bitcoin/bitcoin#7762 - bitcoin/bitcoin#7993 (only upgrading zeromq) - bitcoin/bitcoin#8238 - bitcoin/bitcoin#8701 - bitcoin/bitcoin#6685 Closes #2020.
Add ZeroMQ notifications Cherry-picked from the following upstream PRs: - bitcoin/bitcoin#6103 - bitcoin/bitcoin#6684 - bitcoin/bitcoin#6686 - bitcoin/bitcoin#6736 - bitcoin/bitcoin#6739 - bitcoin/bitcoin#6743 - bitcoin/bitcoin#6768 - bitcoin/bitcoin#6779 - bitcoin/bitcoin#6810 - bitcoin/bitcoin#6927 - bitcoin/bitcoin#6980 (only upgrading zeromq) - bitcoin/bitcoin#6680 - bitcoin/bitcoin#7058 - bitcoin/bitcoin#7621 - bitcoin/bitcoin#7335 (only parts affecting `zmq_test.py`) - bitcoin/bitcoin#7853 (only parts affecting `zmq_test.py`) - bitcoin/bitcoin#7762 - bitcoin/bitcoin#7993 (only upgrading zeromq) - bitcoin/bitcoin#8238 - bitcoin/bitcoin#8701 - bitcoin/bitcoin#6685 Closes #2020.
Fixes #6679