gc: use kresd versioning instead of separate one

I don't think it makes sense to ever package it separately from kresd,
so why should it have separate versioning? (could be confusing)

diff --git a/utils/cache_gc/kr_cache_gc.h b/utils/cache_gc/kr_cache_gc.h
index 839e553d5bdc7f0438765371bc5b762f628ba413..ee360abbce8965e611b4054dfb0dfea82646cf4c 100644 (file)
--- a/utils/cache_gc/kr_cache_gc.h
+++ b/utils/cache_gc/kr_cache_gc.h
@@ -38,4 +38,3 @@ typedef struct kr_cache_gc_state kr_cache_gc_state_t;
 int kr_cache_gc(kr_cache_gc_cfg_t *cfg, kr_cache_gc_state_t **state);
 void kr_cache_gc_free_state(kr_cache_gc_state_t **state);
 
-#define KR_CACHE_GC_VERSION "0.2"

diff --git a/utils/cache_gc/main.c b/utils/cache_gc/main.c
index 41654c8438f260d61e26de7d39b69abcae5748e5..efb25c20007f7c8f73a5a1bf36c309612dfce121 100644 (file)
--- a/utils/cache_gc/main.c
+++ b/utils/cache_gc/main.c
@@ -8,6 +8,7 @@
 #include <lib/defines.h>
 #include <libknot/libknot.h>
 
+#include "kresconfig.h"
 #include "kr_cache_gc.h"
 
 volatile static int killed = 0;
@@ -55,7 +56,7 @@ static long get_nonneg_optarg()
 
 int main(int argc, char *argv[])
 {
-       printf("Knot Resolver Cache Garbage Collector v. %s\n", KR_CACHE_GC_VERSION);
+       printf("Knot Resolver Cache Garbage Collector, version %s\n", PACKAGE_VERSION);
        if (setvbuf(stdout, NULL, _IONBF, 0) || setvbuf(stderr, NULL, _IONBF, 0)) {
                fprintf(stderr, "Failed to to set output buffering (ignored): %s\n",
                                strerror(errno));

diff --git a/utils/cache_gc/meson.build b/utils/cache_gc/meson.build
index 3b07e0a942ca56ff4eafc4434cccfa412c621db8..a0025acd7f7597d326d814a65043ffe12ab488a1 100644 (file)
--- a/utils/cache_gc/meson.build
+++ b/utils/cache_gc/meson.build
@@ -14,6 +14,7 @@ if build_utils
     'kres-cache-gc',
     cache_gc_src,
     dependencies: [
+      kresconfig_dep,
       contrib_dep,
       libkres_dep,
       libknot,