Move Spicy version information out of zeek-config.h.

Turns out Spicy doesn't have nicely-named constant for version
information, but we can instead use spicyz's auto-generated `config.h`
for now.
This commit is contained in:
Robin Sommer 2023-05-15 17:23:27 +02:00
parent 90fd5c062a
commit c335245586
No known key found for this signature in database
GPG key ID: D8187293B3FFE5D0
4 changed files with 2 additions and 4 deletions

View file

@ -8,7 +8,6 @@
#include <exception>
#include <utility>
#include <hilti/rt/autogen/version.h>
#include <hilti/rt/configuration.h>
#include <hilti/rt/filesystem.h>
#include <hilti/rt/fmt.h>

View file

@ -17,6 +17,7 @@
#include "zeek/Tag.h"
#include "zeek/plugin/Component.h"
#include "zeek/plugin/Plugin.h"
#include "zeek/spicy/spicyz/config.h" // include for Spicy version
// Macro helper to report Spicy debug messages. This forwards to
// to both the Zeek logger and the Spicy runtime logger.

View file

@ -22,6 +22,7 @@
#include "zeek/Desc.h"
#include "zeek/spicy/cookie.h"
#include "zeek/spicy/manager.h"
namespace zeek::spicy::rt {

View file

@ -301,6 +301,3 @@
/* compiled with Spicy support */
#cmakedefine HAVE_SPICY
// Version of Spicy that we are compiling against.
#define SPICY_VERSION_NUMBER ${SPICY_VERSION_NUMBER}