From: Mark McLoughlin <markmc@redhat.com>
Date: Mon, 5 Mar 2007 11:10:06 +0000 (+0000)
Subject: Mon Mar 05 11:07:38 IST 2007 Mark McLoughlin <markmc@redhat.com:
X-Git-Tag: LIBVIRT_0_2_1~46
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c69c8508718e556d6ef404da7c12f9aa993a8f8f;p=thirdparty%2Flibvirt.git

Mon Mar 05 11:07:38 IST 2007 Mark McLoughlin <markmc@redhat.com:

        * libvirt.spec.in: BuildRequires: /sbin/iptables and
        run configure with the --with-init-script and
        --with-qemud-pid-file parameters.

        * configure.in: it's --with-qemud-pid-file, not
        --with-pid-file
---

diff --git a/ChangeLog b/ChangeLog
index 683b31f174..a558eb995e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Mon Mar 05 11:07:38 IST 2007 Mark McLoughlin <markmc@redhat.com:
+
+	* libvirt.spec.in: BuildRequires: /sbin/iptables and
+	run configure with the --with-init-script and
+	--with-qemud-pid-file parameters.
+
+	* configure.in: it's --with-qemud-pid-file, not
+	--with-pid-file
+	
 Mon Mar 05 10:52:02 IST 2007 Mark McLoughlin <markmc@redhat.com:
 
 	* libvirt.spec.in: sync some of the chanes from dist-cvs
diff --git a/configure.in b/configure.in
index d0911fcd10..041abc5904 100644
--- a/configure.in
+++ b/configure.in
@@ -85,7 +85,7 @@ dnl
 dnl PID file
 dnl
 AC_MSG_CHECKING([where to write libvirt_qemud PID file])
-AC_ARG_WITH(pid-file, AC_HELP_STRING([--with-qemud-pid-file=[pidfile|none]], [PID file for libvirt_qemud]))
+AC_ARG_WITH(qemud-pid-file, AC_HELP_STRING([--with-qemud-pid-file=[pidfile|none]], [PID file for libvirt_qemud]))
 if test "x$with_qemud_pid_file" == "x" ; then
    QEMUD_PID_FILE="$localstatedir/run/libvirt_qemud.pid"
 elif test "x$with_qemud_pid_file" == "xnone" ; then
diff --git a/libvirt.spec.in b/libvirt.spec.in
index fbe67850be..af0360d8d2 100644
--- a/libvirt.spec.in
+++ b/libvirt.spec.in
@@ -20,6 +20,7 @@ BuildRequires: readline-devel
 BuildRequires: ncurses-devel
 BuildRequires: gettext
 BuildRequires: libsysfs-devel
+BuildRequires: /sbin/iptables
 Obsoletes: libvir
 ExclusiveArch: i386 x86_64 ia64
 
@@ -53,7 +54,7 @@ supplied by the libvirt library to use the Xen virtualization framework.
 %setup -q
 
 %build
-%configure
+%configure --with-init-script=redhat --with-qemud-pid-file=%{_localstatedir}/run/libvirt_qemud.pid
 make
 
 %install