dnsdist: Apply Otto's patch (thanks!)

diff --git a/pdns/dnsdistdist/meson.build b/pdns/dnsdistdist/meson.build
index 75683f1ea4516ab7612e8d7c8929c6a3383ad18f..d5e9c3e297a4e34f8603a82ccc1b7f273ab9ee2b 100644 (file)
--- a/pdns/dnsdistdist/meson.build
+++ b/pdns/dnsdistdist/meson.build
@@ -102,7 +102,6 @@ endif
 common_sources += files(
   src_dir / 'bpf-filter.cc',
   src_dir / 'capabilities.cc',
-  src_dir / 'cdb.cc',
   src_dir / 'channel.cc',
   src_dir / 'coverage.cc',
   src_dir / 'credentials.cc',

diff --git a/pdns/dnsdistdist/meson/cdb/meson.build b/pdns/dnsdistdist/meson/cdb/meson.build
index b05ee9dfc9fdab4e6848f3bcc9d7e73089ae45b5..461677317558537e47b533f658f46cc7c2ff22a7 100644 (file)
--- a/pdns/dnsdistdist/meson/cdb/meson.build
+++ b/pdns/dnsdistdist/meson/cdb/meson.build
@@ -1,7 +1,7 @@
 dep_cdb = dependency('libcdb', required: false)
 
 if not dep_cdb.found()
-  if cxx.has_header('cdb.h', required: true)
+  if cxx.has_header('cdb.h', required: false)
     if cxx.has_function('cdb_find', args: ['-lcdb'])
       dep_cdb = declare_dependency(link_args: ['-lcdb'])
     endif

diff --git a/pdns/dnsdistdist/meson/libedit/meson.build b/pdns/dnsdistdist/meson/libedit/meson.build
index 64e24d5eed440a792016998b0975fcf537beaade..55c2e298873f09b4d3034f9f4e113ca8c99cd7a1 100644 (file)
--- a/pdns/dnsdistdist/meson/libedit/meson.build
+++ b/pdns/dnsdistdist/meson/libedit/meson.build
@@ -1,5 +1,9 @@
 opt_libedit = get_option('libedit')
-dep_libedit = dependency('libedit', required: opt_libedit)
+dep_libedit = dependency('libedit', required: false)
+
+if not dep_libedit.found()
+  dep_libedit = cxx.find_library('edit', required: opt_libedit)
+endif
 
 conf.set('HAVE_LIBEDIT', dep_libedit.found(), description: 'libedit support')
 summary('libedit support', dep_libedit.found(), bool_yn: true, section: 'Edit')