New upstream version 1.0.1~rc1

1 files changed, 202 insertions, 25 deletions

diff --git a/configure b/configure
index 181bed5c9..a988804f6 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.68 for libvirt 1.0.0.
+# Generated by GNU Autoconf 2.68 for libvirt 1.0.1.
 #
 # Report bugs to <libvir-list@redhat.com>.
 #
@@ -570,8 +570,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='libvirt'
 PACKAGE_TARNAME='libvirt'
-PACKAGE_VERSION='1.0.0'
-PACKAGE_STRING='libvirt 1.0.0'
+PACKAGE_VERSION='1.0.1'
+PACKAGE_STRING='libvirt 1.0.1'
 PACKAGE_BUGREPORT='libvir-list@redhat.com'
 PACKAGE_URL='http://libvirt.org'
 
@@ -779,6 +779,10 @@ WITH_NETWORK_FALSE
 WITH_NETWORK_TRUE
 VIRSH_LIBS
 READLINE_CFLAGS
+HAVE_FUSE_FALSE
+HAVE_FUSE_TRUE
+FUSE_LIBS
+FUSE_CFLAGS
 CAPNG_LIBS
 CAPNG_CFLAGS
 HAVE_CAPNG_FALSE
@@ -2289,6 +2293,7 @@ with_numactl
 with_numad
 with_libpcap
 with_capng
+with_fuse
 with_network
 with_netcf
 with_secrets
@@ -2343,6 +2348,8 @@ AVAHI_CFLAGS
 AVAHI_LIBS
 LIBSSH2_CFLAGS
 LIBSSH2_LIBS
+FUSE_CFLAGS
+FUSE_LIBS
 NETCF_CFLAGS
 NETCF_LIBS
 LIBPARTED_CFLAGS
@@ -2908,7 +2915,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.0.0 to adapt to many kinds of systems.
+\`configure' configures libvirt 1.0.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -2978,7 +2985,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of libvirt 1.0.0:";;
+     short | recursive ) echo "Configuration of libvirt 1.0.1:";;
    esac
   cat <<\_ACEOF
 
@@ -3091,6 +3098,8 @@ Optional Packages:
   --with-libpcap=[PFX]    libpcap location
   --with-capng            use libcap-ng to reduce libvirtd privileges
                           [default=check]
+  --with-fuse             use libfuse to proivde fuse filesystem support for
+                          libvirt lxc
   --with-network          with virtual network driver [default=yes]
   --with-netcf            libnetcf support to configure physical host network
                           interfaces [default=check]
@@ -3164,6 +3173,8 @@ Some influential environment variables:
               C compiler flags for LIBSSH2, overriding pkg-config
   LIBSSH2_LIBS
               linker flags for LIBSSH2, overriding pkg-config
+  FUSE_CFLAGS C compiler flags for FUSE, overriding pkg-config
+  FUSE_LIBS   linker flags for FUSE, overriding pkg-config
   NETCF_CFLAGS
               C compiler flags for NETCF, overriding pkg-config
   NETCF_LIBS  linker flags for NETCF, overriding pkg-config
@@ -3270,7 +3281,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-libvirt configure 1.0.0
+libvirt configure 1.0.1
 generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -3974,7 +3985,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.0.0, which was
+It was created by libvirt $as_me 1.0.1, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
@@ -4914,7 +4925,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='libvirt'
- VERSION='1.0.0'
+ VERSION='1.0.1'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -5285,6 +5296,7 @@ LIBSSH2_REQUIRED="1.0"
 LIBSSH2_TRANSPORT_REQUIRED="1.3"
 LIBBLKID_REQUIRED="2.17"
 DBUS_REQUIRED="1.0.0"
+FUSE_REQUIRED="2.8.6"
 
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -57577,15 +57589,13 @@ if test "$with_libxl" != "no" ; then
     fi
     CFLAGS="$CFLAGS $LIBXL_CFLAGS"
     LIBS="$LIBS $LIBXL_LIBS"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxl_domain_create_new in -lxenlight" >&5
-$as_echo_n "checking for libxl_domain_create_new in -lxenlight... " >&6; }
-if ${ac_cv_lib_xenlight_libxl_domain_create_new+:} false; then :
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxl_ctx_alloc in -lxenlight" >&5
+$as_echo_n "checking for libxl_ctx_alloc in -lxenlight... " >&6; }
+if ${ac_cv_lib_xenlight_libxl_ctx_alloc+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lxenlight
-        -lxenstore -lxenctrl -lxenguest -luuid -lutil -lblktapctl
-     $LIBS"
+LIBS="-lxenlight  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -57595,30 +57605,30 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 #ifdef __cplusplus
 extern "C"
 #endif
-char libxl_domain_create_new ();
+char libxl_ctx_alloc ();
 int
 main ()
 {
-return libxl_domain_create_new ();
+return libxl_ctx_alloc ();
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_xenlight_libxl_domain_create_new=yes
+  ac_cv_lib_xenlight_libxl_ctx_alloc=yes
 else
-  ac_cv_lib_xenlight_libxl_domain_create_new=no
+  ac_cv_lib_xenlight_libxl_ctx_alloc=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_xenlight_libxl_domain_create_new" >&5
-$as_echo "$ac_cv_lib_xenlight_libxl_domain_create_new" >&6; }
-if test "x$ac_cv_lib_xenlight_libxl_domain_create_new" = xyes; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_xenlight_libxl_ctx_alloc" >&5
+$as_echo "$ac_cv_lib_xenlight_libxl_ctx_alloc" >&6; }
+if test "x$ac_cv_lib_xenlight_libxl_ctx_alloc" = xyes; then :
 
         with_libxl=yes
-        LIBXL_LIBS="$LIBXL_LIBS -lxenlight -lxenstore -lxenctrl -lxenguest -luuid -lutil -lblktapctl"
+        LIBXL_LIBS="$LIBXL_LIBS -lxenlight"
 
 else
 
@@ -57635,7 +57645,7 @@ LIBS="$old_LIBS"
 CFLAGS="$old_CFLAGS"
 
 if test $fail = 1; then
-    as_fn_error $? "You must install the libxl Library to compile libxenlight driver with -lxl" "$LINENO" 5
+    as_fn_error $? "You must install the libxl Library from Xen >= 4.2 to compile libxenlight driver with -lxl" "$LINENO" 5
 fi
 
 if test "$with_libxl" = "yes"; then
@@ -58950,6 +58960,56 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 
     fi
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sanlock_inq_lockspace in -lsanlock_client" >&5
+$as_echo_n "checking for sanlock_inq_lockspace in -lsanlock_client... " >&6; }
+if ${ac_cv_lib_sanlock_client_sanlock_inq_lockspace+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lsanlock_client  $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 sanlock_inq_lockspace ();
+int
+main ()
+{
+return sanlock_inq_lockspace ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_sanlock_client_sanlock_inq_lockspace=yes
+else
+  ac_cv_lib_sanlock_client_sanlock_inq_lockspace=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_sanlock_client_sanlock_inq_lockspace" >&5
+$as_echo "$ac_cv_lib_sanlock_client_sanlock_inq_lockspace" >&6; }
+if test "x$ac_cv_lib_sanlock_client_sanlock_inq_lockspace" = xyes; then :
+  sanlock_inq_lockspace=yes
+else
+  sanlock_inq_lockspace=no
+fi
+
+    if test "x$sanlock_inq_lockspace" = "xyes" ; then
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_SANLOCK_INQ_LOCKSPACE 1
+_ACEOF
+
+    fi
   fi
 fi
  if test "x$with_sanlock" = "xyes"; then
@@ -61073,6 +61133,112 @@ fi
 
 
 
+# Check whether --with-fuse was given.
+if test "${with_fuse+set}" = set; then :
+  withval=$with_fuse;
+else
+  with_fuse=check
+fi
+
+if test "x$with_fuse" != "xno"; then :
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for FUSE" >&5
+$as_echo_n "checking for FUSE... " >&6; }
+
+if test -n "$FUSE_CFLAGS"; then
+    pkg_cv_FUSE_CFLAGS="$FUSE_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"fuse >= \$FUSE_REQUIRED\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "fuse >= $FUSE_REQUIRED") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_FUSE_CFLAGS=`$PKG_CONFIG --cflags "fuse >= $FUSE_REQUIRED" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$FUSE_LIBS"; then
+    pkg_cv_FUSE_LIBS="$FUSE_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"fuse >= \$FUSE_REQUIRED\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "fuse >= $FUSE_REQUIRED") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_FUSE_LIBS=`$PKG_CONFIG --libs "fuse >= $FUSE_REQUIRED" 2>/dev/null`
+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
+	        FUSE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "fuse >= $FUSE_REQUIRED" 2>&1`
+        else
+	        FUSE_PKG_ERRORS=`$PKG_CONFIG --print-errors "fuse >= $FUSE_REQUIRED" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$FUSE_PKG_ERRORS" >&5
+
+	if test "x$with_fuse" = "xyes" ; then
+             as_fn_error $? "You must install fuse library to compile libvirt" "$LINENO" 5
+           else
+             with_fuse=no
+           fi
+
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	if test "x$with_fuse" = "xyes" ; then
+             as_fn_error $? "You must install fuse library to compile libvirt" "$LINENO" 5
+           else
+             with_fuse=no
+           fi
+
+else
+	FUSE_CFLAGS=$pkg_cv_FUSE_CFLAGS
+	FUSE_LIBS=$pkg_cv_FUSE_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+	with_fuse=yes
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_FUSE 1
+_ACEOF
+
+
+fi
+
+fi
+ if test "x$with_fuse" = "xyes"; then
+  HAVE_FUSE_TRUE=
+  HAVE_FUSE_FALSE='#'
+else
+  HAVE_FUSE_TRUE='#'
+  HAVE_FUSE_FALSE=
+fi
+
+
 for ac_header in readline/readline.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "readline/readline.h" "ac_cv_header_readline_readline_h" "$ac_includes_default"
@@ -67381,6 +67547,10 @@ if test -z "${HAVE_CAPNG_TRUE}" && test -z "${HAVE_CAPNG_FALSE}"; then
   as_fn_error $? "conditional \"HAVE_CAPNG\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${HAVE_FUSE_TRUE}" && test -z "${HAVE_FUSE_FALSE}"; then
+  as_fn_error $? "conditional \"HAVE_FUSE\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${WITH_NETWORK_TRUE}" && test -z "${WITH_NETWORK_FALSE}"; then
   as_fn_error $? "conditional \"WITH_NETWORK\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -67926,7 +68096,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.0.0, which was
+This file was extended by libvirt $as_me 1.0.1, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -67997,7 +68167,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.0.0
+libvirt config.status 1.0.1
 configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"
 
@@ -70165,6 +70335,13 @@ else
 { $as_echo "$as_me:${as_lineno-$LINENO}:    capng: no" >&5
 $as_echo "$as_me:    capng: no" >&6;}
 fi
+if test "$with_fuse" = "yes" ; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}:     fuse: $FUSE_CFLAGS $FUSE_LIBS" >&5
+$as_echo "$as_me:     fuse: $FUSE_CFLAGS $FUSE_LIBS" >&6;}
+else
+{ $as_echo "$as_me:${as_lineno-$LINENO}:     fuse: no" >&5
+$as_echo "$as_me:     fuse: no" >&6;}
+fi
 if test "$with_xen" = "yes" ; then
 { $as_echo "$as_me:${as_lineno-$LINENO}:      xen: $XEN_CFLAGS $XEN_LIBS" >&5
 $as_echo "$as_me:      xen: $XEN_CFLAGS $XEN_LIBS" >&6;}