[libvirt] [PATCH v2 5/6] m4: Simplify LIBVIRT_CHECK_INIT_SCRIPT

Andrea Bolognani abologna at redhat.com
Fri Mar 15 17:27:42 UTC 2019


Now that we no longer support the weird "redhat+systemd"
configuration, we can make our code slightly simpler.

Signed-off-by: Andrea Bolognani <abologna at redhat.com>
---
 m4/virt-init-script.m4 | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/m4/virt-init-script.m4 b/m4/virt-init-script.m4
index 8045fc06bb..91bbd68235 100644
--- a/m4/virt-init-script.m4
+++ b/m4/virt-init-script.m4
@@ -26,8 +26,6 @@ AC_DEFUN([LIBVIRT_ARG_INIT_SCRIPT],[
 AC_DEFUN([LIBVIRT_CHECK_INIT_SCRIPT],[
     AC_MSG_CHECKING([for init script type])
 
-    init_systemd=no
-
     if test "$with_init_script" = check && test "$cross_compiling" = yes; then
         with_init_script=none
     fi
@@ -39,16 +37,15 @@ AC_DEFUN([LIBVIRT_CHECK_INIT_SCRIPT],[
     fi
 
     AS_CASE([$with_init_script],
-        [systemd],[
-            init_systemd=yes
-        ],
+        [systemd],[],
         [none],[],
         [*],[
             AC_MSG_ERROR([Unknown initscript flavour $with_init_script])
         ]
     )
 
-    AM_CONDITIONAL([LIBVIRT_INIT_SCRIPT_SYSTEMD], test "$init_systemd" = "yes")
+    AM_CONDITIONAL([LIBVIRT_INIT_SCRIPT_SYSTEMD],
+                   [test "$with_init_script" = "systemd"])
 
     AC_MSG_RESULT($with_init_script)
 ])
-- 
2.20.1




More information about the libvir-list mailing list