Configure with --enable-dnstap by default

All platforms but OpenBSD have dnstap dependencies readily in their
respective repositories, and dnstap thus can be tested there. Given that
majority of images have dnstap dependencies available, it seems fitting
to make dnstap enabled by default.

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 828413ddcf328924a575654b0e6c210b5a31600f..5b57fb46737d5c7fcd3f95831d5c04acc7203ac6 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -215,6 +215,7 @@ stages:
     --disable-maintainer-mode \
     --enable-developer \
     --enable-option-checking=fatal \
+    --enable-dnstap \
     --with-cmocka \
     --with-libxml2 \
     --with-json-c \
@@ -572,7 +573,7 @@ gcc:alpine3.13:amd64:
   variables:
     CC: gcc
     CFLAGS: "${CFLAGS_COMMON}"
-    EXTRA_CONFIGURE: "--enable-dnstap ${WITHOUT_READLINE}"
+    EXTRA_CONFIGURE: "${WITHOUT_READLINE}"
   <<: *alpine_3_13_amd64_image
   <<: *build_job
 
@@ -596,7 +597,7 @@ gcc:centos7:amd64:
   variables:
     CC: gcc
     CFLAGS: "${CFLAGS_COMMON}"
-    EXTRA_CONFIGURE: "--enable-dnstap --with-libidn2"
+    EXTRA_CONFIGURE: "--with-libidn2"
   <<: *centos_centos7_amd64_image
   <<: *build_job
 
@@ -668,7 +669,7 @@ gcc:buster:amd64:
   variables:
     CC: gcc
     CFLAGS: "${CFLAGS_COMMON} --coverage -O0"
-    EXTRA_CONFIGURE: "--enable-dnstap --with-libidn2 ${WITH_READLINE_LIBEDIT}"
+    EXTRA_CONFIGURE: "--with-libidn2 ${WITH_READLINE_LIBEDIT}"
   <<: *debian_buster_amd64_image
   <<: *build_job
 
@@ -704,7 +705,7 @@ scan-build:
     CC: "${CLANG}"
     CFLAGS: "${CFLAGS_COMMON}"
     CONFIGURE: "${SCAN_BUILD} ./configure"
-    EXTRA_CONFIGURE: "--enable-dnstap --with-libidn2"
+    EXTRA_CONFIGURE: "--with-libidn2"
   script:
     - *configure
     - *scan_build
@@ -724,7 +725,7 @@ gcc:sid:amd64:
   variables:
     CC: gcc
     CFLAGS: "${CFLAGS_COMMON} -O3"
-    EXTRA_CONFIGURE: "--enable-dnstap --with-libidn2 --without-lmdb"
+    EXTRA_CONFIGURE: "--with-libidn2 --without-lmdb"
     RUN_MAKE_INSTALL: 1
   <<: *debian_sid_amd64_image
   <<: *build_job
@@ -755,7 +756,7 @@ gcc:out-of-tree:
     CC: gcc
     CFLAGS: "${CFLAGS_COMMON} -Og"
     CONFIGURE: "${CI_PROJECT_DIR}/configure"
-    EXTRA_CONFIGURE: "--enable-dnstap --with-libidn2 --with-lmdb"
+    EXTRA_CONFIGURE: "--with-libidn2 --with-lmdb"
     RUN_MAKE_INSTALL: 1
     OUT_OF_TREE_WORKSPACE: /tmp/out_of_tree_workspace
   <<: *base_image
@@ -779,7 +780,7 @@ system:gcc:out-of-tree:
 gcc:tarball:
   variables:
     CC: gcc
-    EXTRA_CONFIGURE: "--enable-dnstap --with-libidn2"
+    EXTRA_CONFIGURE: "--with-libidn2"
     RUN_MAKE_INSTALL: 1
   <<: *base_image
   <<: *build_job
@@ -1109,7 +1110,7 @@ unit:clang:freebsd11:amd64:
 clang:freebsd12:amd64:
   variables:
     CFLAGS: "${CFLAGS_COMMON}"
-    EXTRA_CONFIGURE: "--enable-dnstap ${WITH_READLINE_EDITLINE}"
+    EXTRA_CONFIGURE: "${WITH_READLINE_EDITLINE}"
     USER: gitlab-runner
   <<: *freebsd_12_amd64_image
   <<: *build_job
@@ -1137,6 +1138,7 @@ clang:openbsd:amd64:
   variables:
     CC: clang
     USER: gitlab-runner
+    EXTRA_CONFIGURE: "--disable-dnstap"
   <<: *openbsd_amd64_image
   <<: *build_job
 
@@ -1281,7 +1283,7 @@ coverity:
   variables:
     CC: gcc
     CFLAGS: "${CFLAGS_COMMON} -Og"
-    EXTRA_CONFIGURE: "--enable-dnstap --with-libidn2"
+    EXTRA_CONFIGURE: "--with-libidn2"
   script:
     - *coverity_cache_prep
     - *configure