configure: prefer protoc from protobuf-compiler over protoc-c from protobuf-c-compiler

diff --git a/README.md b/README.md
index 5f5f3a480ad16537a12383e3eff64159e4491d86..248727fc98b26e80a0c56cce992d573659e4bf5b 100644 (file)
--- a/README.md
+++ b/README.md
@@ -28,7 +28,7 @@ sudo apt-get install \
 #### Install optional packages:
 ```bash
 sudo apt-get install \
-  libcap-ng-dev libsystemd-dev libidn2-dev libprotobuf-c-dev protobuf-c-compiler libfstrm-dev libmaxminddb-dev libnghttp2-dev libbpf-dev libxdp-dev libmnl-dev python3-sphinx python3-sphinx-panels softhsm2
+  libcap-ng-dev libsystemd-dev libidn2-dev libprotobuf-c-dev protobuf-c-compiler protobuf-compiler libfstrm-dev libmaxminddb-dev libnghttp2-dev libbpf-dev libxdp-dev libmnl-dev python3-sphinx python3-sphinx-panels softhsm2
 ```
 
 ### Fedora like distributions

diff --git a/configure.ac b/configure.ac
index 331772011d07add18af7ded4755d92376ce53cdd..1c0ee162bdb17a9981e2ae749c276fc3fa5e1c57 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -428,9 +428,13 @@ AC_ARG_ENABLE([dnstap],
   [], [enable_dnstap=no])
 
 AS_IF([test "$enable_dnstap" != "no" -o "$STATIC_MODULE_dnstap" != "no" -o "$SHARED_MODULE_dnstap" != "no"],[
-  AC_PATH_PROG([PROTOC_C], [protoc-c])
+  AC_PATH_PROG([PROTOC_C], [protoc])
   AS_IF([test -z "$PROTOC_C"],[
-    AC_MSG_ERROR([The protoc-c program was not found. Please install protobuf-c!])
+    AC_PATH_PROG([PROTOC_C], [protoc-c])
+  ])
+
+  AS_IF([test -z "$PROTOC_C"],[
+    AC_MSG_ERROR([Neither protoc nor protoc-c found. Install protobuf-compiler and protobuf-c-compiler])
   ])
   PKG_CHECK_MODULES([libfstrm], [libfstrm])
   PKG_CHECK_MODULES([libprotobuf_c], [libprotobuf-c >= 1.0.0])

diff --git a/distro/pkg/deb/control b/distro/pkg/deb/control
index 96c6960dfefc717612f4bdb3f5935b77b409b129..d205e49ccae5ea348d285833af8536531a16c877 100644 (file)
--- a/distro/pkg/deb/control
+++ b/distro/pkg/deb/control
@@ -33,6 +33,7 @@ Build-Depends:
  libxdp-dev,
  pkgconf,
  protobuf-c-compiler,
+ protobuf-compiler,
  python3-all,
  softhsm2 <!nocheck>,
 Standards-Version: 4.7.2