Revision d138cee9 configure

b/configure
181 181
usb_redir=""
182 182
opengl=""
183 183
zlib="yes"
184
guest_agent="yes"
184 185

  
185 186
# parse CC options first
186 187
for opt do
......
757 758
  ;;
758 759
  --disable-zlib-test) zlib="no"
759 760
  ;;
761
  --enable-guest-agent) guest_agent="yes"
762
  ;;
763
  --disable-guest-agent) guest_agent="no"
764
  ;;
760 765
  *) echo "ERROR: unknown option $opt"; show_help="yes"
761 766
  ;;
762 767
  esac
......
1034 1039
echo "  --enable-smartcard-nss   enable smartcard nss support"
1035 1040
echo "  --disable-usb-redir      disable usb network redirection support"
1036 1041
echo "  --enable-usb-redir       enable usb network redirection support"
1042
echo "  --disable-guest-agent    disable building of the QEMU Guest Agent"
1043
echo "  --enable-guest-agent     enable building of the QEMU Guest Agent"
1037 1044
echo ""
1038 1045
echo "NOTE: The object files are built at the place where configure is launched"
1039 1046
exit 1
......
1093 1100
  fi
1094 1101
fi
1095 1102

  
1096
if has $python; then
1097
  :
1098
else
1099
  echo "Python not found. Use --python=/path/to/python"
1100
  exit 1
1103
if test "$guest_agent" != "no" ; then
1104
  if has $python; then
1105
    :
1106
  else
1107
    echo "Python not found. Use --python=/path/to/python"
1108
    exit 1
1109
  fi
1101 1110
fi
1102 1111

  
1103 1112
if test -z "$target_list" ; then
......
1835 1844

  
1836 1845
##########################################
1837 1846
# glib support probe
1838
if $pkg_config --modversion glib-2.0 > /dev/null 2>&1 ; then
1839
    glib_cflags=`$pkg_config --cflags glib-2.0 2>/dev/null`
1840
    glib_libs=`$pkg_config --libs glib-2.0 2>/dev/null`
1841
    libs_softmmu="$glib_libs $libs_softmmu"
1842
    libs_tools="$glib_libs $libs_tools"
1843
else
1844
    echo "glib-2.0 required to compile QEMU"
1845
    exit 1
1847
if test "$guest_agent" != "no" ; then
1848
    if $pkg_config --modversion glib-2.0 > /dev/null 2>&1 ; then
1849
        glib_cflags=`$pkg_config --cflags glib-2.0 2>/dev/null`
1850
        glib_libs=`$pkg_config --libs glib-2.0 2>/dev/null`
1851
        libs_softmmu="$glib_libs $libs_softmmu"
1852
        libs_tools="$glib_libs $libs_tools"
1853
    else
1854
        echo "glib-2.0 required to compile QEMU"
1855
        exit 1
1856
    fi
1846 1857
fi
1847 1858

  
1848 1859
##########################################
......
2602 2613
  tools="qemu-img\$(EXESUF) qemu-io\$(EXESUF) $tools"
2603 2614
  if [ "$linux" = "yes" -o "$bsd" = "yes" -o "$solaris" = "yes" ] ; then
2604 2615
      tools="qemu-nbd\$(EXESUF) $tools"
2616
    if [ "$guest_agent" = "yes" ]; then
2605 2617
      tools="qemu-ga\$(EXESUF) $tools"
2618
    fi
2606 2619
    if [ "$check_utests" = "yes" ]; then
2607 2620
      tools="check-qint check-qstring check-qdict check-qlist $tools"
2608 2621
      tools="check-qfloat check-qjson $tools"
......
2704 2717
echo "nss used          $smartcard_nss"
2705 2718
echo "usb net redir     $usb_redir"
2706 2719
echo "OpenGL support    $opengl"
2720
echo "build guest agent $guest_agent"
2707 2721

  
2708 2722
if test "$sdl_too_old" = "yes"; then
2709 2723
echo "-> Your SDL version is too old - please upgrade to have SDL support"

Also available in: Unified diff