From 6f91606777c071549477029e3706af871cb2480b Mon Sep 17 00:00:00 2001 From: Andrea Bolognani Date: Thu, 28 Apr 2016 16:57:35 +0200 Subject: [PATCH] configure: Improve --with-init-script=check If we didn't find a match, either because we're cross compiling or because we're not building on RHEL, we won't install any init script. Make sure this is reported correctly in the configure summary. --- configure.ac | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac index 4380724014..4149e20d93 100644 --- a/configure.ac +++ b/configure.ac @@ -630,6 +630,19 @@ AC_ARG_WITH([init-script], init_redhat=no 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 -f /etc/redhat-release; then + if test "$with_init_script" = check; then + with_init_script=redhat + fi + fi + if test "$with_init_script" = check; then + with_init_script=none + fi +fi case "$with_init_script" in systemd+redhat) init_redhat=yes @@ -646,12 +659,6 @@ case "$with_init_script" in ;; none) ;; - check) - if test "$cross_compiling" != yes && test -f /etc/redhat-release; then - init_redhat=yes - with_init_script=redhat - fi - ;; *) AC_MSG_ERROR([Unknown initscript flavour $with_init_script]) ;; -- GitLab