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 d6a52e7..c307b0e 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 -- 2.5.5

The convention used throughout the file is to name variables after the configure option they refer to. --- libvirt.spec.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 4de78c0..f441c51 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1475,9 +1475,9 @@ rm -rf .git %define with_packager_version --with-packager-version="%{release}" %if %{with_systemd} - %define init_scripts --with-init-script=systemd + %define with_init_script --with-init-script=systemd %else - %define init_scripts --with-init-script=redhat + %define with_init_script --with-init-script=redhat %endif %if %{with_selinux} @@ -1553,7 +1553,7 @@ rm -f po/stamp-po %{?with_loader_nvram} \ %{?enable_werror} \ --enable-expensive-tests \ - %{init_scripts} + %{with_init_script} make %{?_smp_mflags} gzip -9 ChangeLog -- 2.5.5