[#3731] Simplify heimdal checking

diff --git a/meson.build b/meson.build
index 5e105701e874db0566c6acceeb5a9570595b2bff..363754d8241c3d556efe96be9caac1869001275d 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -421,7 +421,7 @@ if result.returncode() == 0
     conf_data.set('LIBC_MUSL', d.endswith('-musl'))
 endif
 
-if KRB5_DEP.found() and KRB5_DEP.get_variable('vendor') == 'Heimdal'
+if KRB5_DEP.found() and KRB5_DEP.get_variable('vendor').contains('Heimdal')
     conf_data.set('WITH_HEIMDAL', true)
 endif
 

diff --git a/subprojects/krb5/meson.build b/subprojects/krb5/meson.build
index a16e70c536b3a1208aea17595d20b4d9def52fae..7f1dad758926db7e76e02cd9a32d3abe54772737 100644 (file)
--- a/subprojects/krb5/meson.build
+++ b/subprojects/krb5/meson.build
@@ -3,21 +3,12 @@ current_source_dir = meson.current_source_dir()
 krb5 = disabler()
 krb5_config = find_program('krb5-config', required: false)
 
-check_heimdal = find_program(
-    current_source_dir / 'check-heimdal.sh',
-    required: true,
-)
 if krb5_config.found()
     cflags = run_command([krb5_config, '--cflags', 'gssapi'], check: false)
     libs = run_command([krb5_config, '--libs', 'gssapi'], check: false)
     version = run_command([krb5_config, '--version'], check: false)
-    heimdal = run_command(check_heimdal, krb5_config.full_path(), check: false)
-    if heimdal.returncode() == 0
-        vendor = 'Heimdal'
-    else
-        vendor = 'MIT'
-    endif
-    if cflags.returncode() == 0 and libs.returncode() == 0 and version.returncode() == 0
+    vendor = run_command([krb5_config, '--vendor'], check: false)
+    if cflags.returncode() == 0 and libs.returncode() == 0 and version.returncode() == 0 and vendor.returncode() == 0
         krb5_version = version.stdout().strip()
         krb5 = declare_dependency(
             compile_args: cflags.stdout().split(),