diff --git a/CHANGES b/CHANGES index 66e686e..fbd6147 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,8 @@ +0.43-11 | 2019-10-28 22:22:26 -0700 + + * Prefer cmake3 in Zeek plugin configure skeleton (Jon Siwek, Corelight) + 0.43-10 | 2019-10-28 18:05:09 -0700 * Move CMake project() after cmake_minimum_required() (Jon Siwek, Corelight) diff --git a/README b/README index 662f639..6631e58 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ .. -*- mode: rst; -*- .. .. Version number is filled in automatically. -.. |version| replace:: 0.43-10 +.. |version| replace:: 0.43-11 ======================= Zeek Auxiliary Programs diff --git a/VERSION b/VERSION index 9d758a6..1a2ea5b 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.43-10 +0.43-11 diff --git a/plugin-support/skeleton/configure b/plugin-support/skeleton/configure index b06992f..84c021e 100755 --- a/plugin-support/skeleton/configure +++ b/plugin-support/skeleton/configure @@ -14,21 +14,13 @@ if [ -e `dirname $0`/configure.plugin ]; then . `dirname $0`/configure.plugin fi -# Check for `cmake` command. -type cmake > /dev/null 2>&1 || { - echo "\ -This package requires CMake, please install it first, then you may -use this configure script to access CMake equivalent functionality.\ -" >&2; - exit 1; -} - usage() { cat 1>&2 </dev/null 2>&1 ; then + CMakeCommand="cmake3" + elif command -v cmake >/dev/null 2>&1 ; then + CMakeCommand="cmake" + else + echo "This package requires CMake, please install it first." + echo "Then you may use this script to configure the CMake build." + echo "Note: pass --cmake=PATH to use cmake in non-standard locations." + exit 1; + fi +fi + if [ -z "$zeekdist" ]; then if type zeek-config >/dev/null 2>&1; then zeek_config="zeek-config" @@ -194,7 +204,7 @@ echo "Zeek Source Directory : $zeekdist" mkdir -p $builddir cd $builddir -cmake $CMakeCacheEntries .. +"$CMakeCommand" $CMakeCacheEntries .. echo "# This is the command used to configure this build" > config.status echo $command >> config.status