diff mbox

[trivial] configure: explicitly disable virtfs if softmmu=no

Message ID 51B780B2.9040604@msgid.tls.msk.ru
State New
Headers show

Commit Message

Michael Tokarev June 11, 2013, 7:55 p.m. UTC 
11.06.2013 23:21, Peter Maydell пишет:
> On 11 June 2013 19:19, Michael Tokarev <mjt@tls.msk.ru> wrote:
>> FWIW, I still don't understand what Peter Maydell dislikes
>> in a simplest case I posted initially, where we merely ignore
>> (disable) virtfs in case !softmmu.
> 
> It just seems to me that rather than fixing a bug in the
> makefile (it still tries to build docs for the tools even
> when the tools aren't being built) you're trying to tweak
> the configure script to avoid generating the combinations
> of config values that trigger the makefile bug.

Heh. It is just easier to not generate the config variable
than to use more complex conditions.  How about this:



I don't care any way ;)

But all that is more "verbose" than just turning the feature
off in ./configure.

Thanks,

/mjt
diff mbox

Patch

--- a/Makefile
+++ b/Makefile
@@ -66,7 +66,7 @@  HELPERS-$(CONFIG_LINUX) = qemu-bridge-helper$(EXESUF)

 ifdef BUILD_DOCS
 DOCS=qemu-doc.html qemu-tech.html qemu.1 qemu-img.1 qemu-nbd.8 QMP/qmp-commands.txt
-ifdef CONFIG_VIRTFS
+ifeq ($(CONFIG_VIRTFS)$(CONFIG_SOFTMMU),yy)
 DOCS+=fsdev/virtfs-proxy-helper.1
 endif
 else
@@ -313,7 +313,7 @@  ifneq ($(TOOLS),)
 	$(INSTALL_DATA) qemu-nbd.8 "$(DESTDIR)$(mandir)/man8"
 endif
 endif
-ifdef CONFIG_VIRTFS
+ifeq ($(CONFIG_VIRTFS)$(CONFIG_SOFTMMU),yy)
 	$(INSTALL_DIR) "$(DESTDIR)$(mandir)/man1"
 	$(INSTALL_DATA) fsdev/virtfs-proxy-helper.1 "$(DESTDIR)$(mandir)/man1"
 endif




Or this:

--- a/Makefile
+++ b/Makefile
@@ -64,6 +64,10 @@  LIBS+=-lz $(LIBS_TOOLS)

 HELPERS-$(CONFIG_LINUX) = qemu-bridge-helper$(EXESUF)

+ifneq ($(CONFIG_SOFTMMU),y)
+CONFIG_VIRTFS :=
+endif
+
 ifdef BUILD_DOCS
 DOCS=qemu-doc.html qemu-tech.html qemu.1 qemu-img.1 qemu-nbd.8 QMP/qmp-commands.txt
 ifdef CONFIG_VIRTFS



Or this:

--- a/Makefile
+++ b/Makefile
@@ -64,9 +64,13 @@  LIBS+=-lz $(LIBS_TOOLS)

 HELPERS-$(CONFIG_LINUX) = qemu-bridge-helper$(EXESUF)

+ifeq ($(CONFIG_VIRTFS)$(CONFIG_SOFTMMU),yy)
+VIRTFS_DOCS = y
+endif
+
 ifdef BUILD_DOCS
 DOCS=qemu-doc.html qemu-tech.html qemu.1 qemu-img.1 qemu-nbd.8 QMP/qmp-commands.txt
-ifdef CONFIG_VIRTFS
+ifdef VIRTFS_DOCS
 DOCS+=fsdev/virtfs-proxy-helper.1
 endif
 else
@@ -313,7 +317,7 @@  ifneq ($(TOOLS),)
 	$(INSTALL_DATA) qemu-nbd.8 "$(DESTDIR)$(mandir)/man8"
 endif
 endif
-ifdef CONFIG_VIRTFS
+ifdef VIRTFS_DOCS
 	$(INSTALL_DIR) "$(DESTDIR)$(mandir)/man1"
 	$(INSTALL_DATA) fsdev/virtfs-proxy-helper.1 "$(DESTDIR)$(mandir)/man1"
 endif