allow setting system/bundled libzmq via CLUSTERMQ_USE_SYSTEM_LIBZMQ

Author: mschubert

configure

@@ -17,56 +17,36 @@ int main() {
 }
 EOF
 
-if $(cc -o libzmq_test libzmq_test.c -lzmq >/dev/null 2>&1); then
-  echo "* system has libzmq"
-  if $(./libzmq_test 2>/dev/null); then
-    echo "* libzmq has DRAFT API -> linking system library"
-    PKG_CFLAGS="-DZMQ_BUILD_DRAFT_API=1 -fPIC -Icppzmq"
-    PKG_LIBS="-lzmq"
-    USE_SYSTEM_LIBZMQ=1
+if [ -z "$CLUSTERMQ_USE_SYSTEM_LIBZMQ" ]; then
+  if $(cc -o libzmq_test libzmq_test.c -lzmq >/dev/null 2>&1); then
+    echo "* system has libzmq"
+    if $(./libzmq_test 2>/dev/null); then
+      echo "* libzmq has DRAFT API -> linking system library"
+      PKG_CFLAGS="-DZMQ_BUILD_DRAFT_API=1 -fPIC -Icppzmq"
+      PKG_LIBS="-lzmq"
+      CLUSTERMQ_USE_SYSTEM_LIBZMQ=1
+    else
+      echo "* no DRAFT API found -> using bundled libzmq"
+      CLUSTERMQ_USE_SYSTEM_LIBZMQ=0
+    fi
   else
-    echo "* no DRAFT API found -> using bundled libzmq"
+    echo "* no system libzmq found -> using bundled libzmq"
+    CLUSTERMQ_USE_SYSTEM_LIBZMQ=0
   fi
-else
-  echo "* no system libzmq found -> using bundled libzmq"
 fi
 
-if [ -z "$USE_SYSTEM_LIBZMQ" ]; then
-  if [ ! -f src/libzmq/autogen.sh ]; then
-    # the tarball has the submodules, a fresh clone does not
-    git submodule update --init --recursive
-  fi
+if [ "$CLUSTERMQ_USE_SYSTEM_LIBZMQ" -eq "0" ]; then
+  ./src/patch_libzmq.sh
 
   if [ ! -f src/libzmq/src/.libs/libzmq.a ]; then
     cd src/libzmq
 
-    if [ ! -f src/Makefile.am.orig ]; then
-      # remove code format helper and valgrind support that CRAN complains about
-      # sed -i does not work on macOS
-      mv Makefile.am Makefile.am.orig
-      sed '/WITH_CLANG_FORMAT/,/VALGRIND_SUPPRESSIONS_FILES/d' Makefile.am.orig > Makefile.am
-    fi
-
-    if [ ! -f src/curve_client_tools.hpp.orig ]; then
-      # remove disabled gcc check that cran complains about
-      mv src/curve_client_tools.hpp src/curve_client_tools.hpp.orig
-      sed '/^#pragma/s|^|//|' src/curve_client_tools.hpp.orig > src/curve_client_tools.hpp
-    fi
-    if [ ! -f include/zmq_utils.h.orig ]; then
-      mv include/zmq_utils.h include/zmq_utils.h.orig
-      sed '/^#pragma/s|^|//|' include/zmq_utils.h.orig > include/zmq_utils.h
-    fi
-
-    if [ ! -f Makefile.in ]; then
-      ./autogen.sh || exit 1
-    fi
-
     CXX="$CXX" CXXFLAGS="$CXXFLAGS -fPIC" CPPFLAGS="$CPPFLAGS" ./configure \
+        --enable-drafts \
         --enable-static \
         --disable-shared \
         --disable-maintainer-mode \
         --disable-Werror \
-        --enable-drafts \
         --disable-libbsd \
         --disable-libunwind \
         --disable-perf \

src/patch_libzmq.sh

@@ -0,0 +1,31 @@
+#!/bin/sh
+
+cd "$(dirname $0)"
+
+if [ ! -f libzmq/autogen.sh ]; then
+  # the tarball has the submodules, a fresh clone does not
+  git submodule update --init --recursive
+fi
+
+cd libzmq
+
+if [ ! -f src/Makefile.am.orig ]; then
+  # remove code format helper and valgrind support that CRAN complains about
+  # sed -i does not work on macOS
+  mv Makefile.am Makefile.am.orig
+  sed '/WITH_CLANG_FORMAT/,/VALGRIND_SUPPRESSIONS_FILES/d' Makefile.am.orig > Makefile.am
+fi
+
+if [ ! -f src/curve_client_tools.hpp.orig ]; then
+  # remove disabled gcc check that cran complains about
+  mv src/curve_client_tools.hpp src/curve_client_tools.hpp.orig
+  sed '/^#pragma/s|^|//|' src/curve_client_tools.hpp.orig > src/curve_client_tools.hpp
+fi
+if [ ! -f include/zmq_utils.h.orig ]; then
+  mv include/zmq_utils.h include/zmq_utils.h.orig
+  sed '/^#pragma/s|^|//|' include/zmq_utils.h.orig > include/zmq_utils.h
+fi
+
+if [ ! -f Makefile.in ]; then
+  ./autogen.sh || exit 1
+fi