New upstream version 1.1.2~rc1

1 files changed, 238 insertions, 706 deletions

diff --git a/configure b/configure
index 7653d3507..99d5cf671 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.1.1.
+# Generated by GNU Autoconf 2.69 for libvirt 1.1.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.1.1'
-PACKAGE_STRING='libvirt 1.1.1'
+PACKAGE_VERSION='1.1.2'
+PACKAGE_STRING='libvirt 1.1.2'
 PACKAGE_BUGREPORT='libvir-list@redhat.com'
 PACKAGE_URL='http://libvirt.org'
 
@@ -646,6 +646,7 @@ am__EXEEXT_FALSE
 am__EXEEXT_TRUE
 LTLIBOBJS
 LIBOBJS
+IFCONFIG_PATH
 HAVE_LIBNL_FALSE
 HAVE_LIBNL_TRUE
 LIBNL_ROUTE3_LIBS
@@ -700,6 +701,9 @@ WITH_CIL_TRUE
 LOCK_CHECKING_CFLAGS
 COVERAGE_LDFLAGS
 COVERAGE_CFLAGS
+WITH_EXPENSIVE_TESTS_FALSE
+WITH_EXPENSIVE_TESTS_TRUE
+VIR_TEST_EXPENSIVE_DEFAULT
 WITH_TESTS_FALSE
 WITH_TESTS_TRUE
 PERL
@@ -976,6 +980,7 @@ APPARMOR_LIBS
 APPARMOR_CFLAGS
 WITH_APPARMOR_FALSE
 WITH_APPARMOR_TRUE
+NO_INDIRECT_LDFLAGS
 RELRO_LDFLAGS
 PIE_LDFLAGS
 PIE_CFLAGS
@@ -2360,6 +2365,7 @@ with_storage_rbd
 with_storage_sheepdog
 with_python
 enable_with_test_suite
+enable_expensive_tests
 enable_test_coverage
 enable_test_oom
 enable_test_locking
@@ -2962,7 +2968,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.1.1 to adapt to many kinds of systems.
+\`configure' configures libvirt 1.1.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -3032,7 +3038,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of libvirt 1.1.1:";;
+     short | recursive ) echo "Configuration of libvirt 1.1.2:";;
    esac
   cat <<\_ACEOF
 
@@ -3065,6 +3071,10 @@ Optional Features:
   --enable-werror         Use -Werror (if supported)
   --enable-debug=[no|yes] enable debugging output [default=yes]
   --with-test-suite       build test suite by default [default=check]
+  --enable-expensive-tests
+                          set the default for enabling expensive tests (gnulib
+                          and long timeouts) [default=check]; use
+                          VIR_TEST_EXPENSIVE to override during make
   --enable-test-coverage  turn on code coverage instrumentation [default=no]
   --enable-test-oom       memory allocation failure checking [default=no]
   --enable-test-locking   thread locking tests using CIL [default=no]
@@ -3325,7 +3335,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-libvirt configure 1.1.1
+libvirt configure 1.1.2
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -4034,7 +4044,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.1.1, which was
+It was created by libvirt $as_me 1.1.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -4436,6 +4446,7 @@ gl_func_list="$gl_func_list sched_getaffinity"
 gl_func_list="$gl_func_list setgroups"
 gl_func_list="$gl_func_list setns"
 gl_func_list="$gl_func_list setrlimit"
+gl_func_list="$gl_func_list sysctlbyname"
 gt_needs="$gt_needs "
 # Check that the precious variables saved in the cache have kept the same
 # value.
@@ -5024,7 +5035,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='libvirt'
- VERSION='1.1.1'
+ VERSION='1.1.2'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -32098,6 +32109,7 @@ $as_echo "#define regfree rpl_regfree" >>confdefs.h
 
 
 
+
   for ac_header in libintl.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "libintl.h" "ac_cv_header_libintl_h" "$ac_includes_default"
@@ -55065,8 +55077,8 @@ fi
 
     # gcc 4.2 treats attribute(format) as an implicit attribute(nonnull),
     # which triggers spurious warnings for our usage
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether gcc -Wformat allows NULL strings" >&5
-$as_echo_n "checking whether gcc -Wformat allows NULL strings... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler's -Wformat allows NULL strings" >&5
+$as_echo_n "checking whether the C compiler's -Wformat allows NULL strings... " >&6; }
 if ${lv_cv_gcc_wformat_null_works+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -55147,8 +55159,8 @@ _ACEOF
 
     fi
 
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether GCC -Wlogical-op gives bogus warnings" >&5
-$as_echo_n "checking whether GCC -Wlogical-op gives bogus warnings... " >&6; }
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler's -Wlogical-op gives bogus warnings" >&5
+$as_echo_n "checking whether the C compiler's -Wlogical-op gives bogus warnings... " >&6; }
 if ${lv_cv_gcc_wlogical_op_broken+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -55448,672 +55460,78 @@ $as_echo "$gl_cv_cc_uninitialized_supported" >&6; }
   wantwarn=$gl_warn_set
 
 
-    # Check for $CC support of each warning
-    for w in $wantwarn; do
-
-as_gl_Warn=`$as_echo "gl_cv_warn_c_$w" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler handles $w" >&5
-$as_echo_n "checking whether C compiler handles $w... " >&6; }
-if eval \${$as_gl_Warn+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-  gl_save_compiler_FLAGS="$CFLAGS"
-  as_fn_append CFLAGS " $gl_unknown_warnings_are_errors $w"
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  eval "$as_gl_Warn=yes"
-else
-  eval "$as_gl_Warn=no"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  CFLAGS="$gl_save_compiler_FLAGS"
-
-fi
-eval ac_res=\$$as_gl_Warn
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_gl_Warn"\" = x"yes"; then :
-  as_fn_append WARN_CFLAGS " $w"
-fi
-
-
-    done
-
     # GNULIB uses '-W' (aka -Wextra) which includes a bunch of stuff.
     # Unfortunately, this means you can't simply use '-Wsign-compare'
     # with gl_MANYWARN_COMPLEMENT
     # So we have -W enabled, and then have to explicitly turn off...
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler handles -Wno-sign-compare" >&5
-$as_echo_n "checking whether C compiler handles -Wno-sign-compare... " >&6; }
-if ${gl_cv_warn_c__Wno_sign_compare+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-  gl_save_compiler_FLAGS="$CFLAGS"
-  as_fn_append CFLAGS " $gl_unknown_warnings_are_errors -Wno-sign-compare"
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  gl_cv_warn_c__Wno_sign_compare=yes
-else
-  gl_cv_warn_c__Wno_sign_compare=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  CFLAGS="$gl_save_compiler_FLAGS"
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_warn_c__Wno_sign_compare" >&5
-$as_echo "$gl_cv_warn_c__Wno_sign_compare" >&6; }
-if test "x$gl_cv_warn_c__Wno_sign_compare" = xyes; then :
-  as_fn_append WARN_CFLAGS " -Wno-sign-compare"
-fi
-
-
+    wantwarn="$wantwarn -Wno-sign-compare"
 
     # GNULIB expects this to be part of -Wc++-compat, but we turn
     # that one off, so we need to manually enable this again
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler handles -Wjump-misses-init" >&5
-$as_echo_n "checking whether C compiler handles -Wjump-misses-init... " >&6; }
-if ${gl_cv_warn_c__Wjump_misses_init+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-  gl_save_compiler_FLAGS="$CFLAGS"
-  as_fn_append CFLAGS " $gl_unknown_warnings_are_errors -Wjump-misses-init"
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  gl_cv_warn_c__Wjump_misses_init=yes
-else
-  gl_cv_warn_c__Wjump_misses_init=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  CFLAGS="$gl_save_compiler_FLAGS"
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_warn_c__Wjump_misses_init" >&5
-$as_echo "$gl_cv_warn_c__Wjump_misses_init" >&6; }
-if test "x$gl_cv_warn_c__Wjump_misses_init" = xyes; then :
-  as_fn_append WARN_CFLAGS " -Wjump-misses-init"
-fi
-
-
+    wantwarn="$wantwarn -Wjump-misses-init"
 
     # GNULIB turns on -Wformat=2 which implies -Wformat-nonliteral,
     # so we need to manually re-exclude it.  Also, older gcc 4.2
     # added an implied ATTRIBUTE_NONNULL on any parameter marked
     # ATTRIBUTE_FMT_PRINT, which causes -Wformat failure on our
     # intentional use of virReportError(code, NULL).
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler handles -Wno-format-nonliteral" >&5
-$as_echo_n "checking whether C compiler handles -Wno-format-nonliteral... " >&6; }
-if ${gl_cv_warn_c__Wno_format_nonliteral+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-  gl_save_compiler_FLAGS="$CFLAGS"
-  as_fn_append CFLAGS " $gl_unknown_warnings_are_errors -Wno-format-nonliteral"
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  gl_cv_warn_c__Wno_format_nonliteral=yes
-else
-  gl_cv_warn_c__Wno_format_nonliteral=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  CFLAGS="$gl_save_compiler_FLAGS"
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_warn_c__Wno_format_nonliteral" >&5
-$as_echo "$gl_cv_warn_c__Wno_format_nonliteral" >&6; }
-if test "x$gl_cv_warn_c__Wno_format_nonliteral" = xyes; then :
-  as_fn_append WARN_CFLAGS " -Wno-format-nonliteral"
-fi
-
-
+    wantwarn="$wantwarn -Wno-format-nonliteral"
     if test $lv_cv_gcc_wformat_null_works = no; then
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler handles -Wno-format" >&5
-$as_echo_n "checking whether C compiler handles -Wno-format... " >&6; }
-if ${gl_cv_warn_c__Wno_format+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-  gl_save_compiler_FLAGS="$CFLAGS"
-  as_fn_append CFLAGS " $gl_unknown_warnings_are_errors -Wno-format"
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  gl_cv_warn_c__Wno_format=yes
-else
-  gl_cv_warn_c__Wno_format=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  CFLAGS="$gl_save_compiler_FLAGS"
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_warn_c__Wno_format" >&5
-$as_echo "$gl_cv_warn_c__Wno_format" >&6; }
-if test "x$gl_cv_warn_c__Wno_format" = xyes; then :
-  as_fn_append WARN_CFLAGS " -Wno-format"
-fi
-
-
+      wantwarn="$wantwarn -Wno-format"
     fi
 
     # This should be < 256 really. Currently we're down to 4096,
     # but using 1024 bytes sized buffers (mostly for virStrerror)
     # stops us from going down further
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler handles -Wframe-larger-than=4096" >&5
-$as_echo_n "checking whether C compiler handles -Wframe-larger-than=4096... " >&6; }
-if ${gl_cv_warn_c__Wframe_larger_than_4096+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-  gl_save_compiler_FLAGS="$CFLAGS"
-  as_fn_append CFLAGS " $gl_unknown_warnings_are_errors -Wframe-larger-than=4096"
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  gl_cv_warn_c__Wframe_larger_than_4096=yes
-else
-  gl_cv_warn_c__Wframe_larger_than_4096=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  CFLAGS="$gl_save_compiler_FLAGS"
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_warn_c__Wframe_larger_than_4096" >&5
-$as_echo "$gl_cv_warn_c__Wframe_larger_than_4096" >&6; }
-if test "x$gl_cv_warn_c__Wframe_larger_than_4096" = xyes; then :
-  as_fn_append WARN_CFLAGS " -Wframe-larger-than=4096"
-fi
-
-
-
-    # Silence certain warnings in gnulib, and use improved glibc headers
-
-$as_echo "#define lint 1" >>confdefs.h
-
-
+    wantwarn="$wantwarn -Wframe-larger-than=4096"
 
     # Extra special flags
             case $host in
        *-*-linux*)
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler handles -fstack-protector-all" >&5
-$as_echo_n "checking whether C compiler handles -fstack-protector-all... " >&6; }
-if ${gl_cv_warn_c__fstack_protector_all+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-  gl_save_compiler_FLAGS="$CFLAGS"
-  as_fn_append CFLAGS " $gl_unknown_warnings_are_errors -fstack-protector-all"
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  gl_cv_warn_c__fstack_protector_all=yes
-else
-  gl_cv_warn_c__fstack_protector_all=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  CFLAGS="$gl_save_compiler_FLAGS"
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_warn_c__fstack_protector_all" >&5
-$as_echo "$gl_cv_warn_c__fstack_protector_all" >&6; }
-if test "x$gl_cv_warn_c__fstack_protector_all" = xyes; then :
-  as_fn_append WARN_CFLAGS " -fstack-protector-all"
-fi
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler handles --param=ssp-buffer-size=4" >&5
-$as_echo_n "checking whether C compiler handles --param=ssp-buffer-size=4... " >&6; }
-if ${gl_cv_warn_c___param_ssp_buffer_size_4+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-  gl_save_compiler_FLAGS="$CFLAGS"
-  as_fn_append CFLAGS " $gl_unknown_warnings_are_errors --param=ssp-buffer-size=4"
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  gl_cv_warn_c___param_ssp_buffer_size_4=yes
-else
-  gl_cv_warn_c___param_ssp_buffer_size_4=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  CFLAGS="$gl_save_compiler_FLAGS"
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_warn_c___param_ssp_buffer_size_4" >&5
-$as_echo "$gl_cv_warn_c___param_ssp_buffer_size_4" >&6; }
-if test "x$gl_cv_warn_c___param_ssp_buffer_size_4" = xyes; then :
-  as_fn_append WARN_CFLAGS " --param=ssp-buffer-size=4"
-fi
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler handles -Wno-unused-command-line-argument" >&5
-$as_echo_n "checking whether C compiler handles -Wno-unused-command-line-argument... " >&6; }
-if ${gl_cv_warn_c__Wno_unused_command_line_argument+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-  gl_save_compiler_FLAGS="$CFLAGS"
-  as_fn_append CFLAGS " $gl_unknown_warnings_are_errors -Wno-unused-command-line-argument"
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  gl_cv_warn_c__Wno_unused_command_line_argument=yes
-else
-  gl_cv_warn_c__Wno_unused_command_line_argument=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  CFLAGS="$gl_save_compiler_FLAGS"
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_warn_c__Wno_unused_command_line_argument" >&5
-$as_echo "$gl_cv_warn_c__Wno_unused_command_line_argument" >&6; }
-if test "x$gl_cv_warn_c__Wno_unused_command_line_argument" = xyes; then :
-  as_fn_append WARN_CFLAGS " -Wno-unused-command-line-argument"
-fi
-
-
+                            wantwarn="$wantwarn -fstack-protector-all"
+       wantwarn="$wantwarn --param=ssp-buffer-size=4"
+                                                 wantwarn="$wantwarn -Wno-unused-command-line-argument"
        ;;
        *-*-freebsd*)
+                     wantwarn="$wantwarn -fstack-protector"
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler handles -fstack-protector" >&5
-$as_echo_n "checking whether C compiler handles -fstack-protector... " >&6; }
-if ${gl_cv_warn_c__fstack_protector+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-  gl_save_compiler_FLAGS="$CFLAGS"
-  as_fn_append CFLAGS " $gl_unknown_warnings_are_errors -fstack-protector"
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  gl_cv_warn_c__fstack_protector=yes
-else
-  gl_cv_warn_c__fstack_protector=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  CFLAGS="$gl_save_compiler_FLAGS"
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_warn_c__fstack_protector" >&5
-$as_echo "$gl_cv_warn_c__fstack_protector" >&6; }
-if test "x$gl_cv_warn_c__fstack_protector" = xyes; then :
-  as_fn_append WARN_CFLAGS " -fstack-protector"
-fi
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler handles -Wno-unused-command-line-argument" >&5
-$as_echo_n "checking whether C compiler handles -Wno-unused-command-line-argument... " >&6; }
-if ${gl_cv_warn_c__Wno_unused_command_line_argument+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-  gl_save_compiler_FLAGS="$CFLAGS"
-  as_fn_append CFLAGS " $gl_unknown_warnings_are_errors -Wno-unused-command-line-argument"
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  gl_cv_warn_c__Wno_unused_command_line_argument=yes
-else
-  gl_cv_warn_c__Wno_unused_command_line_argument=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  CFLAGS="$gl_save_compiler_FLAGS"
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_warn_c__Wno_unused_command_line_argument" >&5
-$as_echo "$gl_cv_warn_c__Wno_unused_command_line_argument" >&6; }
-if test "x$gl_cv_warn_c__Wno_unused_command_line_argument" = xyes; then :
-  as_fn_append WARN_CFLAGS " -Wno-unused-command-line-argument"
-fi
-
-
+       wantwarn="$wantwarn -Wno-unused-command-line-argument"
        ;;
     esac
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler handles -fexceptions" >&5
-$as_echo_n "checking whether C compiler handles -fexceptions... " >&6; }
-if ${gl_cv_warn_c__fexceptions+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-  gl_save_compiler_FLAGS="$CFLAGS"
-  as_fn_append CFLAGS " $gl_unknown_warnings_are_errors -fexceptions"
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  gl_cv_warn_c__fexceptions=yes
-else
-  gl_cv_warn_c__fexceptions=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  CFLAGS="$gl_save_compiler_FLAGS"
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_warn_c__fexceptions" >&5
-$as_echo "$gl_cv_warn_c__fexceptions" >&6; }
-if test "x$gl_cv_warn_c__fexceptions" = xyes; then :
-  as_fn_append WARN_CFLAGS " -fexceptions"
-fi
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler handles -fasynchronous-unwind-tables" >&5
-$as_echo_n "checking whether C compiler handles -fasynchronous-unwind-tables... " >&6; }
-if ${gl_cv_warn_c__fasynchronous_unwind_tables+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-  gl_save_compiler_FLAGS="$CFLAGS"
-  as_fn_append CFLAGS " $gl_unknown_warnings_are_errors -fasynchronous-unwind-tables"
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  gl_cv_warn_c__fasynchronous_unwind_tables=yes
-else
-  gl_cv_warn_c__fasynchronous_unwind_tables=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  CFLAGS="$gl_save_compiler_FLAGS"
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_warn_c__fasynchronous_unwind_tables" >&5
-$as_echo "$gl_cv_warn_c__fasynchronous_unwind_tables" >&6; }
-if test "x$gl_cv_warn_c__fasynchronous_unwind_tables" = xyes; then :
-  as_fn_append WARN_CFLAGS " -fasynchronous-unwind-tables"
-fi
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler handles -fdiagnostics-show-option" >&5
-$as_echo_n "checking whether C compiler handles -fdiagnostics-show-option... " >&6; }
-if ${gl_cv_warn_c__fdiagnostics_show_option+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-  gl_save_compiler_FLAGS="$CFLAGS"
-  as_fn_append CFLAGS " $gl_unknown_warnings_are_errors -fdiagnostics-show-option"
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  gl_cv_warn_c__fdiagnostics_show_option=yes
-else
-  gl_cv_warn_c__fdiagnostics_show_option=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  CFLAGS="$gl_save_compiler_FLAGS"
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_warn_c__fdiagnostics_show_option" >&5
-$as_echo "$gl_cv_warn_c__fdiagnostics_show_option" >&6; }
-if test "x$gl_cv_warn_c__fdiagnostics_show_option" = xyes; then :
-  as_fn_append WARN_CFLAGS " -fdiagnostics-show-option"
-fi
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler handles -funit-at-a-time" >&5
-$as_echo_n "checking whether C compiler handles -funit-at-a-time... " >&6; }
-if ${gl_cv_warn_c__funit_at_a_time+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-  gl_save_compiler_FLAGS="$CFLAGS"
-  as_fn_append CFLAGS " $gl_unknown_warnings_are_errors -funit-at-a-time"
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  gl_cv_warn_c__funit_at_a_time=yes
-else
-  gl_cv_warn_c__funit_at_a_time=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  CFLAGS="$gl_save_compiler_FLAGS"
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_warn_c__funit_at_a_time" >&5
-$as_echo "$gl_cv_warn_c__funit_at_a_time" >&6; }
-if test "x$gl_cv_warn_c__funit_at_a_time" = xyes; then :
-  as_fn_append WARN_CFLAGS " -funit-at-a-time"
-fi
-
-
+    wantwarn="$wantwarn -fexceptions"
+    wantwarn="$wantwarn -fasynchronous-unwind-tables"
+    wantwarn="$wantwarn -fdiagnostics-show-option"
+    wantwarn="$wantwarn -funit-at-a-time"
 
     # Need -fipa-pure-const in order to make -Wsuggest-attribute=pure
     # fire even without -O.
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler handles -fipa-pure-const" >&5
-$as_echo_n "checking whether C compiler handles -fipa-pure-const... " >&6; }
-if ${gl_cv_warn_c__fipa_pure_const+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-  gl_save_compiler_FLAGS="$CFLAGS"
-  as_fn_append CFLAGS " $gl_unknown_warnings_are_errors -fipa-pure-const"
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  gl_cv_warn_c__fipa_pure_const=yes
-else
-  gl_cv_warn_c__fipa_pure_const=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  CFLAGS="$gl_save_compiler_FLAGS"
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_warn_c__fipa_pure_const" >&5
-$as_echo "$gl_cv_warn_c__fipa_pure_const" >&6; }
-if test "x$gl_cv_warn_c__fipa_pure_const" = xyes; then :
-  as_fn_append WARN_CFLAGS " -fipa-pure-const"
-fi
-
-
+    wantwarn="$wantwarn -fipa-pure-const"
     # We should eventually enable this, but right now there are at
     # least 75 functions triggering warnings.
+    wantwarn="$wantwarn -Wno-suggest-attribute=pure"
+    wantwarn="$wantwarn -Wno-suggest-attribute=const"
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler handles -Wno-suggest-attribute=pure" >&5
-$as_echo_n "checking whether C compiler handles -Wno-suggest-attribute=pure... " >&6; }
-if ${gl_cv_warn_c__Wno_suggest_attribute_pure+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-  gl_save_compiler_FLAGS="$CFLAGS"
-  as_fn_append CFLAGS " $gl_unknown_warnings_are_errors -Wno-suggest-attribute=pure"
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  gl_cv_warn_c__Wno_suggest_attribute_pure=yes
-else
-  gl_cv_warn_c__Wno_suggest_attribute_pure=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  CFLAGS="$gl_save_compiler_FLAGS"
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_warn_c__Wno_suggest_attribute_pure" >&5
-$as_echo "$gl_cv_warn_c__Wno_suggest_attribute_pure" >&6; }
-if test "x$gl_cv_warn_c__Wno_suggest_attribute_pure" = xyes; then :
-  as_fn_append WARN_CFLAGS " -Wno-suggest-attribute=pure"
-fi
-
+    if test "$set_werror" = "yes"
+    then
+      wantwarn="$wantwarn -Werror"
+    fi
 
+    # Check for $CC support of each warning
+    for w in $wantwarn; do
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler handles -Wno-suggest-attribute=const" >&5
-$as_echo_n "checking whether C compiler handles -Wno-suggest-attribute=const... " >&6; }
-if ${gl_cv_warn_c__Wno_suggest_attribute_const+:} false; then :
+as_gl_Warn=`$as_echo "gl_cv_warn_c_$w" | $as_tr_sh`
+gl_positive="$w"
+case $gl_positive in
+  -Wno-*) gl_positive=-W`expr "X$gl_positive" : 'X-Wno-\(.*\)'` ;;
+esac
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler handles $w" >&5
+$as_echo_n "checking whether C compiler handles $w... " >&6; }
+if eval \${$as_gl_Warn+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
   gl_save_compiler_FLAGS="$CFLAGS"
-  as_fn_append CFLAGS " $gl_unknown_warnings_are_errors -Wno-suggest-attribute=const"
+  as_fn_append CFLAGS " $gl_unknown_warnings_are_errors $gl_positive"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -56126,61 +55544,29 @@ main ()
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
-  gl_cv_warn_c__Wno_suggest_attribute_const=yes
+  eval "$as_gl_Warn=yes"
 else
-  gl_cv_warn_c__Wno_suggest_attribute_const=no
+  eval "$as_gl_Warn=no"
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   CFLAGS="$gl_save_compiler_FLAGS"
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_warn_c__Wno_suggest_attribute_const" >&5
-$as_echo "$gl_cv_warn_c__Wno_suggest_attribute_const" >&6; }
-if test "x$gl_cv_warn_c__Wno_suggest_attribute_const" = xyes; then :
-  as_fn_append WARN_CFLAGS " -Wno-suggest-attribute=const"
+eval ac_res=\$$as_gl_Warn
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if eval test \"x\$"$as_gl_Warn"\" = x"yes"; then :
+  as_fn_append WARN_CFLAGS " $w"
 fi
 
 
+    done
 
-    if test "$set_werror" = "yes"
-    then
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler handles -Werror" >&5
-$as_echo_n "checking whether C compiler handles -Werror... " >&6; }
-if ${gl_cv_warn_c__Werror+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-  gl_save_compiler_FLAGS="$CFLAGS"
-  as_fn_append CFLAGS " $gl_unknown_warnings_are_errors -Werror"
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  gl_cv_warn_c__Werror=yes
-else
-  gl_cv_warn_c__Werror=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  CFLAGS="$gl_save_compiler_FLAGS"
+    # Silence certain warnings in gnulib, and use improved glibc headers
 
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_warn_c__Werror" >&5
-$as_echo "$gl_cv_warn_c__Werror" >&6; }
-if test "x$gl_cv_warn_c__Werror" = xyes; then :
-  as_fn_append WARN_CFLAGS " -Werror"
-fi
+$as_echo "#define lint 1" >>confdefs.h
 
 
-    fi
 
         save_WARN_CFLAGS=$WARN_CFLAGS
     WARN_CFLAGS=
@@ -56192,7 +55578,7 @@ if ${gl_cv_warn_c__Wno_redundant_decls+:} false; then :
 else
 
   gl_save_compiler_FLAGS="$CFLAGS"
-  as_fn_append CFLAGS " $gl_unknown_warnings_are_errors -Wno-redundant-decls"
+  as_fn_append CFLAGS " $gl_unknown_warnings_are_errors -Wredundant-decls"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -56285,16 +55671,33 @@ fi
 $as_echo_n "checking for how to force completely read-only GOT table... " >&6; }
 
     RELRO_LDFLAGS=
-    `$LD --help 2>&1 | grep -- "-z relro" >/dev/null` && \
-        RELRO_LDFLAGS="-Wl,-z -Wl,relro"
-    `$LD --help 2>&1 | grep -- "-z now" >/dev/null` && \
-        RELRO_LDFLAGS="$RELRO_LDFLAGS -Wl,-z -Wl,now"
+    ld_help=`$LD --help 2>&1`
+    case $ld_help in
+        *"-z relro"*) RELRO_LDFLAGS="-Wl,-z -Wl,relro" ;;
+    esac
+    case $ld_help in
+        *"-z now"*) RELRO_LDFLAGS="$RELRO_LDFLAGS -Wl,-z -Wl,now" ;;
+    esac
 
 
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RELRO_LDFLAGS" >&5
 $as_echo "$RELRO_LDFLAGS" >&6; }
 
 
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for how to avoid indirect lib deps" >&5
+$as_echo_n "checking for how to avoid indirect lib deps... " >&6; }
+
+    NO_INDIRECT_LDFLAGS=
+    case `$LD --help 2>&1` in
+        *"--no-copy-dt-needed-entries"*)
+		NO_INDIRECT_LDFLAGS="-Wl,--no-copy-dt-needed-entries" ;;
+    esac
+
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NO_INDIRECT_LDFLAGS" >&5
+$as_echo "$NO_INDIRECT_LDFLAGS" >&6; }
+
+
 
 
 
@@ -57017,7 +56420,7 @@ fi
   fi
 
   if test $fail = 1; then
-    as_fn_error $? "You must install the avahi-client >= 0.6.0pkg-config module to compile libvirt" "$LINENO" 5
+    as_fn_error $? "You must install the avahi-client >= 0.6.0 pkg-config module to compile libvirt" "$LINENO" 5
   fi
 
   if test "x$with_avahi" = "xyes" ; then
@@ -57163,7 +56566,7 @@ fi
   fi
 
   if test $fail = 1; then
-    as_fn_error $? "You must install the blkid >= 2.17pkg-config module to compile libvirt" "$LINENO" 5
+    as_fn_error $? "You must install the blkid >= 2.17 pkg-config module to compile libvirt" "$LINENO" 5
   fi
 
   if test "x$with_blkid" = "xyes" ; then
@@ -57465,7 +56868,7 @@ fi
   fi
 
   if test $fail = 1; then
-    as_fn_error $? "You must install the libcurl >= 7.18.0pkg-config module to compile libvirt" "$LINENO" 5
+    as_fn_error $? "You must install the libcurl >= 7.18.0 pkg-config module to compile libvirt" "$LINENO" 5
   fi
 
   if test "x$with_curl" = "xyes" ; then
@@ -57619,7 +57022,7 @@ fi
   fi
 
   if test $fail = 1; then
-    as_fn_error $? "You must install the dbus-1 >= 1.0.0pkg-config module to compile libvirt" "$LINENO" 5
+    as_fn_error $? "You must install the dbus-1 >= 1.0.0 pkg-config module to compile libvirt" "$LINENO" 5
   fi
 
   if test "x$with_dbus" = "xyes" ; then
@@ -57785,7 +57188,7 @@ fi
   fi
 
   if test $fail = 1; then
-    as_fn_error $? "You must install the fuse >= 2.8.6pkg-config module to compile libvirt" "$LINENO" 5
+    as_fn_error $? "You must install the fuse >= 2.8.6 pkg-config module to compile libvirt" "$LINENO" 5
   fi
 
   if test "x$with_fuse" = "xyes" ; then
@@ -57931,7 +57334,7 @@ fi
   fi
 
   if test $fail = 1; then
-    as_fn_error $? "You must install the hal >= 0.5.0pkg-config module to compile libvirt" "$LINENO" 5
+    as_fn_error $? "You must install the hal >= 0.5.0 pkg-config module to compile libvirt" "$LINENO" 5
   fi
 
   if test "x$with_hal" = "xyes" ; then
@@ -58077,7 +57480,7 @@ fi
   fi
 
   if test $fail = 1; then
-    as_fn_error $? "You must install the netcf >= 0.1.4pkg-config module to compile libvirt" "$LINENO" 5
+    as_fn_error $? "You must install the netcf >= 0.1.4 pkg-config module to compile libvirt" "$LINENO" 5
   fi
 
   if test "x$with_netcf" = "xyes" ; then
@@ -58402,7 +57805,7 @@ fi
   fi
 
   if test $fail = 1; then
-    as_fn_error $? "You must install the openwsman >= 2.2.3pkg-config module to compile libvirt" "$LINENO" 5
+    as_fn_error $? "You must install the openwsman >= 2.2.3 pkg-config module to compile libvirt" "$LINENO" 5
   fi
 
   if test "x$with_openwsman" = "xyes" ; then
@@ -58548,7 +57951,7 @@ fi
   fi
 
   if test $fail = 1; then
-    as_fn_error $? "You must install the pciaccess >= 0.10.0pkg-config module to compile libvirt" "$LINENO" 5
+    as_fn_error $? "You must install the pciaccess >= 0.10.0 pkg-config module to compile libvirt" "$LINENO" 5
   fi
 
   if test "x$with_pciaccess" = "xyes" ; then
@@ -59421,7 +58824,7 @@ fi
   fi
 
   if test $fail = 1; then
-    as_fn_error $? "You must install the libssh2 >= 1.3pkg-config module to compile libvirt" "$LINENO" 5
+    as_fn_error $? "You must install the libssh2 >= 1.3 pkg-config module to compile libvirt" "$LINENO" 5
   fi
 
   if test "x$with_ssh2" = "xyes" ; then
@@ -59568,7 +58971,7 @@ fi
   fi
 
   if test $fail = 1; then
-    as_fn_error $? "You must install the libudev >= 145pkg-config module to compile libvirt" "$LINENO" 5
+    as_fn_error $? "You must install the libudev >= 145 pkg-config module to compile libvirt" "$LINENO" 5
   fi
 
   if test "x$with_udev" = "xyes" ; then
@@ -60066,6 +59469,11 @@ _ACEOF
 
 
 
+
+
+
+
+
   :
 
 
@@ -60127,6 +59535,9 @@ _ACEOF
 
 
 
+
+
+
 old_LIBS=$LIBS
 LIBS="$LIBS $LIB_PTHREAD $LIBMULTITHREAD"
 for ac_func in pthread_mutexattr_init
@@ -60144,8 +59555,8 @@ LIBS=$old_libs
 
 for ac_header in pwd.h paths.h regex.h sys/un.h \
   sys/poll.h syslog.h mntent.h net/ethernet.h linux/magic.h \
-  sys/un.h sys/syscall.h netinet/tcp.h ifaddrs.h libtasn1.h \
-  sys/ucred.h sys/mount.h
+  sys/un.h sys/syscall.h sys/sysctl.h netinet/tcp.h ifaddrs.h \
+  libtasn1.h sys/ucred.h sys/mount.h
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
@@ -60970,6 +60381,8 @@ if test "$prefix" = "/usr" && test "$sysconfdir" = '${prefix}/etc' ; then
     sysconfdir='/etc'
 fi
 
+want_ifconfig=no
+
 
 with_linux=no with_osx=no with_freebsd=no
 case $host in
@@ -60987,6 +60400,8 @@ if test $with_linux = no; then
 fi
 
 if test $with_freebsd = yes; then
+   want_ifconfig=yes
+
    with_firewalld=no
 fi
 
@@ -62421,7 +61836,17 @@ if test "$with_linux" = "yes"; then
     for ac_header in linux/param.h linux/sockios.h linux/if_bridge.h linux/if_tun.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 <netinet/in.h>
+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "/* The kernel folks broke their headers when used with particular
+         * glibc versions; although the structs are ABI compatible, the
+         * C type system doesn't like struct redefinitions.  We work around
+         * the problem here in the same manner as in virnetdevbridge.c.  */
+        #include <netinet/in.h>
+        #define in6_addr in6_addr_
+        #define sockaddr_in6 sockaddr_in6_
+        #define ipv6_mreq ipv6_mreq_
+        #define in6addr_any in6addr_any_
+        #define in6addr_loopback in6addr_loopback_
+        #include <linux/in6.h>
 
 "
 if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
@@ -62711,7 +62136,15 @@ if test "x$with_gnutls" != "xno"; then
   LIBS="$LIBS $GNUTLS_LIBS"
 
   GNUTLS_FOUND=no
+  GNUTLS_GCRYPT=unknown
   if test -x "$PKG_CONFIG" ; then
+                    if $PKG_CONFIG --exists 'gnutls >= 3.0'; then
+      GNUTLS_GCRYPT=no
+    elif $PKG_CONFIG --exists 'gnutls >= 2.12'; then
+      GNUTLS_GCRYPT=probe
+    else
+      GNUTLS_GCRYPT=yes
+    fi
 
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNUTLS" >&5
@@ -62785,7 +62218,8 @@ $as_echo "yes" >&6; }
 fi
   fi
   if test "$GNUTLS_FOUND" = "no"; then
-    fail=0
+        fail=0
+    GNUTLS_GCRYPT=yes
     ac_fn_c_check_header_mongrel "$LINENO" "gnutls/gnutls.h" "ac_cv_header_gnutls_gnutls_h" "$ac_includes_default"
 if test "x$ac_cv_header_gnutls_gnutls_h" = xyes; then :
 
@@ -62855,9 +62289,22 @@ fi
       as_fn_error $? "You must install the GnuTLS library in order to compile and run libvirt" "$LINENO" 5
     fi
   else
-            GNUTLS_LIBS="$GNUTLS_LIBS -lgcrypt"
+        if test "$GNUTLS_GCRYPT" = probe; then
+      case `$PKG_CONFIG --libs --static gnutls` in
+        *gcrypt*) GNUTLS_GCRYPT=yes     ;;
+        *nettle*) GNUTLS_GCRYPT=no      ;;
+        *)        GNUTLS_GCRYPT=unknown ;;
+      esac
+    fi
+    if test "$GNUTLS_GCRYPT" = yes || test "$GNUTLS_GCRYPT" = unknown; then
+      GNUTLS_LIBS="$GNUTLS_LIBS -lgcrypt"
+                  GNUTLS_CFLAGS="$GNUTLS_CFLAGS -DGCRYPT_NO_DEPRECATED"
 
-            GNUTLS_CFLAGS="$GNUTLS_CFLAGS -DGCRYPT_NO_DEPRECATED"
+cat >>confdefs.h <<_ACEOF
+#define WITH_GNUTLS_GCRYPT 1
+_ACEOF
+
+    fi
 
         for ac_header in gnutls/crypto.h
 do :
@@ -66023,6 +65470,36 @@ else
 fi
 
 
+# Check whether --enable-expensive-tests was given.
+if test "${enable_expensive_tests+set}" = set; then :
+  enableval=$enable_expensive_tests; case $enableval in
+    0|no) VIR_TEST_EXPENSIVE_DEFAULT=0 ;;
+    1|yes) VIR_TEST_EXPENSIVE_DEFAULT=1 ;;
+    check) ;;
+    *) as_fn_error $? "bad value ${enableval} for enable-expensive-tests option" "$LINENO" 5
+      ;;
+  esac
+else
+  enableval=check
+fi
+
+if test "$enableval" = check; then
+  if test -d $srcdir/.git ; then
+    VIR_TEST_EXPENSIVE_DEFAULT=0
+  else
+    VIR_TEST_EXPENSIVE_DEFAULT=1
+  fi
+fi
+
+ if test $VIR_TEST_EXPENSIVE_DEFAULT = 1; then
+  WITH_EXPENSIVE_TESTS_TRUE=
+  WITH_EXPENSIVE_TESTS_FALSE='#'
+else
+  WITH_EXPENSIVE_TESTS_TRUE='#'
+  WITH_EXPENSIVE_TESTS_FALSE=
+fi
+
+
 # Check whether --enable-test-coverage was given.
 if test "${enable_test_coverage+set}" = set; then :
   enableval=$enable_test_coverage; case "${enableval}" in
@@ -68841,6 +68318,58 @@ $as_echo "#define HAVE_BSD_BRIDGE_MGMT 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.
+set dummy ifconfig; 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_IFCONFIG_PATH+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $IFCONFIG_PATH in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_IFCONFIG_PATH="$IFCONFIG_PATH" # 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_IFCONFIG_PATH="$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
+IFCONFIG_PATH=$ac_cv_path_IFCONFIG_PATH
+if test -n "$IFCONFIG_PATH"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IFCONFIG_PATH" >&5
+$as_echo "$IFCONFIG_PATH" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+     if test -z "$IFCONFIG_PATH"; then
+         as_fn_error $? "Failed to find ifconfig." "$LINENO" 5
+     fi
+
+cat >>confdefs.h <<_ACEOF
+#define IFCONFIG_PATH "$IFCONFIG_PATH"
+_ACEOF
+
+fi
+
 # Detect when running under the clang static analyzer's scan-build driver
 # or Coverity-prevent's cov-build.  Define STATIC_ANALYSIS accordingly.
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether this build is done by a static analysis tool" >&5
@@ -68885,7 +68414,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 python/Makefile python/tests/Makefile daemon/Makefile tools/Makefile tests/Makefile examples/apparmor/Makefile examples/domain-events/events-c/Makefile examples/domsuspend/Makefile examples/dominfo/Makefile examples/openauth/Makefile examples/python/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 python/Makefile daemon/Makefile tools/Makefile tests/Makefile examples/apparmor/Makefile examples/domain-events/events-c/Makefile examples/domsuspend/Makefile examples/dominfo/Makefile examples/openauth/Makefile examples/python/Makefile examples/hellolibvirt/Makefile examples/systemtap/Makefile examples/xml/nwfilter/Makefile"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -69443,6 +68972,10 @@ if test -z "${WITH_TESTS_TRUE}" && test -z "${WITH_TESTS_FALSE}"; then
   as_fn_error $? "conditional \"WITH_TESTS\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${WITH_EXPENSIVE_TESTS_TRUE}" && test -z "${WITH_EXPENSIVE_TESTS_FALSE}"; then
+  as_fn_error $? "conditional \"WITH_EXPENSIVE_TESTS\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${WITH_CIL_TRUE}" && test -z "${WITH_CIL_FALSE}"; then
   as_fn_error $? "conditional \"WITH_CIL\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -69880,7 +69413,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.1.1, which was
+This file was extended by libvirt $as_me 1.1.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -69951,7 +69484,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.1.1
+libvirt config.status 1.1.2
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -70387,7 +69920,6 @@ do
     "include/libvirt/Makefile") CONFIG_FILES="$CONFIG_FILES include/libvirt/Makefile" ;;
     "include/libvirt/libvirt.h") CONFIG_FILES="$CONFIG_FILES include/libvirt/libvirt.h" ;;
     "python/Makefile") CONFIG_FILES="$CONFIG_FILES python/Makefile" ;;
-    "python/tests/Makefile") CONFIG_FILES="$CONFIG_FILES python/tests/Makefile" ;;
     "daemon/Makefile") CONFIG_FILES="$CONFIG_FILES daemon/Makefile" ;;
     "tools/Makefile") CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;;
     "tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;;