External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-22 04:25:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix --with-init-script configure option

Browse Source 
* configure.in daemon/Makefile.am: 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.
This commit is contained in:
Matthew Booth 2009-11-02 17:55:40 +01:00 committed by Daniel Veillard
parent 4296cea2b2
commit 958c366b21
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
configure.in
View File

@ -243,17 +243,17 @@ dnl init script flavor
dnl dnl
AC_MSG_CHECKING([for init script flavor]) AC_MSG_CHECKING([for init script flavor])
AC_ARG_WITH([init-script], AC_ARG_WITH([init-script],
[AC_HELP_STRING([--with-init-scripts=[redhat|auto|none]], [AC_HELP_STRING([--with-init-script=[redhat|auto|none]],
[Style of init scripts to install (defaults to auto)])]) [Style of init script to install (defaults to auto)])])
if test "x$with_init_scripts" = "x" -o "x$with_init_scripts" = "xauto"; then if test "x$with_init_script" = "x" -o "x$with_init_script" = "xauto"; then
if test -f /etc/redhat-release ; then if test -f /etc/redhat-release ; then
with_init_scripts=redhat with_init_script=redhat
else else
with_init_scripts=none with_init_script=none
fi fi
fi fi
AM_CONDITIONAL([LIBVIRT_INIT_SCRIPTS_RED_HAT], test x$with_init_scripts = xredhat) AM_CONDITIONAL([LIBVIRT_INIT_SCRIPT_RED_HAT], test x$with_init_script = xredhat)
AC_MSG_RESULT($with_init_scripts) AC_MSG_RESULT($with_init_script)
dnl RHEL-5 has a peculiar version of Xen, which requires some special casing dnl RHEL-5 has a peculiar version of Xen, which requires some special casing
AC_ARG_WITH([rhel5-api], AC_ARG_WITH([rhel5-api],

4
daemon/Makefile.am
View File

@ -188,7 +188,7 @@ install-logrotate: libvirtd.logrotate
mkdir -p $(DESTDIR)$(sysconfdir)/logrotate.d/ mkdir -p $(DESTDIR)$(sysconfdir)/logrotate.d/
$(INSTALL_DATA) $< $(DESTDIR)$(sysconfdir)/logrotate.d/libvirtd $(INSTALL_DATA) $< $(DESTDIR)$(sysconfdir)/logrotate.d/libvirtd
if LIBVIRT_INIT_SCRIPTS_RED_HAT if LIBVIRT_INIT_SCRIPT_RED_HAT
install-init: libvirtd.init install-init: libvirtd.init
mkdir -p $(DESTDIR)$(sysconfdir)/rc.d/init.d mkdir -p $(DESTDIR)$(sysconfdir)/rc.d/init.d
$(INSTALL_SCRIPT) libvirtd.init \ $(INSTALL_SCRIPT) libvirtd.init \
@ -222,7 +222,7 @@ install-init:
uninstall-init: uninstall-init:
libvirtd.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 # This must be added last, since functions it provides/replaces
# are used by nearly every other library. # are used by nearly every other library.