[#3731] Some fixes

diff --git a/changelog_unreleased/3731-meson b/changelog_unreleased/3731-meson
index b761b0def138dd9d71d47795aed0284ba858ab2e..b0b4452422f6eacdeae80c4564ca4c5456992633 100644 (file)
--- a/changelog_unreleased/3731-meson
+++ b/changelog_unreleased/3731-meson
@@ -1,3 +1,3 @@
 [build]                andrei, fdupont
-       Add meson as a build system.
+       Added meson as a build system.
        (Gitlab #3443, #3729, #3730, #3731)

diff --git a/meson.build b/meson.build
index c483c4002123c438f30b18379790678100514342..4d4eecd61e752f3da95c9258bdfdd32935b0c2fd 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -37,6 +37,7 @@ python_module = import('python')
 TOP_BUILD_DIR = meson.current_build_dir()
 TOP_SOURCE_DIR = meson.current_source_dir()
 
+BINDIR = get_option('bindir')
 DATADIR = get_option('datadir')
 LIBDIR = get_option('libdir')
 LOCALSTATEDIR = get_option('localstatedir')

diff --git a/src/lib/log/compiler/meson.build b/src/lib/log/compiler/meson.build
index 901884df08660b2f0587998e86e93f4a2a9ebf13..e808336529889f1f234b5b335972bf1f2dcba181 100644 (file)
--- a/src/lib/log/compiler/meson.build
+++ b/src/lib/log/compiler/meson.build
@@ -7,6 +7,6 @@ KEA_MSG_COMPILER = executable(
     'message.cc',
     include_directories: INCLUDES,
     install: true,
-    install_dir: 'bin',
+    install_dir: BINDIR,
     link_with: LIBS_BUILT_SO_FAR,
 )

diff --git a/subprojects/krb5/meson.build b/subprojects/krb5/meson.build
index 28622555b70725cfefd906e809693774b37dfe2c..6368cf1ef79105017006a6ceee805af45bcba955 100644 (file)
--- a/subprojects/krb5/meson.build
+++ b/subprojects/krb5/meson.build
@@ -6,35 +6,23 @@ krb5_config = find_program('krb5-config', required: false)
 if krb5_config.found()
     # Detect vendor.
     vendor_cmd = run_command([krb5_config, '--vendor'], check: false)
-    vendor = 'unknown'
-    if vendor_cmd.returncode() == 0
-        vendor = vendor_cmd.stdout().strip()
+    if vendor_cmd.returncode() != 0
+        path = krb5_config.full_path()
+        message(f'Very old and not usable config script at @path@')
     else
-        all = run_command([krb5_config, '--all'], check: false)
-        if all.returncode() == 0
-            foreach i : all.stdout().split('\n')
-                if i.startswith('Vendor')
-                    vendor = i.split(':')[1].strip()
-                    break
-                endif
-            endforeach
-        endif
+        vendor = vendor_cmd.stdout().strip()
     endif
 
     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)
-    if cflags.returncode() == 0 and libs.returncode() == 0 and version.returncode() == 0
+    if vendor_cmd.returncode() == 0 and cflags.returncode() == 0 and libs.returncode() == 0 and version.returncode() == 0
         krb5_version = version.stdout().strip()
         krb5 = declare_dependency(
             compile_args: cflags.stdout().split(),
             link_args: libs.stdout().split(),
             version: krb5_version,
-            variables: {
-                'cflags': cflags.stdout().strip(),
-                'libs': libs.stdout().strip(),
-                'vendor': vendor,
-            },
+            variables: { 'vendor': vendor, },
         )
     endif
 endif