New upstream version 1.2.2

1 files changed, 1085 insertions, 18 deletions

diff --git a/configure b/configure
index 8dfb9523a..ec6a4a28c 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for libvirt 1.2.1.
+# Generated by GNU Autoconf 2.69 for libvirt 1.2.2.
 #
 # Report bugs to <libvir-list@redhat.com>.
 #
@@ -590,8 +590,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='libvirt'
 PACKAGE_TARNAME='libvirt'
-PACKAGE_VERSION='1.2.1'
-PACKAGE_STRING='libvirt 1.2.1'
+PACKAGE_VERSION='1.2.2'
+PACKAGE_STRING='libvirt 1.2.2'
 PACKAGE_BUGREPORT='libvir-list@redhat.com'
 PACKAGE_URL='http://libvirt.org'
 
@@ -658,6 +658,7 @@ with_sanlock=check
 with_sasl=check
 with_selinux=check
 with_ssh2=check
+with_systemd_daemon=check
 with_udev=check
 with_yajl=check
 with_xen=check
@@ -678,6 +679,7 @@ with_test=yes
 with_remote=yes
 with_libvirtd=yes
 with_chrdev_lock_files=auto
+with_bhyve=check
 gt_needs=
 ac_subst_vars='gltests_LTLIBOBJS
 gltests_LIBOBJS
@@ -689,6 +691,13 @@ am__EXEEXT_TRUE
 LTLIBOBJS
 LIBOBJS
 IFCONFIG_PATH
+ws_plugindir
+WITH_WIRESHARK_DISSECTOR_FALSE
+WITH_WIRESHARK_DISSECTOR_TRUE
+WS_DISSECTOR_CPPFLAGS
+WIRESHARK
+GLIB_LIBS
+GLIB_CFLAGS
 HAVE_LIBNL_FALSE
 HAVE_LIBNL_TRUE
 LIBNL_ROUTE3_LIBS
@@ -849,6 +858,11 @@ GNUTLS_LIBS
 GNUTLS_CFLAGS
 LIBXML_LIBS
 LIBXML_CFLAGS
+WITH_BHYVE_FALSE
+WITH_BHYVE_TRUE
+BHYVELOAD
+BHYVECTL
+BHYVE
 WITH_PARALLELS_FALSE
 WITH_PARALLELS_TRUE
 WITH_LXC_FALSE
@@ -900,14 +914,17 @@ ENABLE_DEBUG_TRUE
 STATIC_BINARIES
 XML_CATALOG_FILE
 HTML_DIR
+ADDR2LINE
 SCRUB
 OVSVSCTL
+RMMOD
 MODPROBE
 UDEVSETTLE
 UDEVADM
 TC
 RADVD
 DNSMASQ
+DMIDECODE
 AUGPARSE
 XSLTPROC
 XMLCATALOG
@@ -932,6 +949,10 @@ WITH_UDEV_FALSE
 WITH_UDEV_TRUE
 UDEV_LIBS
 UDEV_CFLAGS
+WITH_SYSTEMD_DAEMON_FALSE
+WITH_SYSTEMD_DAEMON_TRUE
+SYSTEMD_DAEMON_LIBS
+SYSTEMD_DAEMON_CFLAGS
 WITH_SSH2_FALSE
 WITH_SSH2_TRUE
 SSH2_LIBS
@@ -1040,7 +1061,6 @@ ac_ct_DUMPBIN
 DUMPBIN
 LD
 FGREP
-SED
 LIBTOOL
 OBJDUMP
 DLLTOOL
@@ -1551,6 +1571,7 @@ GNULIB_MKTIME
 LOCALE_FR_UTF8
 LOCALE_ZH_CN
 LOCALE_JA
+SED
 LTLIBMULTITHREAD
 LIBMULTITHREAD
 LTLIBTHREAD
@@ -2361,6 +2382,7 @@ with_sasl
 with_selinux
 with_selinux_mount
 with_ssh2
+with_systemd_daemon
 with_udev
 with_yajl
 with_html_dir
@@ -2388,6 +2410,7 @@ enable_debug
 with_init_script
 with_sysctl
 with_rhel5_api
+with_bhyve
 with_libxml
 with_gnutls
 with_polkit
@@ -2424,6 +2447,8 @@ with_qemu_user
 with_qemu_group
 with_macvtap
 with_virtualport
+with_wireshark_dissector
+with_ws_plugindir
 '
       ac_precious_vars='build_alias
 host_alias
@@ -2459,6 +2484,8 @@ PCIACCESS_CFLAGS
 PCIACCESS_LIBS
 SSH2_CFLAGS
 SSH2_LIBS
+SYSTEMD_DAEMON_CFLAGS
+SYSTEMD_DAEMON_LIBS
 UDEV_CFLAGS
 UDEV_LIBS
 LIBXML_CFLAGS
@@ -2474,7 +2501,9 @@ DEVMAPPER_LIBS
 LIBNL_CFLAGS
 LIBNL_LIBS
 LIBNL_ROUTE3_CFLAGS
-LIBNL_ROUTE3_LIBS'
+LIBNL_ROUTE3_LIBS
+GLIB_CFLAGS
+GLIB_LIBS'
 
 
 # Initialize some variables set by options.
@@ -3015,7 +3044,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures libvirt 1.2.1 to adapt to many kinds of systems.
+\`configure' configures libvirt 1.2.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -3085,7 +3114,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of libvirt 1.2.1:";;
+     short | recursive ) echo "Configuration of libvirt 1.2.2:";;
    esac
   cat <<\_ACEOF
 
@@ -3164,6 +3193,8 @@ Optional Packages:
   --with-selinux          with libselinux support [default=check]
   --with-selinux-mount    set SELinux mount point [default=check]
   --with-ssh2             with libssh2 (>= 1.3) support [default=check]
+  --with-systemd-daemon   with libsystemd-daemon (>= 0.27.1) support
+                          [default=check]
   --with-udev             with libudev (>= 145) support [default=check]
   --with-yajl             with libyajl support [default=check]
   --with-html-dir=path    path to base html directory, default
@@ -3199,6 +3230,7 @@ Optional Packages:
                           systemd+redhat, upstart, check, none [default=check]
   --with-sysctl[=yes/no]  Whether to install sysctl configs [default=check]
   --with-rhel5-api=[ARG]  build for the RHEL-5 API [default=no]
+  --with-bhyve            add BHyVe support [default=check]
   --with-libxml=[PFX]     libxml2 location
   --with-gnutls           use GNUTLS for encryption [default=check]
   --with-polkit           use PolicyKit for UNIX socket access checks
@@ -3249,6 +3281,11 @@ Optional Packages:
                           [default=platform dependent]
   --with-macvtap          enable macvtap device [default=check]
   --with-virtualport      enable virtual port support [default=check]
+  --with-wireshark-dissector
+                          enable wireshark dissector plugin support
+                          [default=check]
+  --with-ws-plugindir     wireshark plugins directory for use when installing
+                          wireshark plugin
 
 Some influential environment variables:
   CC          C compiler command
@@ -3295,6 +3332,10 @@ Some influential environment variables:
               linker flags for PCIACCESS, overriding pkg-config
   SSH2_CFLAGS C compiler flags for SSH2, overriding pkg-config
   SSH2_LIBS   linker flags for SSH2, overriding pkg-config
+  SYSTEMD_DAEMON_CFLAGS
+              C compiler flags for SYSTEMD_DAEMON, overriding pkg-config
+  SYSTEMD_DAEMON_LIBS
+              linker flags for SYSTEMD_DAEMON, overriding pkg-config
   UDEV_CFLAGS C compiler flags for UDEV, overriding pkg-config
   UDEV_LIBS   linker flags for UDEV, overriding pkg-config
   LIBXML_CFLAGS
@@ -3321,6 +3362,8 @@ Some influential environment variables:
               C compiler flags for LIBNL_ROUTE3, overriding pkg-config
   LIBNL_ROUTE3_LIBS
               linker flags for LIBNL_ROUTE3, overriding pkg-config
+  GLIB_CFLAGS C compiler flags for GLIB, overriding pkg-config
+  GLIB_LIBS   linker flags for GLIB, overriding pkg-config
 
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
@@ -3389,7 +3432,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-libvirt configure 1.2.1
+libvirt configure 1.2.2
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -4098,7 +4141,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by libvirt $as_me 1.2.1, which was
+It was created by libvirt $as_me 1.2.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -5091,7 +5134,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='libvirt'
- VERSION='1.2.1'
+ VERSION='1.2.2'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -15074,6 +15117,75 @@ _ACEOF
       ;;
   esac
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
+$as_echo_n "checking for a sed that does not truncate output... " >&6; }
+if ${ac_cv_path_SED+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+            ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
+     for ac_i in 1 2 3 4 5 6 7; do
+       ac_script="$ac_script$as_nl$ac_script"
+     done
+     echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
+     { ac_script=; unset ac_script;}
+     if test -z "$SED"; then
+  ac_path_SED_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_prog in sed gsed; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
+      as_fn_executable_p "$ac_path_SED" || continue
+# Check for GNU ac_path_SED and select it if it is found.
+  # Check for GNU $ac_path_SED
+case `"$ac_path_SED" --version 2>&1` in
+*GNU*)
+  ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
+*)
+  ac_count=0
+  $as_echo_n 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    $as_echo '' >> "conftest.nl"
+    "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
+    if test $ac_count -gt ${ac_path_SED_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_SED="$ac_path_SED"
+      ac_path_SED_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+      $ac_path_SED_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_SED"; then
+    as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5
+  fi
+else
+  ac_cv_path_SED=$SED
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
+$as_echo "$ac_cv_path_SED" >&6; }
+ SED="$ac_cv_path_SED"
+  rm -f conftest.sed
+
 
 
       for ac_header in stdlib.h
@@ -27048,6 +27160,7 @@ $as_echo "#define GNULIB_TEST_LSTAT 1" >>confdefs.h
 
 
 
+
       for ac_header in stdlib.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default"
@@ -30448,6 +30561,37 @@ $as_echo "$gl_cv_next_pthread_h" >&6; }
 
    if test $ac_cv_header_pthread_h = yes; then
      HAVE_PTHREAD_H=1
+     # mingw 3.0 uses winpthreads which installs broken macros via <pthread.h>
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether <pthread.h> pollutes the namespace" >&5
+$as_echo_n "checking whether <pthread.h> pollutes the namespace... " >&6; }
+if ${gl_cv_header_pthread_h_pollution+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <pthread.h>
+            #ifdef strtok_r
+            #error
+             break me
+            #endif
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  gl_cv_header_pthread_h_pollution=no
+else
+  gl_cv_header_pthread_h_pollution=yes
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_pthread_h_pollution" >&5
+$as_echo "$gl_cv_header_pthread_h_pollution" >&6; }
    else
      HAVE_PTHREAD_H=0
    fi
@@ -30500,6 +30644,8 @@ fi
 
   gl_LIBOBJS="$gl_LIBOBJS pthread.$ac_objext"
 
+   elif test $gl_cv_header_pthread_h_pollution = yes; then
+     PTHREAD_H=pthread.h
    else
      PTHREAD_H=
    fi
@@ -49518,10 +49664,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
 	  x86_64-*linux*)
 	    LD="${LD-ld} -m elf_i386"
 	    ;;
-	  powerpcle-*linux*)
+	  powerpc64le-*linux*)
 	    LD="${LD-ld} -m elf32lppclinux"
 	    ;;
-	  powerpc-*linux*)
+	  powerpc64-*linux*)
 	    LD="${LD-ld} -m elf32ppclinux"
 	    ;;
 	  s390x-*linux*)
@@ -55313,6 +55459,7 @@ $as_echo "$NO_INDIRECT_LDFLAGS" >&6; }
 
 
 
+
 # Check whether --with-apparmor was given.
 if test "${with_apparmor+set}" = set; then :
   withval=$with_apparmor;
@@ -55451,6 +55598,7 @@ fi
 
 
 
+
 # Check whether --with-apparmor_mount was given.
 if test "${with_apparmor_mount+set}" = set; then :
   withval=$with_apparmor_mount;
@@ -55490,6 +55638,7 @@ _ACEOF
 
 
 
+
 # Check whether --with-attr was given.
 if test "${with_attr+set}" = set; then :
   withval=$with_attr;
@@ -55645,6 +55794,8 @@ fi
 
 
 
+
+
 # Check whether --with-audit was given.
 if test "${with_audit+set}" = set; then :
   withval=$with_audit;
@@ -55789,6 +55940,7 @@ fi
 
 
 
+
 if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
 	if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
@@ -55919,6 +56071,7 @@ fi
 
 
 
+
 # Check whether --with-avahi was given.
 if test "${with_avahi+set}" = set; then :
   withval=$with_avahi;
@@ -56064,6 +56217,8 @@ fi
 
 
 
+
+
 # Check whether --with-blkid was given.
 if test "${with_blkid+set}" = set; then :
   withval=$with_blkid;
@@ -56210,6 +56365,8 @@ fi
 
 
 
+
+
 # Check whether --with-capng was given.
 if test "${with_capng+set}" = set; then :
   withval=$with_capng;
@@ -56364,6 +56521,8 @@ fi
 
 
 
+
+
 # Check whether --with-curl was given.
 if test "${with_curl+set}" = set; then :
   withval=$with_curl;
@@ -56492,6 +56651,7 @@ fi
 
 
 
+
   # XXX as of libcurl-devel-7.20.1-3.fc13.x86_64, curl ships a version
   # of <curl/curl.h> that #defines several wrapper macros around underlying
   # functions to add type safety for gcc only.  However, these macros
@@ -56517,6 +56677,7 @@ fi
 
 
 
+
 # Check whether --with-dbus was given.
 if test "${with_dbus+set}" = set; then :
   withval=$with_dbus;
@@ -56645,6 +56806,7 @@ fi
 
 
 
+
   if test "$with_dbus" = "yes" ; then
     old_CFLAGS="$CFLAGS"
     old_LIBS="$LIBS"
@@ -56682,6 +56844,7 @@ done
 
 
 
+
 # Check whether --with-fuse was given.
 if test "${with_fuse+set}" = set; then :
   withval=$with_fuse;
@@ -56827,6 +56990,8 @@ fi
 
 
 
+
+
 # Check whether --with-glusterfs was given.
 if test "${with_glusterfs+set}" = set; then :
   withval=$with_glusterfs;
@@ -56972,6 +57137,8 @@ fi
 
 
 
+
+
 # Check whether --with-hal was given.
 if test "${with_hal+set}" = set; then :
   withval=$with_hal;
@@ -57117,6 +57284,8 @@ fi
 
 
 
+
+
 # Check whether --with-netcf was given.
 if test "${with_netcf+set}" = set; then :
   withval=$with_netcf;
@@ -57245,6 +57414,7 @@ fi
 
 
 
+
   if test "$with_netcf" = "yes" ; then
     old_CFLAGS="$CFLAGS"
     old_LIBS="$CFLAGS"
@@ -57286,6 +57456,7 @@ _ACEOF
 
 
 
+
 # Check whether --with-numactl was given.
 if test "${with_numactl+set}" = set; then :
   withval=$with_numactl;
@@ -57440,6 +57611,8 @@ fi
 
 
 
+
+
 # Check whether --with-openwsman was given.
 if test "${with_openwsman+set}" = set; then :
   withval=$with_openwsman;
@@ -57585,6 +57758,8 @@ fi
 
 
 
+
+
 # Check whether --with-pciaccess was given.
 if test "${with_pciaccess+set}" = set; then :
   withval=$with_pciaccess;
@@ -57714,6 +57889,7 @@ fi
 
 
 
+
   extra_LIBS=
   lv_saved_libs=$LIBS
   if test "x$with_readline" != xno; then
@@ -57803,6 +57979,7 @@ fi
 
 
 
+
 # Check whether --with-readline was given.
 if test "${with_readline+set}" = set; then :
   withval=$with_readline;
@@ -57940,6 +58117,7 @@ fi
 
 
 
+
   # Touch things up to avoid $extra_LIBS, if possible.  Test a second
   # function, to ensure we aren't being confused by caching.
   LIBS=$lv_saved_libs
@@ -58010,6 +58188,7 @@ fi
 
 
 
+
 # Check whether --with-sanlock was given.
 if test "${with_sanlock+set}" = set; then :
   withval=$with_sanlock;
@@ -58147,6 +58326,7 @@ fi
 
 
 
+
   if test "x$with_sanlock" = "xyes" ; then
     ac_fn_c_check_decl "$LINENO" "SANLK_INQ_WAIT" "ac_cv_have_decl_SANLK_INQ_WAIT" "
       #include <stdint.h>
@@ -58303,6 +58483,7 @@ _ACEOF
 
 
 
+
 # Check whether --with-sasl was given.
 if test "${with_sasl+set}" = set; then :
   withval=$with_sasl;
@@ -58536,6 +58717,8 @@ fi
 
 
 
+
+
 # Check whether --with-selinux was given.
 if test "${with_selinux+set}" = set; then :
   withval=$with_selinux;
@@ -58674,6 +58857,7 @@ fi
 
 
 
+
 # Check whether --with-selinux_mount was given.
 if test "${with_selinux_mount+set}" = set; then :
   withval=$with_selinux_mount;
@@ -58733,6 +58917,7 @@ done
 
 
 
+
 # Check whether --with-ssh2 was given.
 if test "${with_ssh2+set}" = set; then :
   withval=$with_ssh2;
@@ -58879,6 +59064,173 @@ fi
 
 
 
+
+# Check whether --with-systemd-daemon was given.
+if test "${with_systemd_daemon+set}" = set; then :
+  withval=$with_systemd_daemon;
+fi
+
+
+  fail=0
+  if test "x$with_systemd_daemon" != "xno" ; then
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SYSTEMD_DAEMON" >&5
+$as_echo_n "checking for SYSTEMD_DAEMON... " >&6; }
+
+if test -n "$SYSTEMD_DAEMON_CFLAGS"; then
+    pkg_cv_SYSTEMD_DAEMON_CFLAGS="$SYSTEMD_DAEMON_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd-daemon >= 0.27.1\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libsystemd-daemon >= 0.27.1") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_SYSTEMD_DAEMON_CFLAGS=`$PKG_CONFIG --cflags "libsystemd-daemon >= 0.27.1" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$SYSTEMD_DAEMON_LIBS"; then
+    pkg_cv_SYSTEMD_DAEMON_LIBS="$SYSTEMD_DAEMON_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd-daemon >= 0.27.1\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libsystemd-daemon >= 0.27.1") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_SYSTEMD_DAEMON_LIBS=`$PKG_CONFIG --libs "libsystemd-daemon >= 0.27.1" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        SYSTEMD_DAEMON_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsystemd-daemon >= 0.27.1" 2>&1`
+        else
+	        SYSTEMD_DAEMON_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsystemd-daemon >= 0.27.1" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$SYSTEMD_DAEMON_PKG_ERRORS" >&5
+
+
+      if test "x$with_systemd_daemon" != "xcheck"; then
+        fail=1
+      fi
+      with_systemd_daemon=no
+
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+      if test "x$with_systemd_daemon" != "xcheck"; then
+        fail=1
+      fi
+      with_systemd_daemon=no
+
+else
+	SYSTEMD_DAEMON_CFLAGS=$pkg_cv_SYSTEMD_DAEMON_CFLAGS
+	SYSTEMD_DAEMON_LIBS=$pkg_cv_SYSTEMD_DAEMON_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+      with_systemd_daemon=yes
+
+fi
+  fi
+
+  if test $fail = 1; then
+    as_fn_error $? "You must install the libsystemd-daemon >= 0.27.1 pkg-config module to compile libvirt" "$LINENO" 5
+  fi
+
+  if test "x$with_systemd_daemon" = "xyes" ; then
+
+cat >>confdefs.h <<_ACEOF
+#define WITH_SYSTEMD_DAEMON 1
+_ACEOF
+
+  fi
+
+   if test "x$with_systemd_daemon" = "xyes"; then
+  WITH_SYSTEMD_DAEMON_TRUE=
+  WITH_SYSTEMD_DAEMON_FALSE='#'
+else
+  WITH_SYSTEMD_DAEMON_TRUE='#'
+  WITH_SYSTEMD_DAEMON_FALSE=
+fi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    old_CFLAGS="$CFLAGS"
+    old_LIBS="$LIBS"
+    CFLAGS="$CFLAGS $SYSTEMD_DAEMON_CFLAGS"
+    LIBS="$LIBS $SYSTEMD_DAEMON_LIBS"
+    for ac_func in sd_notify
+do :
+  ac_fn_c_check_func "$LINENO" "sd_notify" "ac_cv_func_sd_notify"
+if test "x$ac_cv_func_sd_notify" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_SD_NOTIFY 1
+_ACEOF
+
+fi
+done
+
+    CFLAGS="$old_CFLAGS"
+    LIBS="$old_LIBS"
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 # Check whether --with-udev was given.
 if test "${with_udev+set}" = set; then :
   withval=$with_udev;
@@ -59007,6 +59359,7 @@ fi
 
 
 
+
   if test "$with_udev" = "yes" && test "$with_pciaccess" != "yes" ; then
     as_fn_error $? "You must install the pciaccess module to build with udev" "$LINENO" 5
   fi
@@ -59097,6 +59450,7 @@ done
 
 
 
+
 # Check whether --with-yajl was given.
 if test "${with_yajl+set}" = set; then :
   withval=$with_yajl;
@@ -59313,6 +59667,7 @@ fi
 
 
 
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CPUID instruction" >&5
 $as_echo_n "checking for CPUID instruction... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -59549,6 +59904,8 @@ _ACEOF
 
 old_LIBS=$LIBS
 LIBS="$LIBS $LIB_PTHREAD $LIBMULTITHREAD"
+
+pthread_found=yes
 for ac_func in pthread_mutexattr_init
 do :
   ac_fn_c_check_func "$LINENO" "pthread_mutexattr_init" "ac_cv_func_pthread_mutexattr_init"
@@ -59560,6 +59917,20 @@ _ACEOF
 fi
 done
 
+ac_fn_c_check_header_mongrel "$LINENO" "pthread.h" "ac_cv_header_pthread_h" "$ac_includes_default"
+if test "x$ac_cv_header_pthread_h" = xyes; then :
+
+else
+  pthread_found=no
+fi
+
+
+
+if test "$ac_cv_func_pthread_mutexattr_init:$pthread_found" != "yes:yes"
+then
+  as_fn_error $? "A pthreads impl is required for building libvirt" "$LINENO" 5
+fi
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether pthread_sigmask does anything" >&5
 $as_echo_n "checking whether pthread_sigmask does anything... " >&6; }
 if ${lv_cv_pthread_sigmask_works+:} false; then :
@@ -59575,8 +59946,10 @@ int
 main ()
 {
 
-   int (*foo)(int, const sigset_t *, sigset_t *) = &pthread_sigmask;
-   return !foo;
+    #ifdef pthread_sigmask
+    int (*foo)(int, const sigset_t *, sigset_t *) = &pthread_sigmask;
+    return !foo;
+    #endif
 
   ;
   return 0;
@@ -60006,6 +60379,48 @@ fi
 
 
 
+# Extract the first word of "dmidecode", so it can be a program name with args.
+set dummy dmidecode; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_DMIDECODE+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $DMIDECODE in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_DMIDECODE="$DMIDECODE" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+as_dummy="/sbin:/usr/sbin:/usr/local/sbin:$PATH"
+for as_dir in $as_dummy
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_DMIDECODE="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  test -z "$ac_cv_path_DMIDECODE" && ac_cv_path_DMIDECODE="dmidecode"
+  ;;
+esac
+fi
+DMIDECODE=$ac_cv_path_DMIDECODE
+if test -n "$DMIDECODE"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DMIDECODE" >&5
+$as_echo "$DMIDECODE" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
 # Extract the first word of "dnsmasq", so it can be a program name with args.
 set dummy dnsmasq; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
@@ -60256,6 +60671,48 @@ $as_echo "no" >&6; }
 fi
 
 
+# Extract the first word of "rmmod", so it can be a program name with args.
+set dummy rmmod; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_RMMOD+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $RMMOD in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_RMMOD="$RMMOD" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+as_dummy="/sbin:/usr/sbin:/usr/local/sbin:$PATH"
+for as_dir in $as_dummy
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_RMMOD="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  test -z "$ac_cv_path_RMMOD" && ac_cv_path_RMMOD="rmmod"
+  ;;
+esac
+fi
+RMMOD=$ac_cv_path_RMMOD
+if test -n "$RMMOD"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RMMOD" >&5
+$as_echo "$RMMOD" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
 # Extract the first word of "ovs-vsctl", so it can be a program name with args.
 set dummy ovs-vsctl; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
@@ -60340,6 +60797,53 @@ $as_echo "no" >&6; }
 fi
 
 
+# Extract the first word of "addr2line", so it can be a program name with args.
+set dummy addr2line; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_ADDR2LINE+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $ADDR2LINE in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_ADDR2LINE="$ADDR2LINE" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+as_dummy="/sbin:/usr/bin:/usr/sbin:/usr/local/sbin:$PATH"
+for as_dir in $as_dummy
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_ADDR2LINE="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  test -z "$ac_cv_path_ADDR2LINE" && ac_cv_path_ADDR2LINE="addr2line"
+  ;;
+esac
+fi
+ADDR2LINE=$ac_cv_path_ADDR2LINE
+if test -n "$ADDR2LINE"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ADDR2LINE" >&5
+$as_echo "$ADDR2LINE" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define DMIDECODE "$DMIDECODE"
+_ACEOF
 
 
 cat >>confdefs.h <<_ACEOF
@@ -60383,12 +60887,24 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 
 fi
+if test -n "$RMMOD"; then
+
+cat >>confdefs.h <<_ACEOF
+#define RMMOD "$RMMOD"
+_ACEOF
+
+fi
 
 cat >>confdefs.h <<_ACEOF
 #define SCRUB "$SCRUB"
 _ACEOF
 
 
+cat >>confdefs.h <<_ACEOF
+#define ADDR2LINE "$ADDR2LINE"
+_ACEOF
+
+
 
 # Check whether --with-html-dir was given.
 if test "${with_html_dir+set}" = set; then :
@@ -61784,6 +62300,185 @@ else
 fi
 
 
+
+
+
+# Check whether --with-bhyve was given.
+if test "${with_bhyve+set}" = set; then :
+  withval=$with_bhyve;
+fi
+
+
+
+    if test "$with_bhyve" != "no"; then
+        # Extract the first word of "bhyve", so it can be a program name with args.
+set dummy bhyve; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_BHYVE+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $BHYVE in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_BHYVE="$BHYVE" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+as_dummy="$PATH:/usr/sbin"
+for as_dir in $as_dummy
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_BHYVE="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+BHYVE=$ac_cv_path_BHYVE
+if test -n "$BHYVE"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BHYVE" >&5
+$as_echo "$BHYVE" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+        # Extract the first word of "bhyvectl", so it can be a program name with args.
+set dummy bhyvectl; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_BHYVECTL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $BHYVECTL in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_BHYVECTL="$BHYVECTL" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+as_dummy="$PATH:/usr/sbin"
+for as_dir in $as_dummy
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_BHYVECTL="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+BHYVECTL=$ac_cv_path_BHYVECTL
+if test -n "$BHYVECTL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BHYVECTL" >&5
+$as_echo "$BHYVECTL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+        # Extract the first word of "bhyveload", so it can be a program name with args.
+set dummy bhyveload; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_BHYVELOAD+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $BHYVELOAD in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_BHYVELOAD="$BHYVELOAD" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+as_dummy="$PATH:/usr/sbin/"
+for as_dir in $as_dummy
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_BHYVELOAD="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+BHYVELOAD=$ac_cv_path_BHYVELOAD
+if test -n "$BHYVELOAD"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BHYVELOAD" >&5
+$as_echo "$BHYVELOAD" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+
+        if test -z "$BHYVE" || test -z "$BHYVECTL" \
+            test -z "$BHYVELOAD" || test "$with_freebsd" = "no"; then
+            if test "$with_bhyve" = "check"; then
+                with_bhyve="no"
+            else
+                as_fn_error $? "The bhyve driver cannot be enabled" "$LINENO" 5
+            fi
+        else
+            with_bhyve="yes"
+        fi
+    fi
+
+    if test "$with_bhyve" = "yes"; then
+
+cat >>confdefs.h <<_ACEOF
+#define WITH_BHYVE 1
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define BHYVE "$BHYVE"
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define BHYVECTL "$BHYVECTL"
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define BHYVELOAD "$BHYVELOAD"
+_ACEOF
+
+    fi
+     if test "$with_bhyve" = "yes"; then
+  WITH_BHYVE_TRUE=
+  WITH_BHYVE_FALSE='#'
+else
+  WITH_BHYVE_TRUE='#'
+  WITH_BHYVE_FALSE=
+fi
+
+
+
 if test "$with_qemu" = yes; then
   lv_wrapper_shell=
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shell that supports <> redirection" >&5
@@ -64405,7 +65100,6 @@ else
 fi
 
 
-LIBGLUSTER_LIBS=
 if test "$with_storage_gluster" = "check"; then
   with_storage_gluster=$with_glusterfs
 fi
@@ -67612,6 +68306,18 @@ else
 fi
 
 
+ac_fn_c_check_decl "$LINENO" "GET_VLAN_VID_CMD" "ac_cv_have_decl_GET_VLAN_VID_CMD" "#include <linux/if_vlan.h>
+"
+if test "x$ac_cv_have_decl_GET_VLAN_VID_CMD" = xyes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_GET_VLAN_VID_CMD $ac_have_decl
+_ACEOF
+
 
 
 have_libnl=no
@@ -67914,6 +68620,290 @@ fi
 
 
 
+
+
+# Check whether --with-wireshark-dissector was given.
+if test "${with_wireshark_dissector+set}" = set; then :
+  withval=$with_wireshark_dissector;  with_wireshark_dissector=$withval
+else
+   with_wireshark_dissector=check
+fi
+
+
+
+if test "$with_wireshark_dissector" != "no"; then
+        for ac_header in rpc/types.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "rpc/types.h" "ac_cv_header_rpc_types_h" "$ac_includes_default"
+if test "x$ac_cv_header_rpc_types_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_RPC_TYPES_H 1
+_ACEOF
+
+fi
+
+done
+
+
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GLIB" >&5
+$as_echo_n "checking for GLIB... " >&6; }
+
+if test -n "$GLIB_CFLAGS"; then
+    pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "glib-2.0") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$GLIB_LIBS"; then
+    pkg_cv_GLIB_LIBS="$GLIB_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "glib-2.0") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs "glib-2.0" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "glib-2.0" 2>&1`
+        else
+	        GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glib-2.0" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$GLIB_PKG_ERRORS" >&5
+
+
+
+  if test "$with_wireshark_dissector" = "yes"; then
+    as_fn_error $? "pkg-config 'glib-2.0' is required for wireshark-dissector support" "$LINENO" 5
+  else
+    with_wireshark_dissector=no
+  fi
+
+
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+
+  if test "$with_wireshark_dissector" = "yes"; then
+    as_fn_error $? "pkg-config 'glib-2.0' is required for wireshark-dissector support" "$LINENO" 5
+  else
+    with_wireshark_dissector=no
+  fi
+
+
+else
+	GLIB_CFLAGS=$pkg_cv_GLIB_CFLAGS
+	GLIB_LIBS=$pkg_cv_GLIB_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+      WS_DISSECTOR_CPPFLAGS="$WS_DISSECTOR_CPPFLAGS `$PKG_CONFIG --cflags glib-2.0`"
+
+fi
+
+        # Extract the first word of "wireshark", so it can be a program name with args.
+set dummy wireshark; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_WIRESHARK+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $WIRESHARK in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_WIRESHARK="$WIRESHARK" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_WIRESHARK="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+WIRESHARK=$ac_cv_path_WIRESHARK
+if test -n "$WIRESHARK"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $WIRESHARK" >&5
+$as_echo "$WIRESHARK" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+    # Extract the first word of "tshark", so it can be a program name with args.
+set dummy tshark; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_WIRESHARK+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $WIRESHARK in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_WIRESHARK="$WIRESHARK" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_WIRESHARK="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+WIRESHARK=$ac_cv_path_WIRESHARK
+if test -n "$WIRESHARK"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $WIRESHARK" >&5
+$as_echo "$WIRESHARK" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+    if test -z "$WIRESHARK"; then
+
+  if test "$with_wireshark_dissector" = "yes"; then
+    as_fn_error $? "command not found wireshark or tshark" "$LINENO" 5
+  else
+    with_wireshark_dissector=no
+  fi
+
+    else
+                save_CPPFLAGS="$CPPFLAGS"
+        WS_DISSECTOR_CPPFLAGS="$WS_DISSECTOR_CPPFLAGS -I`dirname $WIRESHARK`/../include/wireshark"
+        CPPFLAGS="$CPPFLAGS $WS_DISSECTOR_CPPFLAGS"
+        for ac_header in wireshark/config.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "wireshark/config.h" "ac_cv_header_wireshark_config_h" "$ac_includes_default"
+if test "x$ac_cv_header_wireshark_config_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_WIRESHARK_CONFIG_H 1
+_ACEOF
+
+else
+
+
+  if test "$with_wireshark_dissector" = "yes"; then
+    as_fn_error $? "wireshark/config.h is required for wireshark-dissector support" "$LINENO" 5
+  else
+    with_wireshark_dissector=no
+  fi
+
+
+fi
+
+done
+
+        for ac_header in wireshark/epan/packet.h wireshark/epan/dissectors/packet-tcp.h
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "
+          #include <wireshark/config.h>
+
+"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+else
+
+
+  if test "$with_wireshark_dissector" = "yes"; then
+    as_fn_error $? "wireshark/epan/{packet,packet-tcp}.h are required for wireshark-dissector support" "$LINENO" 5
+  else
+    with_wireshark_dissector=no
+  fi
+
+
+fi
+
+done
+
+        CPPFLAGS="$save_CPPFLAGS"
+    fi
+    if test "$with_wireshark_dissector" != "no"; then
+        with_wireshark_dissector=yes
+    fi
+fi
+
+ if test "$with_wireshark_dissector" = "yes"; then
+  WITH_WIRESHARK_DISSECTOR_TRUE=
+  WITH_WIRESHARK_DISSECTOR_FALSE='#'
+else
+  WITH_WIRESHARK_DISSECTOR_TRUE='#'
+  WITH_WIRESHARK_DISSECTOR_FALSE=
+fi
+
+
+
+# Check whether --with-ws-plugindir was given.
+if test "${with_ws_plugindir+set}" = set; then :
+  withval=$with_ws_plugindir; ws_plugindir=$withval
+fi
+
+
+if test "$with_wireshark_dissector" != "no" && test -z "$ws_plugindir"; then
+    ws_version=`$WIRESHARK -v | head -1 | cut -f 2 -d' '`
+    ws_plugindir="$libdir/wireshark/plugins/$ws_version"
+fi
+
+
 # Check for Linux vs. BSD ifreq members
 ac_fn_c_check_member "$LINENO" "struct ifreq" "ifr_newname" "ac_cv_member_struct_ifreq_ifr_newname" "#include <sys/socket.h>
                   #include <net/if.h>
@@ -68041,6 +69031,27 @@ $as_echo "#define HAVE_BSD_BRIDGE_MGMT 1" >>confdefs.h
 fi
 
 
+# Check for BSD CPU affinity availability
+ac_fn_c_check_decl "$LINENO" "cpuset_getaffinity" "ac_cv_have_decl_cpuset_getaffinity" "#include <sys/param.h>
+                #include <sys/cpuset.h>
+
+"
+if test "x$ac_cv_have_decl_cpuset_getaffinity" = xyes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_CPUSET_GETAFFINITY $ac_have_decl
+_ACEOF
+if test $ac_have_decl = 1; then :
+
+$as_echo "#define HAVE_BSD_CPU_AFFINITY 1" >>confdefs.h
+
+fi
+
+
 # Check if we need to look for ifconfig
 if test "$want_ifconfig" = "yes"; then
      # Extract the first word of "ifconfig", so it can be a program name with args.
@@ -68137,7 +69148,7 @@ _ACEOF
 
 ac_config_files="$ac_config_files run"
 
-ac_config_files="$ac_config_files Makefile src/Makefile include/Makefile docs/Makefile docs/schemas/Makefile gnulib/lib/Makefile gnulib/tests/Makefile libvirt.pc libvirt.spec mingw-libvirt.spec po/Makefile.in include/libvirt/Makefile include/libvirt/libvirt.h daemon/Makefile tools/Makefile tests/Makefile examples/apparmor/Makefile examples/object-events/Makefile examples/domsuspend/Makefile examples/dominfo/Makefile examples/openauth/Makefile examples/hellolibvirt/Makefile examples/systemtap/Makefile examples/xml/nwfilter/Makefile"
+ac_config_files="$ac_config_files Makefile src/Makefile include/Makefile docs/Makefile docs/schemas/Makefile gnulib/lib/Makefile gnulib/tests/Makefile libvirt.pc libvirt.spec mingw-libvirt.spec po/Makefile.in include/libvirt/Makefile include/libvirt/libvirt.h daemon/Makefile tools/Makefile tests/Makefile examples/apparmor/Makefile examples/object-events/Makefile examples/domsuspend/Makefile examples/dominfo/Makefile examples/openauth/Makefile examples/hellolibvirt/Makefile examples/systemtap/Makefile examples/xml/nwfilter/Makefile tools/wireshark/Makefile tools/wireshark/src/Makefile"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -68475,6 +69486,10 @@ if test -z "${WITH_SSH2_TRUE}" && test -z "${WITH_SSH2_FALSE}"; then
   as_fn_error $? "conditional \"WITH_SSH2\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${WITH_SYSTEMD_DAEMON_TRUE}" && test -z "${WITH_SYSTEMD_DAEMON_FALSE}"; then
+  as_fn_error $? "conditional \"WITH_SYSTEMD_DAEMON\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${WITH_UDEV_TRUE}" && test -z "${WITH_UDEV_FALSE}"; then
   as_fn_error $? "conditional \"WITH_UDEV\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -68575,6 +69590,10 @@ if test -z "${WITH_PARALLELS_TRUE}" && test -z "${WITH_PARALLELS_FALSE}"; then
   as_fn_error $? "conditional \"WITH_PARALLELS\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${WITH_BHYVE_TRUE}" && test -z "${WITH_BHYVE_FALSE}"; then
+  as_fn_error $? "conditional \"WITH_BHYVE\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${WITH_GNUTLS_TRUE}" && test -z "${WITH_GNUTLS_FALSE}"; then
   as_fn_error $? "conditional \"WITH_GNUTLS\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -68747,6 +69766,10 @@ if test -z "${HAVE_LIBNL_TRUE}" && test -z "${HAVE_LIBNL_FALSE}"; then
   as_fn_error $? "conditional \"HAVE_LIBNL\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${WITH_WIRESHARK_DISSECTOR_TRUE}" && test -z "${WITH_WIRESHARK_DISSECTOR_FALSE}"; then
+  as_fn_error $? "conditional \"WITH_WIRESHARK_DISSECTOR\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 
 : "${CONFIG_STATUS=./config.status}"
 ac_write_fail=0
@@ -69144,7 +70167,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by libvirt $as_me 1.2.1, which was
+This file was extended by libvirt $as_me 1.2.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -69215,7 +70238,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-libvirt config.status 1.2.1
+libvirt config.status 1.2.2
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -69661,6 +70684,8 @@ do
     "examples/hellolibvirt/Makefile") CONFIG_FILES="$CONFIG_FILES examples/hellolibvirt/Makefile" ;;
     "examples/systemtap/Makefile") CONFIG_FILES="$CONFIG_FILES examples/systemtap/Makefile" ;;
     "examples/xml/nwfilter/Makefile") CONFIG_FILES="$CONFIG_FILES examples/xml/nwfilter/Makefile" ;;
+    "tools/wireshark/Makefile") CONFIG_FILES="$CONFIG_FILES tools/wireshark/Makefile" ;;
+    "tools/wireshark/src/Makefile") CONFIG_FILES="$CONFIG_FILES tools/wireshark/src/Makefile" ;;
 
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac
@@ -71205,6 +72230,10 @@ $as_echo "$as_me:       ESX: $with_esx" >&6;}
 $as_echo "$as_me:   Hyper-V: $with_hyperv" >&6;}
 { $as_echo "$as_me:${as_lineno-$LINENO}: Parallels: $with_parallels" >&5
 $as_echo "$as_me: Parallels: $with_parallels" >&6;}
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}:     Bhyve: $with_bhyve" >&5
+$as_echo "$as_me:     Bhyve: $with_bhyve" >&6;}
+
 { $as_echo "$as_me:${as_lineno-$LINENO}:      Test: $with_test" >&5
 $as_echo "$as_me:      Test: $with_test" >&6;}
 { $as_echo "$as_me:${as_lineno-$LINENO}:    Remote: $with_remote" >&5
@@ -71887,6 +72916,36 @@ $as_echo "$as_me: $STR" >&6;}
 
 
 
+  if test "$with_systemd_daemon" = "no" || test -z "CFLAGS='$SYSTEMD_DAEMON_CFLAGS' LIBS='$SYSTEMD_DAEMON_LIBS'" ; then
+    STR=`printf "%10s: %-3s" "systemd_daemon" "$with_systemd_daemon"`
+  else
+    STR=`printf "%10s: %-3s (%s)" "systemd_daemon" "$with_systemd_daemon" "CFLAGS='$SYSTEMD_DAEMON_CFLAGS' LIBS='$SYSTEMD_DAEMON_LIBS'"`
+  fi
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: $STR" >&5
+$as_echo "$as_me: $STR" >&6;}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
   if test "$with_udev" = "no" || test -z "CFLAGS='$UDEV_CFLAGS' LIBS='$UDEV_LIBS'" ; then
     STR=`printf "%10s: %-3s" "udev" "$with_udev"`
@@ -72060,6 +73119,14 @@ $as_echo "$as_me:       Init script: $with_init_script" >&6;}
 $as_echo "$as_me: Char device locks: $with_chrdev_lock_files" >&6;}
 { $as_echo "$as_me:${as_lineno-$LINENO}: " >&5
 $as_echo "$as_me: " >&6;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: Developer Tools" >&5
+$as_echo "$as_me: Developer Tools" >&6;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: " >&5
+$as_echo "$as_me: " >&6;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: Wireshark dissector: $with_wireshark_dissector" >&5
+$as_echo "$as_me: Wireshark dissector: $with_wireshark_dissector" >&6;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: " >&5
+$as_echo "$as_me: " >&6;}
 { $as_echo "$as_me:${as_lineno-$LINENO}: Privileges" >&5
 $as_echo "$as_me: Privileges" >&6;}
 { $as_echo "$as_me:${as_lineno-$LINENO}: " >&5