diff --git a/CHANGES b/CHANGES index 836733370a..c93a21c4d3 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,9 @@ +2.3-533 | 2015-03-12 10:18:53 -0500 + + * Give broker python bindings default install path within --prefix. + (Jon Siwek) + 2.3-530 | 2015-03-10 13:22:39 -0500 * Fix broker data stores in absence of --enable-debug. (Jon Siwek) diff --git a/VERSION b/VERSION index 4a351a524e..781ee30b74 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.3-530 +2.3-533 diff --git a/aux/broker b/aux/broker index 78b8d909fa..11fd5761a6 160000 --- a/aux/broker +++ b/aux/broker @@ -1 +1 @@ -Subproject commit 78b8d909fadc66dd20ef89bc62b52b4e7c4b6f5f +Subproject commit 11fd5761a651d18d5ab80d7da545a1980c642e6d diff --git a/configure b/configure index 3f7295711c..b139ee2bec 100755 --- a/configure +++ b/configure @@ -149,6 +149,10 @@ while [ $# -ne 0 ]; do append_cache_entry CMAKE_INSTALL_PREFIX PATH $optarg append_cache_entry BRO_ROOT_DIR PATH $optarg append_cache_entry PY_MOD_INSTALL_DIR PATH $optarg/lib/broctl + + if [ -n "$user_enabled_broker" ]; then + append_cache_entry BROKER_PYTHON_HOME PATH $prefix + fi ;; --scriptdir=*) append_cache_entry BRO_SCRIPT_INSTALL_PATH STRING $optarg @@ -189,6 +193,8 @@ while [ $# -ne 0 ]; do --enable-broker) append_cache_entry ENABLE_CXX11 BOOL true append_cache_entry ENABLE_BROKER BOOL true + append_cache_entry BROKER_PYTHON_HOME PATH $prefix + user_enabled_broker="true" ;; --disable-broccoli) append_cache_entry INSTALL_BROCCOLI BOOL false