Commit 315d3184 authored by Fam Zheng's avatar Fam Zheng
Browse files

configure: Remove detection code for UUID 



All code now uses built-in UUID implementation. Remove the code of
libuuid and make --enable-uuid and --disable-uuid only print a message.

Signed-off-by: default avatarFam Zheng <famz@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Reviewed-by: default avatarJeff Cody <jcody@redhat.com>
Message-Id: <1474432046-325-9-git-send-email-famz@redhat.com>
parent 586d15ff

configure

+4 −39
Original line number Diff line number Diff line
@@ -212,7 +212,6 @@ sdlabi="" 
virtfs=""

vnc="yes"

sparse="no"

uuid=""

vde=""

vnc_sasl=""

vnc_jpeg=""
@@ -886,10 +885,6 @@ for opt do 
  ;;

  --disable-slirp) slirp="no"

  ;;

  --disable-uuid) uuid="no"

  ;;

  --enable-uuid) uuid="yes"

  ;;

  --disable-vde) vde="no"

  ;;

  --enable-vde) vde="yes"
@@ -1105,6 +1100,9 @@ for opt do 
  --enable-vhdx|--disable-vhdx)

      echo "$0: $opt is obsolete, VHDX driver is always built" >&2

  ;;

  --enable-uuid|--disable-uuid)

      echo "$0: $opt is obsolete, UUID support is always built" >&2

  ;;

  --disable-gtk) gtk="no"

  ;;

  --enable-gtk) gtk="yes"
@@ -1363,7 +1361,6 @@ disabled with --disable-FEATURE, default is enabled if available: 
  bluez           bluez stack connectivity

  kvm             KVM acceleration support

  rdma            RDMA-based migration support

  uuid            uuid support

  vde             support for vde network

  netmap          support for netmap network

  linux-aio       Linux AIO support
@@ -2659,34 +2656,6 @@ if compile_prog "" "" ; then 
fi



##########################################

# uuid_generate() probe, used for vdi block driver

# Note that on some systems (notably MacOSX) no extra library

# need be linked to get the uuid functions.

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

  uuid_libs="-luuid"

  cat > $TMPC << EOF

#include <uuid/uuid.h>

int main(void)

{

    uuid_t my_uuid;

    uuid_generate(my_uuid);

    return 0;

}

EOF

  if compile_prog "" "" ; then

    uuid="yes"

  elif compile_prog "" "$uuid_libs" ; then

    uuid="yes"

    libs_softmmu="$uuid_libs $libs_softmmu"

    libs_tools="$uuid_libs $libs_tools"

  else

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

      feature_not_found "uuid" "Install libuuid devel"

    fi

    uuid=no

  fi

fi



# xfsctl() probe, used for raw-posix

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

  cat > $TMPC << EOF
@@ -4059,7 +4028,7 @@ EOF 
  if compile_prog "$vss_win32_include" "" ; then

    guest_agent_with_vss="yes"

    QEMU_CFLAGS="$QEMU_CFLAGS $vss_win32_include"

    libs_qga="-lole32 -loleaut32 -lshlwapi -luuid -lstdc++ -Wl,--enable-stdcall-fixup $libs_qga"

    libs_qga="-lole32 -loleaut32 -lshlwapi -lstdc++ -Wl,--enable-stdcall-fixup $libs_qga"

    qga_vss_provider="qga/vss-win32/qga-vss.dll qga/vss-win32/qga-vss.tlb"

  else

    if test "$vss_win32_sdk" != "" ; then
@@ -4867,7 +4836,6 @@ echo "preadv support $preadv" 
echo "fdatasync         $fdatasync"

echo "madvise           $madvise"

echo "posix_madvise     $posix_madvise"

echo "uuid support      $uuid"

echo "libcap-ng support $cap_ng"

echo "vhost-net support $vhost_net"

echo "vhost-scsi support $vhost_scsi"
@@ -5057,9 +5025,6 @@ fi 
if test "$fnmatch" = "yes" ; then

  echo "CONFIG_FNMATCH=y" >> $config_host_mak

fi

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

  echo "CONFIG_UUID=y" >> $config_host_mak

fi

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

  echo "CONFIG_XFS=y" >> $config_host_mak

fi