From f7ad94f757a31678ff0cae4cf37c9704311ff57f Mon Sep 17 00:00:00 2001
From: Johanna Amann <johanna@icir.org>
Date: Thu, 6 Dec 2018 11:40:12 -0800
Subject: [PATCH] Introduce --enable-static-broker configuration option.

This option will build the bundled broker (and caf) statically.
---
 CMakeLists.txt | 9 ++++++++-
 aux/broker     | 2 +-
 configure      | 4 ++++
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7353ff9c3b..523093d34d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -271,9 +271,16 @@ if ( BROKER_ROOT_DIR )
   set(brodeps ${brodeps} ${BROKER_LIBRARY} ${CAF_LIBRARIES})
   include_directories(BEFORE ${BROKER_INCLUDE_DIR})
 else ()
+  if ( BUILD_STATIC_BROKER )
+    set(ENABLE_STATIC_ONLY true)
+  endif()
   add_subdirectory(aux/broker)
 
-  set(brodeps ${brodeps} broker)
+  if ( BUILD_STATIC_BROKER )
+    set(brodeps ${brodeps} broker_static)
+  else()
+    set(brodeps ${brodeps} broker)
+  endif()
   include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/aux/broker
                              ${CMAKE_CURRENT_BINARY_DIR}/aux/broker)
 endif ()
diff --git a/aux/broker b/aux/broker
index 0e7218b4ab..bf03a42461 160000
--- a/aux/broker
+++ b/aux/broker
@@ -1 +1 @@
-Subproject commit 0e7218b4abd98530fbea54d546f7bf99535e2127
+Subproject commit bf03a4246113c72d10530cc0c2729a3fa6f0b046
diff --git a/configure b/configure
index ee2dcbe383..ada9d21322 100755
--- a/configure
+++ b/configure
@@ -52,6 +52,7 @@ Usage: $0 [OPTION]... [VAR=VALUE]...
     --enable-perftools-debug use Google's perftools for debugging
     --enable-jemalloc      link against jemalloc
     --enable-broccoli      build or install the Broccoli library (deprecated)
+    --enable-static-broker build broker statically (ignored if --with-broker is specified)
     --disable-broctl       don't install Broctl
     --disable-auxtools     don't build or install auxiliary tools
     --disable-perftools    don't try to build with Google Perftools
@@ -223,6 +224,9 @@ while [ $# -ne 0 ]; do
             append_cache_entry DISABLE_RUBY_BINDINGS     BOOL   true
             append_cache_entry INSTALL_BROCCOLI     BOOL   yes
             ;;
+        --enable-static-broker)
+            append_cache_entry BUILD_STATIC_BROKER    BOOL    true
+            ;;
         --disable-broctl)
             append_cache_entry INSTALL_BROCTL       BOOL   false
             ;;