On 05/23/2011 11:43 AM, Laine Stump wrote: > --- > configure.ac | 8 +++++--- > src/qemu/qemu_capabilities.c | 2 +- > src/qemu/qemu_capabilities.h | 2 +- > src/qemu/qemu_command.c | 2 +- > tests/qemuhelptest.c | 8 ++++---- > 5 files changed, 12 insertions(+), 10 deletions(-) > > diff --git a/configure.ac b/configure.ac > index 80a13a1..b6f433b 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -318,14 +318,16 @@ AC_ARG_WITH([init-script], > [AC_HELP_STRING([--with-init-script=@<:@redhat|auto|none@:>@], > [Style of init script to install @<:@default=auto@:>@])]) > if test "x$with_init_script" = "x" || test "x$with_init_script" = "xauto"; then > - if test "$cross_compiling" = yes || test ! -f /etc/redhat-release; then > + if test "$sysconfdir" != "/etc" || test "$cross_compiling" = yes \ > + || test ! -f /etc/redhat-release; then > with_init_script=none > else > with_init_script=redhat > fi > fi > -AM_CONDITIONAL([LIBVIRT_INIT_SCRIPT_RED_HAT], test x$with_init_script = xredhat) > -AC_MSG_RESULT($with_init_script) > +AM_CONDITIONAL([LIBVIRT_INIT_SCRIPT_RED_HAT], > + [test x$with_init_script = xredhat]) > +AC_MSG_RESULT([$with_init_script]) This file change is unrelated. Did you commit too much? ACK to the rest of the patch, though. Does this interfere with the work to store qemu capabilities into xml? -- Eric Blake eblake@xxxxxxxxxx +1-801-349-2682 Libvirt virtualization library http://libvirt.org
Attachment:
signature.asc
Description: OpenPGP digital signature
-- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list