meson: avoid protoc-c, as it's (reported as) deprecated

> `protoc-c` is deprecated. Please use `protoc` instead!

diff --git a/distro/pkg/rpm/knot-resolver.spec b/distro/pkg/rpm/knot-resolver.spec
index 504ae7ed70f39df73f65ad48095ba29684b6e4d3..41cc1da23049c6eed393a5a42f236acb04b107b5 100644 (file)
--- a/distro/pkg/rpm/knot-resolver.spec
+++ b/distro/pkg/rpm/knot-resolver.spec
@@ -68,7 +68,7 @@ Recommends:     python3-prometheus_client
 Recommends:     python3-watchdog
 
 # dnstap module dependencies
-# SUSE is missing protoc-c protobuf compiler
+# SUSE is missing protoc protobuf compiler
 %if "x%{?suse_version}" == "x"
 BuildRequires:  pkgconfig(libfstrm)
 BuildRequires:  pkgconfig(libprotobuf-c)

diff --git a/modules/dnstap/meson.build b/modules/dnstap/meson.build
index 038bf3e3db7f502fa1b178a2ea23a132e6f4f075..07cece592a5d66713e51ff7ee1f8c832405fe337 100644 (file)
--- a/modules/dnstap/meson.build
+++ b/modules/dnstap/meson.build
@@ -12,9 +12,9 @@ if get_option('dnstap') != 'disabled'
   message('--- dnstap module dependencies ---')
   libprotobuf_c = dependency('libprotobuf-c', version: '>=1', required: dnstap_required)
   libfstrm = dependency('libfstrm', version: '>=0.2', required: dnstap_required)
-  protoc_c = find_program('protoc-c', required: dnstap_required)
+  protoc = find_program(['protoc', 'protoc-c'], required: dnstap_required)
   message('----------------------------------')
-  if libprotobuf_c.found() and libfstrm.found() and protoc_c.found()
+  if libprotobuf_c.found() and libfstrm.found() and protoc.found()
     build_dnstap = true
   endif
 endif
@@ -23,11 +23,11 @@ endif
 if build_dnstap
   c_src_lint += dnstap_src
 
-  # generate protobuf-c sources using protoc-c
+  # generate protobuf-c sources using protoc
   dnstap_pb = custom_target(
     'dnstap_pb',
     command: [
-      protoc_c,
+      protoc,
       '--c_out=' + meson.current_build_dir(),
       '--proto_path', meson.current_source_dir(),
       meson.current_source_dir() / 'dnstap.proto',