From d2c8d34c7eb2725872798533c264f534660d40e0 Mon Sep 17 00:00:00 2001
From: Eduardo Habkost <ehabkost@redhat.com>
Date: Wed, 29 Apr 2009 12:20:23 -0300
Subject: [PATCH 11/15] Add qemu-io to Makefile and configure

This adds qemu-io to the tool list on configure, and adds the rule to build it
on Makefile. It doesn't affect any other qemu code.

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
RH-Upstream-status: applied(qemu/master)
Bugzilla: 500263
Message-Id: <1241018423-27358-4-git-send-email-ehabkost@redhat.com>
Acked-by: Kevin Wolf <kwolf@redhat.com>
Acked-by: john cooper <john.cooper@redhat.com>
Acked-by: Zachary Amsden <zamsden@redhat.com>
---
 qemu/Makefile  |    3 +++
 qemu/configure |    2 +-
 2 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/qemu/Makefile b/qemu/Makefile
index 06b9f25..bdfb37a 100644
--- a/qemu/Makefile
+++ b/qemu/Makefile
@@ -216,6 +216,9 @@ qemu-img$(EXESUF): qemu-img.o qemu-tool.o osdep.o $(BLOCK_OBJS)
 qemu-nbd$(EXESUF):  qemu-nbd.o qemu-tool.o osdep.o $(BLOCK_OBJS)
 	$(CC) $(LDFLAGS) -o $@ $^ -lz $(LIBS)
 
+qemu-io$(EXESUF): qemu-io.o qemu-tool.o osdep.o cmd.o $(BLOCK_OBJS)
+	$(CC) $(LDFLAGS) -o $@ $^ -lz $(LIBS)
+
 clean:
 # avoid old build problems by removing potentially incorrect old files
 	rm -f config.mak config.h op-i386.h opc-i386.h gen-op-i386.h op-arm.h opc-arm.h gen-op-arm.h
diff --git a/qemu/configure b/qemu/configure
index 3276832..2daa563 100755
--- a/qemu/configure
+++ b/qemu/configure
@@ -1613,7 +1613,7 @@ tools=
 if test `expr "$target_list" : ".*softmmu.*"` != 0 ; then
   tools="qemu-img\$(EXESUF) $tools"
   if [ "$linux" = "yes" ] ; then
-      tools="qemu-nbd\$(EXESUF) $tools"
+      tools="qemu-nbd\$(EXESUF) qemu-io\$(EXESUF) $tools"
   fi
 fi
 echo "TOOLS=$tools" >> $config_mak
-- 
1.6.3.rc4.29.g8146