From 09e6125012a30e57d71f7af4e610f989fecce994 Mon Sep 17 00:00:00 2001
From: dgsga <181612+dgsga@users.noreply.github.com>
Date: Wed, 13 Mar 2024 19:30:06 +0000
Subject: [PATCH] Improve syntax in root meson.build

---
 .github/workflows/meson.yml |  2 +-
 etc/spotlight/meson.build   | 11 +++++++++--
 include/atalk/meson.build   |  2 +-
 meson.build                 | 33 +++++++++++++++------------------
 4 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/meson.yml b/.github/workflows/meson.yml
index 12e98ee33fd3..8476c5417ea9 100644
--- a/.github/workflows/meson.yml
+++ b/.github/workflows/meson.yml
@@ -2,7 +2,7 @@ name: Checks
 on:
   push:
     branches:
-      - dgsga-meson-builds
+      - dgsga-meson-build
     paths-ignore:
       - "CONTRIBUTORS"
       - "NEWS"
diff --git a/etc/spotlight/meson.build b/etc/spotlight/meson.build
index b53ce4813a04..41fc2fcfb73d 100644
--- a/etc/spotlight/meson.build
+++ b/etc/spotlight/meson.build
@@ -3,9 +3,16 @@ run_command(
     '-o',
     'spotlight_rawquery_lexer.c',
     'spotlight_rawquery_lexer.l',
-    check: true
+    check: true,
+)
+run_command(
+    bison,
+    '-d',
+    '-o',
+    'sparql_parser.c',
+    'sparql_parser.y',
+    check: true,
 )
-run_command(bison, '-d', '-o', 'sparql_parser.c', 'sparql_parser.y', check: true)
 
 srp_sources = ['sparql_map.c', 'sparql_parser.c', 'spotlight_rawquery_lexer.c']
 
diff --git a/include/atalk/meson.build b/include/atalk/meson.build
index 99cb5600a1c2..19dc8739a517 100644
--- a/include/atalk/meson.build
+++ b/include/atalk/meson.build
@@ -30,7 +30,7 @@ if with_dtrace
         '-h',
         '-s',
         'afp_dtrace.d',
-        check: true
+        check: true,
     )
 endif
 
diff --git a/meson.build b/meson.build
index 7169bf44b446..3c1155447b9c 100644
--- a/meson.build
+++ b/meson.build
@@ -375,8 +375,7 @@ if get_option('with-bdb') != ''
             bdb_includes += include_directories(with_bdb / 'include' / subdir)
         endif
     endforeach
-endif
-
+else
     foreach dir : bdb_dirs
         foreach subdir : bdb_subdirs
             if fs.exists('/usr' / dir / 'include' / subdir / 'db.h')
@@ -393,6 +392,7 @@ endif
             break
         endif
     endforeach
+endif
 
 if enable_rpath
     bdb_link_args += '-R' + bdb_libdir
@@ -536,18 +536,18 @@ if get_option('with-gssapi') != ''
         required: false,
     )
     gssapi_includes += include_directories(with_gssapi / 'include')
-endif
-
-gss = cc.find_library('gss', dirs: libsearch_dirs, required: false)
-if not gss.found()
-    gss = cc.find_library('gssapi', dirs: libsearch_dirs, required: false)
-endif
-if not gss.found()
-    gss = cc.find_library(
-        'gssapi_krb5',
-        dirs: libsearch_dirs,
-        required: false,
-    )
+else
+    gss = cc.find_library('gss', dirs: libsearch_dirs, required: false)
+    if not gss.found()
+        gss = cc.find_library('gssapi', dirs: libsearch_dirs, required: false)
+    endif
+    if not gss.found()
+        gss = cc.find_library(
+            'gssapi_krb5',
+            dirs: libsearch_dirs,
+            required: false,
+        )
+    endif
 endif
 
 if not gss.found()
@@ -776,8 +776,7 @@ else
             or tracker_control.found()
         )
         if tracker_ok
-
-            # Check for talloc
+        # Check for talloc
 
             if talloc.found()
                 cdata.set('HAVE_TALLOC', 1)
@@ -1290,7 +1289,6 @@ cdata.set('compiled_backends', compiled_backends)
 default_backend = get_option('with-cnid-default-backend')
 cdata.set('DEFAULT_CNID_SCHEME', '"' + default_backend + '"')
 
-
 if default_backend == 'dbd' and not use_dbd_backend
     error('Specified default CNID scheme dbd was not selected for compilation')
 elif default_backend == 'last' and not use_last_backend
@@ -1629,7 +1627,6 @@ sed_command = [
     '@INPUT@',
 ]
 
-
 #
 # Check for cracklib support
 #