40 lines
1.2 KiB
Diff
40 lines
1.2 KiB
Diff
From 6439d22cea451e54b58bb9d6e8072cc6c58694be Mon Sep 17 00:00:00 2001
|
|
From: Jim Fehlig <jfehlig@suse.com>
|
|
Date: Mon, 11 Jun 2018 20:35:50 -0600
|
|
Subject: [PATCH 16/17] configure: fix logic in init script check
|
|
|
|
The logic introduced in commit d1276646to check for init script type is
|
|
a bit flawed. If the init script type is specified, init_systemv is
|
|
always set to 'yes', even when '--with-init-script=systemd'. Split the
|
|
logic to only check for init script type when '--with-init-script=check'.
|
|
|
|
Signed-off-by: Jim Fehlig <jfehlig@suse.com>
|
|
---
|
|
configure.ac | 10 ++++++----
|
|
1 file changed, 6 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/configure.ac b/configure.ac
|
|
index c6b660e..9414440 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -59,10 +59,12 @@ AC_ARG_WITH([init_script],
|
|
[with_init_script=check])
|
|
init_systemv=no
|
|
init_systemd=no
|
|
-if test "$with_init_script" = check && type systemctl >/dev/null 2>&1; then
|
|
- init_systemd=yes
|
|
-else
|
|
- init_systemv=yes
|
|
+if test "$with_init_script" = check; then
|
|
+ if type systemctl >/dev/null 2>&1; then
|
|
+ init_systemd=yes
|
|
+ else
|
|
+ init_systemv=yes
|
|
+ fi
|
|
fi
|
|
case "${with_init_script}" in
|
|
systemv) init_systemv=yes;;
|
|
--
|
|
2.19.0.rc0
|
|
|