mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-10-30 01:43:23 +00:00
Allow building lxc without virt-login-shell
Add a configure option to disable virt-login-shell build even if lxc is enabled.
This commit is contained in:
parent
8c865052b9
commit
bec787ee9d
@ -1085,6 +1085,14 @@ if test "$with_lxc" = "yes" ; then
|
|||||||
fi
|
fi
|
||||||
AM_CONDITIONAL([WITH_LXC], [test "$with_lxc" = "yes"])
|
AM_CONDITIONAL([WITH_LXC], [test "$with_lxc" = "yes"])
|
||||||
|
|
||||||
|
dnl
|
||||||
|
dnl Check for virt-login-shell
|
||||||
|
dnl
|
||||||
|
|
||||||
|
LIBVIRT_CHECK_LOGIN_SHELL
|
||||||
|
|
||||||
|
AM_CONDITIONAL([WITH_SETUID_RPC_CLIENT], [test "$with_lxc$with_login_shell" != "nono"])
|
||||||
|
|
||||||
dnl
|
dnl
|
||||||
dnl Checks for the Parallels driver
|
dnl Checks for the Parallels driver
|
||||||
dnl
|
dnl
|
||||||
@ -2985,6 +2993,7 @@ AC_MSG_NOTICE([ Init script: $with_init_script])
|
|||||||
AC_MSG_NOTICE([Char device locks: $with_chrdev_lock_files])
|
AC_MSG_NOTICE([Char device locks: $with_chrdev_lock_files])
|
||||||
AC_MSG_NOTICE([ Default Editor: $DEFAULT_EDITOR])
|
AC_MSG_NOTICE([ Default Editor: $DEFAULT_EDITOR])
|
||||||
AC_MSG_NOTICE([ Loader/NVRAM: $with_loader_nvram])
|
AC_MSG_NOTICE([ Loader/NVRAM: $with_loader_nvram])
|
||||||
|
AC_MSG_NOTICE([ virt-login-shell: $with_login_shell])
|
||||||
AC_MSG_NOTICE([])
|
AC_MSG_NOTICE([])
|
||||||
AC_MSG_NOTICE([Developer Tools])
|
AC_MSG_NOTICE([Developer Tools])
|
||||||
AC_MSG_NOTICE([])
|
AC_MSG_NOTICE([])
|
||||||
|
27
m4/virt-login-shell.m4
Normal file
27
m4/virt-login-shell.m4
Normal file
@ -0,0 +1,27 @@
|
|||||||
|
dnl Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||||
|
dnl
|
||||||
|
dnl This library is free software; you can redistribute it and/or
|
||||||
|
dnl modify it under the terms of the GNU Lesser General Public
|
||||||
|
dnl License as published by the Free Software Foundation; either
|
||||||
|
dnl version 2.1 of the License, or (at your option) any later version.
|
||||||
|
dnl
|
||||||
|
dnl This library is distributed in the hope that it will be useful,
|
||||||
|
dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||||
|
dnl Lesser General Public License for more details.
|
||||||
|
dnl
|
||||||
|
dnl You should have received a copy of the GNU Lesser General Public
|
||||||
|
dnl License along with this library. If not, see
|
||||||
|
dnl <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
AC_DEFUN([LIBVIRT_CHECK_LOGIN_SHELL], [
|
||||||
|
AC_ARG_WITH([login_shell],
|
||||||
|
[AS_HELP_STRING([--with-login-shell],
|
||||||
|
[build virt-login-shell @<:@default=yes@:>@])])
|
||||||
|
m4_divert_text([DEFAULTS], [with_login_shell=yes])
|
||||||
|
|
||||||
|
if test "$with_login_shell" ; then
|
||||||
|
AC_DEFINE_UNQUOTED([WITH_LOGIN_SHELL], 1, [whether virt-login-shell is built])
|
||||||
|
fi
|
||||||
|
AM_CONDITIONAL([WITH_LOGIN_SHELL], [test "$with_login_shell" = "yes"])
|
||||||
|
])
|
@ -2283,7 +2283,7 @@ libvirt_lxc_la_LIBADD = libvirt.la $(CYGWIN_EXTRA_LIBADD)
|
|||||||
# have a RPC client for local UNIX socket access only. We use
|
# have a RPC client for local UNIX socket access only. We use
|
||||||
# the ../config-post.h header to disable all external deps that
|
# the ../config-post.h header to disable all external deps that
|
||||||
# we don't want
|
# we don't want
|
||||||
if WITH_LXC
|
if WITH_SETUID_RPC_CLIENT
|
||||||
noinst_LTLIBRARIES += libvirt-setuid-rpc-client.la
|
noinst_LTLIBRARIES += libvirt-setuid-rpc-client.la
|
||||||
|
|
||||||
libvirt_setuid_rpc_client_la_SOURCES = \
|
libvirt_setuid_rpc_client_la_SOURCES = \
|
||||||
@ -2360,7 +2360,7 @@ libvirt_setuid_rpc_client_la_CFLAGS = \
|
|||||||
$(SECDRIVER_CFLAGS) \
|
$(SECDRIVER_CFLAGS) \
|
||||||
$(XDR_CFLAGS) \
|
$(XDR_CFLAGS) \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
endif WITH_LXC
|
endif WITH_SETUID_RPC_CLIENT
|
||||||
|
|
||||||
lockdriverdir = $(libdir)/libvirt/lock-driver
|
lockdriverdir = $(libdir)/libvirt/lock-driver
|
||||||
lockdriver_LTLIBRARIES =
|
lockdriver_LTLIBRARIES =
|
||||||
|
@ -71,12 +71,12 @@ sbin_SCRIPTS = virt-sanlock-cleanup
|
|||||||
DISTCLEANFILES += virt-sanlock-cleanup
|
DISTCLEANFILES += virt-sanlock-cleanup
|
||||||
endif WITH_SANLOCK
|
endif WITH_SANLOCK
|
||||||
|
|
||||||
if WITH_LXC
|
if WITH_LOGIN_SHELL
|
||||||
conf_DATA += virt-login-shell.conf
|
conf_DATA += virt-login-shell.conf
|
||||||
bin_PROGRAMS += virt-login-shell
|
bin_PROGRAMS += virt-login-shell
|
||||||
else ! WITH_LXC
|
else ! WITH_LOGIN_SHELL
|
||||||
EXTRA_DIST += virt-login-shell.conf
|
EXTRA_DIST += virt-login-shell.conf
|
||||||
endif ! WITH_LXC
|
endif ! WITH_LOGIN_SHELL
|
||||||
|
|
||||||
|
|
||||||
dist_man1_MANS = \
|
dist_man1_MANS = \
|
||||||
@ -85,11 +85,11 @@ dist_man1_MANS = \
|
|||||||
virt-xml-validate.1 \
|
virt-xml-validate.1 \
|
||||||
virsh.1 \
|
virsh.1 \
|
||||||
virt-admin.1
|
virt-admin.1
|
||||||
if WITH_LXC
|
if WITH_LOGIN_SHELL
|
||||||
dist_man1_MANS += virt-login-shell.1
|
dist_man1_MANS += virt-login-shell.1
|
||||||
else ! WITH_LXC
|
else ! WITH_LOGIN_SHELL
|
||||||
EXTRA_DIST += virt-login-shell.1
|
EXTRA_DIST += virt-login-shell.1
|
||||||
endif ! WITH_LXC
|
endif ! WITH_LOGIN_SHELL
|
||||||
if WITH_SANLOCK
|
if WITH_SANLOCK
|
||||||
dist_man8_MANS = virt-sanlock-cleanup.8
|
dist_man8_MANS = virt-sanlock-cleanup.8
|
||||||
endif WITH_SANLOCK
|
endif WITH_SANLOCK
|
||||||
|
Loading…
Reference in New Issue
Block a user