--- meson.build.orig	2026-09-19 15:10:20 UTC
+++ meson.build
@@ -366,7 +366,7 @@ statedir = '-D_PATH_STATEDIR="' + localstatedir + '/ne
 messagedir = '-DSERVERTEXT="' + localstatedir + '/netatalk/msg/"'
 naddir = '-D_PATH_NAD="' + bindir + '/nad"'
 statedir = '-D_PATH_STATEDIR="' + localstatedir + '/netatalk/"'
-uamdir = '-D_PATH_AFPDUAMPATH="' + libdir + '/netatalk/"'
+uamdir = '-D_PATH_AFPDUAMPATH="' + libexecdir + '/netatalk-uams/"'
 
 ############
 # Includes #
@@ -699,6 +699,7 @@ if enable_dbd_backend
     endif
 
     bdb_subdirs = [
+        '%%DB_NAME%%',
         'db62',
         'db6.2',
         'db61',
@@ -1274,12 +1275,12 @@ dns_sd_libs = []
 
 dns_sd_libs = []
 
-dns_sd = cc.find_library('dns_sd', required: false)
+dns_sd = cc.find_library('dns_sd', dirs: libsearch_dirs, required: false)
 if dns_sd.found()
     dns_sd_libs += dns_sd
 endif
 
-system = cc.find_library('system', required: false)
+system = cc.find_library('system', dirs: libsearch_dirs, required: false)
 if dns_sd.found()
     dns_sd_libs += system
 endif
@@ -1293,6 +1294,8 @@ have_dns = (
     )
 )
 
+threads = dependency('threads', required: true)
+
 if enable_zeroconf
     if host_os == 'darwin'
         # On Darwin/macOS, prefer mDNS over Avahi
@@ -1302,6 +1305,7 @@ if enable_zeroconf
             cdata.set('HAVE_MDNS', 1)
             cdata.set('freebsd_zeroconf', 'mdnsd')
             zeroconf_provider += 'mDNS'
+            dns_sd_libs += threads
         elif avahi.found()
             have_zeroconf = true
             cdata.set('USE_ZEROCONF', 1)
@@ -1323,6 +1327,7 @@ if enable_zeroconf
             cdata.set('HAVE_MDNS', 1)
             cdata.set('freebsd_zeroconf', 'mdnsd')
             zeroconf_provider += 'mDNS'
+            dns_sd_libs += threads
         endif
     endif
 endif
@@ -1990,6 +1995,7 @@ if not enable_pam
 
 if not enable_pam
     have_pam = false
+    pam = dependency('', required: false)
 else
     if host_os != 'sunos'
         pam_paths = [