From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:55957) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ql3Y7-000892-O0 for qemu-devel@nongnu.org; Sun, 24 Jul 2011 14:37:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ql3Y5-0001hn-1o for qemu-devel@nongnu.org; Sun, 24 Jul 2011 14:37:11 -0400 Received: from mout.perfora.net ([74.208.4.194]:58483) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ql3Y4-0001hd-T0 for qemu-devel@nongnu.org; Sun, 24 Jul 2011 14:37:09 -0400 From: Michael Roth Date: Sun, 24 Jul 2011 13:36:29 -0500 Message-Id: <1311532589-5737-2-git-send-email-mdroth@linux.vnet.ibm.com> In-Reply-To: <1311532589-5737-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1311532589-5737-1-git-send-email-mdroth@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH v2 2/2] guest agent: add --enable-guest-agent config option List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: blauwirbel@gmail.com, aliguori@us.ibm.com, agraf@suse.de, mdroth@linux.vnet.ibm.com QAPI will require glib/python, but for now the guest agent is the only user. For now, make these dependencies an explicit guest agent one, and give users the option to disable it if need be. Once QAPI is adopted in core QEMU code, we would basically revert this patch. Signed-off-by: Michael Roth --- configure | 36 +++++++++++++++++++++++++----------- 1 files changed, 25 insertions(+), 11 deletions(-) diff --git a/configure b/configure index 16652b5..0099ecb 100755 --- a/configure +++ b/configure @@ -179,6 +179,7 @@ smartcard="" smartcard_nss="" usb_redir="" opengl="" +guest_agent="yes" # parse CC options first for opt do @@ -749,6 +750,10 @@ for opt do ;; --enable-usb-redir) usb_redir="yes" ;; + --enable-guest-agent) guest_agent="yes" + ;; + --disable-guest-agent) guest_agent="no" + ;; --python=*) python="$optarg" ;; *) echo "ERROR: unknown option $opt"; show_help="yes" @@ -1028,6 +1033,8 @@ echo " --disable-smartcard-nss disable smartcard nss support" echo " --enable-smartcard-nss enable smartcard nss support" echo " --disable-usb-redir disable usb network redirection support" echo " --enable-usb-redir enable usb network redirection support" +echo " --disable-guest-agent disable building of the QEMU Guest Agent" +echo " --enable-guest-agent enable building of the QEMU Guest Agent" echo " --python=PATH path to python executable [$python]" echo "" echo "NOTE: The object files are built at the place where configure is launched" @@ -1815,21 +1822,25 @@ fi ########################################## # python probe -if ! has $python; then - echo "python executable not found: $python. You can specify with --python" - exit 1 +if test "$guest_agent" != "no" ; then + if ! has $python; then + echo "python executable not found: $python. You can specify with --python" + exit 1 + fi fi ########################################## # glib support probe -if $pkg_config --modversion glib-2.0 > /dev/null 2>&1 ; then - glib_cflags=`$pkg_config --cflags glib-2.0 2>/dev/null` - glib_libs=`$pkg_config --libs glib-2.0 2>/dev/null` - libs_softmmu="$glib_libs $libs_softmmu" - libs_tools="$glib_libs $libs_tools" -else - echo "glib-2.0 required to compile QEMU" - exit 1 +if test "$guest_agent" != "no" ; then + if $pkg_config --modversion glib-2.0 > /dev/null 2>&1 ; then + glib_cflags=`$pkg_config --cflags glib-2.0 2>/dev/null` + glib_libs=`$pkg_config --libs glib-2.0 2>/dev/null` + libs_softmmu="$glib_libs $libs_softmmu" + libs_tools="$glib_libs $libs_tools" + else + echo "glib-2.0 required to compile QEMU" + exit 1 + fi fi ########################################## @@ -2566,7 +2577,9 @@ if test "$softmmu" = yes ; then tools="qemu-img\$(EXESUF) qemu-io\$(EXESUF) $tools" if [ "$linux" = "yes" -o "$bsd" = "yes" -o "$solaris" = "yes" ] ; then tools="qemu-nbd\$(EXESUF) $tools" + if [ "$guest_agent" = "yes" ]; then tools="qemu-ga\$(EXESUF) $tools" + fi if [ "$check_utests" = "yes" ]; then tools="check-qint check-qstring check-qdict check-qlist $tools" tools="check-qfloat check-qjson $tools" @@ -2666,6 +2679,7 @@ echo "xfsctl support $xfs" echo "nss used $smartcard_nss" echo "usb net redir $usb_redir" echo "OpenGL support $opengl" +echo "build guest agent $guest_agent" echo "python $python" if test $sdl_too_old = "yes"; then -- 1.7.0.4