Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 428716 | Differences between
and this patch

Collapse All | Expand All

(-)a/Makefile (-1 / +4 lines)
Lines 37-43 Link Here
37
37
38
LIBS+=-lz $(LIBS_TOOLS)
38
LIBS+=-lz $(LIBS_TOOLS)
39
39
40
HELPERS-$(CONFIG_LINUX) = qemu-bridge-helper$(EXESUF)
40
HELPERS-$(CONFIG_LINUX) =
41
ifeq (CONFIG_BRIDGE_HELPER, "y")
42
	HELPERS-$(CONFIG_LINUX) += qemu-bridge-helper$(EXESUF)
43
endif
41
44
42
ifdef BUILD_DOCS
45
ifdef BUILD_DOCS
43
DOCS=qemu-doc.html qemu-tech.html qemu.1 qemu-img.1 qemu-nbd.8 QMP/qmp-commands.txt
46
DOCS=qemu-doc.html qemu-tech.html qemu.1 qemu-img.1 qemu-nbd.8 QMP/qmp-commands.txt
44
47
(-)a/configure (+11 lines)
Lines 193-198 Link Here
193
opengl=""
193
opengl=""
194
zlib="yes"
194
zlib="yes"
195
guest_agent="yes"
195
guest_agent="yes"
196
bridge_helper="yes"
196
libiscsi=""
197
libiscsi=""
197
coroutine=""
198
coroutine=""
198
199
Lines 824-829 Link Here
824
  ;;
825
  ;;
825
  --disable-guest-agent) guest_agent="no"
826
  --disable-guest-agent) guest_agent="no"
826
  ;;
827
  ;;
828
  --enable-bridge-helper) bridge_helper="yes"
829
  ;;
830
  --disable-bridge-helper) bridge_helper="no"
831
  ;;
827
  *) echo "ERROR: unknown option $opt"; show_help="yes"
832
  *) echo "ERROR: unknown option $opt"; show_help="yes"
828
  ;;
833
  ;;
829
  esac
834
  esac
Lines 1110-1115 Link Here
1110
echo "  --enable-usb-redir       enable usb network redirection support"
1115
echo "  --enable-usb-redir       enable usb network redirection support"
1111
echo "  --disable-guest-agent    disable building of the QEMU Guest Agent"
1116
echo "  --disable-guest-agent    disable building of the QEMU Guest Agent"
1112
echo "  --enable-guest-agent     enable building of the QEMU Guest Agent"
1117
echo "  --enable-guest-agent     enable building of the QEMU Guest Agent"
1118
echo "  --enable-bridge-helper   enable building of the qemu-bridge-helper"
1119
echo "  --disable-bridge-helper  disable building of the qemu-bridge-helper"
1113
echo "  --with-coroutine=BACKEND coroutine backend. Supported options:"
1120
echo "  --with-coroutine=BACKEND coroutine backend. Supported options:"
1114
echo "                           gthread, ucontext, sigaltstack, windows"
1121
echo "                           gthread, ucontext, sigaltstack, windows"
1115
echo ""
1122
echo ""
Lines 2968-2973 Link Here
2968
    fi
2975
    fi
2969
  fi
2976
  fi
2970
fi
2977
fi
2978
if [ "$bridge_helper" = "yes" ]; then
2979
  echo "CONFIG_BRIDGE_HELPER=y" >> $config_host_mak
2980
fi
2971
if test "$smartcard_nss" = "yes" ; then
2981
if test "$smartcard_nss" = "yes" ; then
2972
  tools="vscclient\$(EXESUF) $tools"
2982
  tools="vscclient\$(EXESUF) $tools"
2973
fi
2983
fi
Lines 3071-3076 Link Here
3071
echo "OpenGL support    $opengl"
3081
echo "OpenGL support    $opengl"
3072
echo "libiscsi support  $libiscsi"
3082
echo "libiscsi support  $libiscsi"
3073
echo "build guest agent $guest_agent"
3083
echo "build guest agent $guest_agent"
3084
echo "build bridge helper $bridge_helper"
3074
echo "coroutine backend $coroutine_backend"
3085
echo "coroutine backend $coroutine_backend"
3075
3086
3076
if test "$sdl_too_old" = "yes"; then
3087
if test "$sdl_too_old" = "yes"; then

Return to bug 428716