[#3731] Finished

diff --git a/meson.build b/meson.build
index 68467ca8e271147553ad1c3f12badeb9cee58821..30dcfd5d2a5d6f211e13fced8eb3851679d67265 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -894,14 +894,12 @@ install_emptydir('var/run/kea')
 # Print the setup report.
 message(run_command(['cat', CONFIG_REPORT], check: true).stdout())
 
-# Copy the meson.info directory.
-copy_info_conf = configuration_data()
-copy_info_conf.set('SOURCE', TOP_BUILD_DIR / 'meson-info')
-copy_info_conf.set('TARGET', PREFIX / DATADIR / 'kea/meson-info')
-copy_info = configure_file(
-    input: 'tools/copy-dir.sh.in',
-    output: 'copy-meson-info.sh',
-    configuration: copy_info_conf,
-)
-meson.add_install_script(copy_info)
-
+# Copy the meson.info directory during installation.
+if fs.is_dir(TOP_BUILD_DIR / 'meson-info')
+    meson.add_install_script(
+        'cp',
+        '-r',
+        TOP_BUILD_DIR / 'meson-info',
+        PREFIX / DATADIR / 'kea/meson-info',
+    )
+endif

diff --git a/subprojects/netconf/meson.build b/subprojects/netconf/meson.build
index 3e1f6c7fced489e4782a6b815b4bcd1489f7f328..94af1a54e007e4f66d842f9e40ece17d4c728e88 100644 (file)
--- a/subprojects/netconf/meson.build
+++ b/subprojects/netconf/meson.build
@@ -57,16 +57,46 @@ if all_deps_found
     variables = {}
     if netconf_deps['yang'].found()
         libyang_prefix = netconf_deps['yang'].get_variable('prefix')
+        libyang_version = netconf_deps['yang'].version()
+        if libyang_version == 'unknown'
+            libyang_version = 'unknown version'
+        endif
     else
         libyang_prefix = 'unknown'
+        libyang_version = 'unknown version'
     endif
     variables += {'libyang_prefix': libyang_prefix}
+    variables += {'libyang_version': libyang_version}
+    if netconf_deps['yang-cpp'].found()
+        libyangcpp_version = netconf_deps['yang-cpp'].version()
+        if libyangcpp_version == 'unknown'
+            libyangcpp_version = 'unknown version'
+        endif
+    else
+        libyangcpp_version = 'unknown version'
+    endif
+    variables += {'libyangcpp_version': libyangcpp_version}
     if netconf_deps['sysrepo'].found()
         sysrepo_prefix = netconf_deps['sysrepo'].get_variable('prefix')
+        sysrepo_version = netconf_deps['sysrepo'].version()
+        if sysrepo_version == 'unknown'
+            sysrepo_version = 'unknown version'
+        endif
     else
         sysrepo_prefix = 'unknown'
+        sysrepo_version = 'unknown version'
     endif
     variables += {'sysrepo_prefix': sysrepo_prefix}
+    variables += {'sysrepo_version': sysrepo_version}
+    if netconf_deps['sysrepo-cpp'].found()
+        sysrepocpp_version = netconf_deps['sysrepo-cpp'].version()
+        if sysrepocpp_version == 'unknown'
+            sysrepocpp_version = 'unknown version'
+        endif
+    else
+        sysrepocpp_version = 'unknown version'
+    endif
+    variables += {'sysrepocpp_version': sysrepocpp_version}
     netconf = declare_dependency(
         dependencies: [
             netconf_deps['yang'],
@@ -80,4 +110,3 @@ else
     # Can't use a disabler here?
     netconf = dependency('')
 endif
-

diff --git a/tools/copy-dir.sh.in b/tools/copy-dir.sh.in
deleted file mode 100755 (executable)
index 9860f72..0000000
--- a/tools/copy-dir.sh.in
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-set -eu
-
-if test -d @SOURCE@; then
-    cp -r @SOURCE@ @TARGET@
-fi