Meson: Fix libdecaf's detection of header file location

diff --git a/meson/libdecaf/meson.build b/meson/libdecaf/meson.build
index e0b39b8843358cc87abb380c093c0bf9a4af9781..aaee9b69c63e037fdcde725c7666227423461cd8 100644 (file)
--- a/meson/libdecaf/meson.build
+++ b/meson/libdecaf/meson.build
@@ -7,41 +7,37 @@ header_path = false
 if not opt_libdecaf.disabled()
   dep_libdecaf = dependency('libdecaf', required: false)
   if not dep_libdecaf.found()
-    dep_libdecaf = cxx.find_library('decaf', dirs: ['/usr', '/usr/local'], required: opt_libdecaf)
+    dep_libdecaf = cxx.find_library('decaf', dirs: ['/usr', '/usr' / 'local'], required: opt_libdecaf)
   endif
 
   if dep_libdecaf.found()
-    include_dirs = ['/usr/include', '/usr/local/include']
-    headers = ['decaf.hxx', 'decaf/decaf.hxx']
+    include_dirs = [
+      '/usr' / 'include',
+      '/usr' / 'include' / 'decaf',
+      '/usr' / 'local' / 'include',
+      '/usr' / 'local' / 'include' / 'decaf'
+    ]
 
     do_break = false
     foreach dirname: include_dirs
-      header_path = false
       dir = include_directories(dirname, is_system: true)
 
-      foreach header: headers
-        header_path = dirname / header
-        message('Libdecaf: Checking for ' + header_path)
+      header_path = dirname / 'decaf.hxx'
+      message('Libdecaf: Checking for ' + header_path)
 
-        found_header = cxx.has_header(
-          header,
+      found_header = cxx.has_header(
+        'decaf.hxx',
+        dependencies: dep_libdecaf,
+        required: false,
+        include_directories: dir,
+      )
+
+      if found_header
+        dep_libdecaf = declare_dependency(
+          compile_args: ['-I' + dirname],
           dependencies: dep_libdecaf,
-          required: false,
-          include_directories: dir,
         )
 
-        if found_header
-          dep_libdecaf = declare_dependency(
-            compile_args: ['-I' + dirname],
-            dependencies: dep_libdecaf,
-          )
-
-          do_break = true
-          break
-        endif
-      endforeach
-
-      if do_break
         break
       endif
     endforeach