Meson: Rework libdecaf header file detection

diff --git a/meson/libdecaf/meson.build b/meson/libdecaf/meson.build
index ae26fc19b68d3715e29a4f0ca73801dd86e30d38..c7b274bfc384ad50f0e5f8b163a06546a001ce69 100644 (file)
--- a/meson/libdecaf/meson.build
+++ b/meson/libdecaf/meson.build
@@ -1,9 +1,6 @@
 opt_libdecaf = get_option('signers-libdecaf')
 dep_libdecaf = dependency('', required: false)
 
-found_header = false
-header_path = false
-
 if not opt_libdecaf.disabled()
   dep_libdecaf = dependency('libdecaf', required: false)
 
@@ -21,42 +18,28 @@ if not opt_libdecaf.disabled()
   endif
 
   if dep_libdecaf.found()
-    include_dirs = [
+    message('Libdecaf: Checking for header file')
+
+    include_dirs = include_directories(
       '/usr' / 'include',
       '/usr' / 'include' / 'decaf',
       '/usr' / 'local' / 'include',
       '/usr' / 'local' / 'include' / 'decaf',
-    ]
-
-    do_break = false
-    foreach dirname: include_dirs
-      dir = include_directories(dirname, is_system: true)
-
-      header_path = dirname / 'decaf.hxx'
-      message('Libdecaf: Checking for ' + header_path)
-
-      found_header = cxx.has_header(
-        'decaf.hxx',
-        dependencies: dep_libdecaf,
-        required: false,
-        include_directories: dir,
-      )
+      is_system: true,
+    )
 
-      if found_header
-        dep_libdecaf = declare_dependency(
-          include_directories: dir,
-          dependencies: dep_libdecaf,
-        )
+    cxx.has_header(
+      'decaf.hxx',
+      required: true,
+      include_directories: include_dirs,
+    )
 
-        break
-      endif
-    endforeach
+    dep_libdecaf = declare_dependency(
+      include_directories: dir,
+      dependencies: dep_libdecaf,
+    )
   endif
 endif
 
-conf.set('HAVE_LIBDECAF', dep_libdecaf.found() and found_header, description: 'libdecaf-based signers')
+conf.set('HAVE_LIBDECAF', dep_libdecaf.found(), description: 'libdecaf-based signers')
 summary('libdecaf', dep_libdecaf.found(), bool_yn: true, section: 'Crypto')
-
-if dep_libdecaf.found()
-  summary('libdecaf headers', header_path, bool_yn: true, section: 'Crypto')
-endif