From 801a0a57ba675fda46e17eb92ac80db1c22359ad Mon Sep 17 00:00:00 2001 From: Andrea Bolognani Date: Tue, 3 May 2016 10:34:52 +0200 Subject: [PATCH] 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. --- m4/virt-init-script.m4 | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/m4/virt-init-script.m4 b/m4/virt-init-script.m4 index d6a52e70a8..c307b0e9b2 100644 --- a/m4/virt-init-script.m4 +++ b/m4/virt-init-script.m4 @@ -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 -- GitLab