Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-10 10:38:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge remote-tracking branch 'origin/topic/vlad/configure_plugin_dir'

Browse source 
* origin/topic/vlad/configure_plugin_dir:
  Expose a configure-time option to set the plugin path.
This commit is contained in:
Jon Siwek 2021-03-23 17:25:02 -07:00
commit 52b3e159a4
4 changed files with 19 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
CHANGES
View file

@ -1,4 +1,10 @@
4.1.0-dev.346 | 2021-03-23 17:25:02 -0700
* Add new ``./configure --plugindir`` option (Vlad Grigorescu)
Useful for customizing the default installation path for plugins.
4.1.0-dev.344 | 2021-03-23 16:29:27 -0700 4.1.0-dev.344 | 2021-03-23 16:29:27 -0700
* Clean up iterator usage in Analyzer (Tim Wojtulewicz, Corelight) * Clean up iterator usage in Analyzer (Tim Wojtulewicz, Corelight)

10
CMakeLists.txt
View file

@ -56,8 +56,14 @@ get_filename_component(ZEEK_SCRIPT_INSTALL_PATH ${ZEEK_SCRIPT_INSTALL_PATH}
# A folder for library-like Zeek-specific things: Python modules, Zeek # A folder for library-like Zeek-specific things: Python modules, Zeek
# plugins, etc. # plugins, etc.
set(ZEEK_LIBDIR_PATH ${CMAKE_INSTALL_FULL_LIBDIR}/zeek) set(ZEEK_LIBDIR_PATH ${CMAKE_INSTALL_FULL_LIBDIR}/zeek)
set(BRO_PLUGIN_INSTALL_PATH ${ZEEK_LIBDIR_PATH}/plugins
CACHE STRING "Installation path for plugins" FORCE) if (ZEEK_PLUGIN_DIR)
set(BRO_PLUGIN_INSTALL_PATH ${ZEEK_PLUGIN_DIR}
CACHE STRING "Installation path for plugins" FORCE)
else ()
set(BRO_PLUGIN_INSTALL_PATH ${ZEEK_LIBDIR_PATH}/plugins
CACHE STRING "Installation path for plugins" FORCE)
endif ()
configure_file(zeek-path-dev.in ${CMAKE_CURRENT_BINARY_DIR}/zeek-path-dev) configure_file(zeek-path-dev.in ${CMAKE_CURRENT_BINARY_DIR}/zeek-path-dev)
execute_process(COMMAND "${CMAKE_COMMAND}" -E create_symlink execute_process(COMMAND "${CMAKE_COMMAND}" -E create_symlink

2
VERSION
View file

@ -1 +1 @@
4.1.0-dev.344 4.1.0-dev.346

4
configure vendored
View file

@ -41,6 +41,7 @@ Usage: $0 [OPTION]... [VAR=VALUE]...
--logdir=PATH when using ZeekControl, path to store log file --logdir=PATH when using ZeekControl, path to store log file
[PREFIX/logs] [PREFIX/logs]
--libdir=PATH installation directory for library files [PREFIX/lib] --libdir=PATH installation directory for library files [PREFIX/lib]
--plugindir=PATH installation directory for plugins [LIBDIR/zeek/plugin]
--conf-files-dir=PATH config files installation directory [PREFIX/etc] --conf-files-dir=PATH config files installation directory [PREFIX/etc]
--mandir=PATH installation path for man pages [PREFIX/share/man] --mandir=PATH installation path for man pages [PREFIX/share/man]
--python-dir=PATH explicit installation directory for Python modules --python-dir=PATH explicit installation directory for Python modules
@ -213,6 +214,9 @@ while [ $# -ne 0 ]; do
--libdir=*) --libdir=*)
append_cache_entry CMAKE_INSTALL_LIBDIR PATH $optarg append_cache_entry CMAKE_INSTALL_LIBDIR PATH $optarg
;; ;;
--plugindir=*)
append_cache_entry ZEEK_PLUGIN_DIR PATH $optarg
;;
--python-dir=*) --python-dir=*)
append_cache_entry ZEEK_PYTHON_DIR PATH $optarg append_cache_entry ZEEK_PYTHON_DIR PATH $optarg
;; ;;