Commit c932ce31 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

configure: define CONFIG_TOOLS here 



Defining CONFIG_TOOLS on the basis of $(TOOLS) has the disadvantage
of including it also if e.g. qemu-ga is requested.  The correct
information is available in configure, define it there.

This also has the benefit of not installing the manpages for block layer
tools if the only "tool" being built is the guest agent.

Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 0814465a

Makefile

+2 −3
Original line number Diff line number Diff line
@@ -84,8 +84,7 @@ endif 


include $(SRC_PATH)/rules.mak



# notempy and lor are defined in rules.mak

CONFIG_TOOLS := $(call notempty,$(TOOLS))

# lor is defined in rules.mak

CONFIG_BLOCK := $(call lor,$(CONFIG_SOFTMMU),$(CONFIG_TOOLS))



# Create QEMU_PKGVERSION and FULL_VERSION strings
@@ -809,7 +808,7 @@ ifdef CONFIG_POSIX 
	$(INSTALL_DATA) docs/interop/qemu-qmp-ref.7 "$(DESTDIR)$(mandir)/man7"

	$(INSTALL_DATA) docs/qemu-block-drivers.7 "$(DESTDIR)$(mandir)/man7"

	$(INSTALL_DATA) docs/qemu-cpu-models.7 "$(DESTDIR)$(mandir)/man7"

ifneq ($(TOOLS),)

ifeq ($(CONFIG_TOOLS),y)

	$(INSTALL_DATA) qemu-img.1 "$(DESTDIR)$(mandir)/man1"

	$(INSTALL_DIR) "$(DESTDIR)$(mandir)/man8"

	$(INSTALL_DATA) qemu-nbd.8 "$(DESTDIR)$(mandir)/man8"

configure

+3 −0
Original line number Diff line number Diff line
@@ -6617,6 +6617,9 @@ fi 
if test "$profiler" = "yes" ; then

  echo "CONFIG_PROFILER=y" >> $config_host_mak

fi

if test "$want_tools" = "yes" ; then

  echo "CONFIG_TOOLS=y" >> $config_host_mak

fi

if test "$slirp" != "no"; then

  echo "CONFIG_SLIRP=y" >> $config_host_mak

  echo "CONFIG_SMBD_COMMAND=\"$smbd\"" >> $config_host_mak