From b197605e0825b0ddf5c10ec18a6b13fcb06ee9c9 Mon Sep 17 00:00:00 2001 From: Johnathan Corgan Date: Tue, 29 Sep 2015 10:18:07 -0700 Subject: [PATCH] zmq: require version 4.x or newer of libzmq Signed-off-by: Johnathan Corgan --- configure.ac | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index 3d312ca80..73a414b9c 100644 --- a/configure.ac +++ b/configure.ac @@ -158,7 +158,7 @@ AC_ARG_ENABLE([zmq], AC_ARG_WITH([protoc-bindir],[AS_HELP_STRING([--with-protoc-bindir=BIN_DIR],[specify protoc bin path])], [protoc_bin_path=$withval], []) -# Enable debug +# Enable debug AC_ARG_ENABLE([debug], [AS_HELP_STRING([--enable-debug], [use debug compiler flags and macros (default is no)])], @@ -169,11 +169,11 @@ if test "x$enable_debug" = xyes; then if test "x$GCC" = xyes; then CFLAGS="-g3 -O0 -DDEBUG" fi - + if test "x$GXX" = xyes; then CXXFLAGS="-g3 -O0 -DDEBUG" fi -fi +fi ## TODO: Remove these hard-coded paths and flags. They are here for the sake of ## compatibility with the legacy buildsystem. @@ -867,10 +867,10 @@ fi AC_MSG_CHECKING([whether to build ZMQ support]) if test "x$use_zmq" = "xyes"; then AC_MSG_RESULT([yes]) - PKG_CHECK_MODULES([ZMQ],[libzmq], + PKG_CHECK_MODULES([ZMQ],[libzmq >= 4], [AC_DEFINE([ENABLE_ZMQ],[1],[Define to 1 to enable ZMQ functions])], [AC_DEFINE([ENABLE_ZMQ],[0],[Define to 1 to enable ZMQ functions]) - AC_MSG_WARN([libzmq not found, disabling]) + AC_MSG_WARN([libzmq version 4.x or greater not found, disabling]) use_zmq=no]) else AC_MSG_RESULT([no, --disable-zmq used])