]> xenbits.xensource.com Git - libvirt.git/commitdiff
m4: Simplify LIBVIRT_CHECK_INIT_SCRIPT
authorAndrea Bolognani <abologna@redhat.com>
Fri, 15 Mar 2019 15:57:40 +0000 (16:57 +0100)
committerAndrea Bolognani <abologna@redhat.com>
Fri, 15 Mar 2019 17:36:19 +0000 (18:36 +0100)
Now that we no longer support the weird "redhat+systemd"
configuration, we can make our code slightly simpler.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
m4/virt-init-script.m4

index 8045fc06bbcb34faed02c2dc3890ec4be4e30352..91bbd682353e0deb307331118ff3fd904a0a57af 100644 (file)
@@ -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)
 ])