openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

configure: Remove nested conditionals in LIBVIRT_CHECK_INIT_SCRIPT 

We don't need them any longer; moreover, the previous structure
made it very easy for bugs to slip in, by having the result of one
check influence the following one.

By placing the check for "$with_init_script" = check front and
center, hopefully this won't happen (as easily) again.
This commit is contained in:
Andrea Bolognani 2016-05-03 10:34:52 +02:00
parent 8a38f96487
commit 801a0a57ba
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
m4/virt-init-script.m4
View File

@ -30,20 +30,14 @@ AC_DEFUN([LIBVIRT_CHECK_INIT_SCRIPT],[
init_systemd=no
init_upstart=no
if test "$with_init_script" = check; then
if test "$cross_compiling" = yes; then
with_init_script=none
fi
if test "$with_init_script" = check && test "$cross_compiling" = yes; then
with_init_script=none
fi
if type systemctl >/dev/null 2>&1; then
if test "$with_init_script" = check; then
with_init_script=systemd
fi
if test "$with_init_script" = check && type systemctl >/dev/null 2>&1; then
with_init_script=systemd
fi
if test -f /etc/redhat-release; then
if test "$with_init_script" = check; then
with_init_script=redhat
fi
if test "$with_init_script" = check && test -f /etc/redhat-release; then
with_init_script=redhat
fi
if test "$with_init_script" = check; then
with_init_script=none