From: Pavel Hrdina <phrdina@redhat.com>
Date: Wed, 20 May 2020 14:28:46 +0000 (+0200)
Subject: meson: tools: build virt-login-shell binary
X-Git-Tag: v6.7.0-rc1~347
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2c1bf41373471e771f85ef8ae5d2b226d2aebd29;p=thirdparty%2Flibvirt.git

meson: tools: build virt-login-shell binary

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Neal Gompa <ngompa13@gmail.com>
---

diff --git a/tools/Makefile.am b/tools/Makefile.am
index 40e73d1b83..51507ba1e3 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -41,7 +41,6 @@ endif WITH_SANLOCK
 
 if WITH_LOGIN_SHELL
 conf_DATA += virt-login-shell.conf
-bin_PROGRAMS += virt-login-shell
 libexec_PROGRAMS = virt-login-shell-helper
 endif WITH_LOGIN_SHELL
 
@@ -62,14 +61,6 @@ virt-sanlock-cleanup: virt-sanlock-cleanup.in Makefile
 
 noinst_LTLIBRARIES =
 
-# virt-login-shell will be setuid, and must not link to anything
-# except glibc. It wil scrub the environment and then invoke the
-# real virt-login-shell-helper binary.
-virt_login_shell_SOURCES = \
-		virt-login-shell.c
-
-virt_login_shell_CPPFLAGS = $(STANDALONE_CPPFLAGS)
-
 virt_login_shell_helper_SOURCES = \
 		virt-login-shell-helper.c
 
diff --git a/tools/meson.build b/tools/meson.build
index 4229119d5e..183620e33a 100644
--- a/tools/meson.build
+++ b/tools/meson.build
@@ -78,3 +78,20 @@ if conf.has('WITH_HOST_VALIDATE')
     install_rpath: libdir,
   )
 endif
+
+if conf.has('WITH_LOGIN_SHELL')
+  # virt-login-shell will be setuid, and must not link to anything
+  # except glibc. It wil scrub the environment and then invoke the
+  # real virt-login-shell-helper binary.
+  executable(
+    'virt-login-shell',
+    [
+      'virt-login-shell.c',
+    ],
+    include_directories: [
+      top_inc_dir,
+    ],
+    install: true,
+    install_dir: bindir,
+  )
+endif