New upstream version 1.2.5

1 files changed, 97 insertions, 10 deletions

diff --git a/configure b/configure
index 458b81b1e..6af8f050c 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.4.
+# Generated by GNU Autoconf 2.69 for libvirt 1.2.5.
 #
 # 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.4'
-PACKAGE_STRING='libvirt 1.2.4'
+PACKAGE_VERSION='1.2.5'
+PACKAGE_STRING='libvirt 1.2.5'
 PACKAGE_BUGREPORT='libvir-list@redhat.com'
 PACKAGE_URL='http://libvirt.org'
 
@@ -3050,7 +3050,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.4 to adapt to many kinds of systems.
+\`configure' configures libvirt 1.2.5 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -3120,7 +3120,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of libvirt 1.2.4:";;
+     short | recursive ) echo "Configuration of libvirt 1.2.5:";;
    esac
   cat <<\_ACEOF
 
@@ -3439,7 +3439,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-libvirt configure 1.2.4
+libvirt configure 1.2.5
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -4148,7 +4148,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.4, which was
+It was created by libvirt $as_me 1.2.5, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -5140,7 +5140,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='libvirt'
- VERSION='1.2.4'
+ VERSION='1.2.5'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -58857,6 +58857,41 @@ fi
 
 
   if test "$with_selinux" = "yes"; then
+    # libselinux changed signatures between 2.2 and 2.3
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for selinux setcon parameter type" >&5
+$as_echo_n "checking for selinux setcon parameter type... " >&6; }
+if ${lv_cv_setcon_const+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <selinux/selinux.h>
+int setcon(char *context);
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  lv_cv_setcon_const=''
+else
+  lv_cv_setcon_const='const'
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lv_cv_setcon_const" >&5
+$as_echo "$lv_cv_setcon_const" >&6; }
+
+cat >>confdefs.h <<_ACEOF
+#define VIR_SELINUX_CTX_CONST $lv_cv_setcon_const
+_ACEOF
+
+
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking SELinux mount point" >&5
 $as_echo_n "checking SELinux mount point... " >&6; }
     if test "$with_selinux_mount" = "check" || test -z "$with_selinux_mount"; then
@@ -69135,6 +69170,58 @@ $as_echo "#define HAVE_BSD_CPU_AFFINITY 1" >>confdefs.h
 fi
 
 
+# Check for BSD kvm (kernel memory interface)
+if test $with_freebsd = yes; then
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for kvm_getprocs in -lkvm" >&5
+$as_echo_n "checking for kvm_getprocs in -lkvm... " >&6; }
+if ${ac_cv_lib_kvm_kvm_getprocs+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lkvm  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char kvm_getprocs ();
+int
+main ()
+{
+return kvm_getprocs ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_kvm_kvm_getprocs=yes
+else
+  ac_cv_lib_kvm_kvm_getprocs=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_kvm_kvm_getprocs" >&5
+$as_echo "$ac_cv_lib_kvm_kvm_getprocs" >&6; }
+if test "x$ac_cv_lib_kvm_kvm_getprocs" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBKVM 1
+_ACEOF
+
+  LIBS="-lkvm $LIBS"
+
+else
+  as_fn_error $? "BSD kernel memory interface library is required to build on FreeBSD" "$LINENO" 5
+
+fi
+
+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.
@@ -70254,7 +70341,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.4, which was
+This file was extended by libvirt $as_me 1.2.5, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -70325,7 +70412,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.4
+libvirt config.status 1.2.5
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"