autotools: move checking for zmq library to common area in configure.ac #6743

pull jmcorgan wants to merge 1 commits into bitcoin:master from jmcorgan:fixes/6679 changing 1 files +25 −15

jmcorgan commented at 4:25 PM on October 1, 2015: contributor

Fixes #6679
jmcorgan commented at 6:01 PM on October 1, 2015: contributor

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.
jonasschnelli commented at 6:05 PM on October 1, 2015: contributor

I think you need to keep the else with something similar to AC_DEFINE_UNQUOTED([ENABLE_ZMQ],[0],[Define to 1 to enable ZMQ functions]). Travis Win32/64 does not have a libzmq installed and therefore should not compile the zmq features.
jmcorgan commented at 7:14 PM on October 1, 2015: contributor

Ah, missed that, thanks.
laanwj added the label Build system on Oct 1, 2015
jmcorgan force-pushed on Oct 1, 2015
jmcorgan commented at 7:37 PM on October 1, 2015: contributor

That didn't work. Calling @theuni ...
jmcorgan force-pushed on Oct 1, 2015
jmcorgan commented at 11:33 PM on October 1, 2015: contributor

The fix required implementing the logic to test for zmq or not when use_pkgconfig was set to no.
theuni commented at 3:02 PM on October 2, 2015: member

@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 zmq_ctx_shutdown should do the trick.
theuni commented at 3:05 PM on October 2, 2015: member

Nit: Please move the new check up above the protobuf check, so it's not mixed in with the qt stuff.
jmcorgan commented at 3:35 PM on October 2, 2015: contributor

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?
theuni commented at 3:59 PM on October 2, 2015: member
```
  if test "x$use_zmq" = "xyes"; then
     AC_CHECK_HEADER([zmq.h],
```
That whole block Up about 5 lines, so it's before BITCOIN_QT_CHECK...
jmcorgan force-pushed on Oct 3, 2015
jmcorgan commented at 3:11 AM on October 3, 2015: contributor

Done.

autotools: move checking for zmq library to common area in configure.ac

* Fixes #6679

* Tested with --disable-zmq
* Tested with and without pkgconfig
* Tested with and without zmq installed

Signed-off-by: Johnathan Corgan <johnathan@corganlabs.com>

dd28089fa2

jmcorgan force-pushed on Oct 3, 2015
jmcorgan commented at 8:30 PM on October 3, 2015: contributor

@theuni This should all be good to go now.
theuni commented at 7:32 PM on October 5, 2015: member

Looks good, ut ACK
laanwj merged this on Oct 6, 2015
laanwj closed this on Oct 6, 2015
laanwj referenced this in commit bdece5068b on Oct 6, 2015
jmcorgan deleted the branch on Oct 6, 2015
zkbot referenced this in commit 36df5a92f8 on Feb 9, 2017
zkbot referenced this in commit dd8b38316f on Feb 9, 2017
zkbot referenced this in commit 253c610783 on Feb 9, 2017
MarcoFalke locked this on Sep 8, 2021

Contributors

Labels

Linked (view graph)

#6679 ZMQ: configury should not unconditionally use pkg-config