[libvirt] [PATCH] Fix --with-init-script configure option

[Matthew Booth]

The --with-init-script configure option was broken, and always defaulted based
on the existence of /etc/redhat-release. This was a systematic typo based on
mixed use of init-script and init-scripts.
---
 configure.in       |   14 +++++++-------
 daemon/Makefile.am |    4 ++--
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/configure.in b/configure.in
index 2f9db72..42ed29b 100644
--- a/configure.in
+++ b/configure.in
@@ -243,17 +243,17 @@ dnl init script flavor
 dnl
 AC_MSG_CHECKING([for init script flavor])
 AC_ARG_WITH([init-script],
-            [AC_HELP_STRING([--with-init-scripts=[redhat|auto|none]],
-		     [Style of init scripts to install (defaults to auto)])])
-if test "x$with_init_scripts" = "x" -o "x$with_init_scripts" = "xauto"; then
+            [AC_HELP_STRING([--with-init-script=[redhat|auto|none]],
+		     [Style of init script to install (defaults to auto)])])
+if test "x$with_init_script" = "x" -o "x$with_init_script" = "xauto"; then
     if test -f /etc/redhat-release ; then
-        with_init_scripts=redhat
+        with_init_script=redhat
     else
-        with_init_scripts=none
+        with_init_script=none
     fi
 fi
-AM_CONDITIONAL([LIBVIRT_INIT_SCRIPTS_RED_HAT], test x$with_init_scripts = xredhat)
-AC_MSG_RESULT($with_init_scripts)
+AM_CONDITIONAL([LIBVIRT_INIT_SCRIPT_RED_HAT], test x$with_init_script = xredhat)
+AC_MSG_RESULT($with_init_script)
 
 dnl RHEL-5 has a peculiar version of Xen, which requires some special casing
 AC_ARG_WITH([rhel5-api],
diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index 84aab04..ab3f238 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -188,7 +188,7 @@ install-logrotate: libvirtd.logrotate
 	mkdir -p $(DESTDIR)$(sysconfdir)/logrotate.d/
 	$(INSTALL_DATA) $< $(DESTDIR)$(sysconfdir)/logrotate.d/libvirtd
 
-if LIBVIRT_INIT_SCRIPTS_RED_HAT
+if LIBVIRT_INIT_SCRIPT_RED_HAT
 install-init: libvirtd.init
 	mkdir -p $(DESTDIR)$(sysconfdir)/rc.d/init.d
 	$(INSTALL_SCRIPT) libvirtd.init \
@@ -222,7 +222,7 @@ install-init:
 uninstall-init:
 libvirtd.init:
 
-endif # DBUS_INIT_SCRIPTS_RED_HAT
+endif # LIBVIRT_INIT_SCRIPT_RED_HAT
 
 # This must be added last, since functions it provides/replaces
 # are used by nearly every other library.
-- 
1.6.2.5