[libvirt] [PATCH v7 1/6] add a configure option --with-fuse to prepare introduction of fuse support for libvirt lxc

[Richard W.M. Jones]

On Tue, Nov 06, 2012 at 02:07:17PM +0800, Gao feng wrote:
> add a configure option --with-fuse to prepare introduction
> of fuse support for libvirt lxc.
> 
> With help from Daniel and Richard.
> 
> Signed-off-by: Gao feng <gaofeng at cn.fujitsu.com>
> ---
>  configure.ac    |   29 +++++++++++++++++++++++++++++
>  libvirt.spec.in |    9 +++++++++
>  2 files changed, 38 insertions(+), 0 deletions(-)
> 
> diff --git a/configure.ac b/configure.ac
> index 9108ea8..495cbfa 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -115,6 +115,7 @@ LIBSSH2_REQUIRED="1.0"
>  LIBSSH2_TRANSPORT_REQUIRED="1.3"
>  LIBBLKID_REQUIRED="2.17"
>  DBUS_REQUIRED="1.0.0"
> +FUSE_REQUIRED="2.8.6"
>  
>  dnl Checks for C compiler.
>  AC_PROG_CC
> @@ -1859,6 +1860,29 @@ AC_SUBST([CAPNG_CFLAGS])
>  AC_SUBST([CAPNG_LIBS])
>  
>  
> +dnl libfuse
> +AC_ARG_WITH([fuse],
> +  AC_HELP_STRING([--with-fuse], [use libfuse to proivde fuse filesystem support for libvirt lxc]),
> +  [],
> +  [with_fuse=check])
> +dnl
> +dnl This check looks for 'fuse'
> +dnl
> +AS_IF([test "x$with_fuse" != "xno"],
> +        [PKG_CHECK_MODULES([FUSE], [fuse >= $FUSE_REQUIRED],
> +          [with_fuse=yes
> +           AC_SUBST([FUSE_CFLAGS])
> +           AC_SUBST([FUSE_LIBS])
> +           AC_DEFINE_UNQUOTED([HAVE_FUSE], 1, [whether fuse is available for libvirt lxc])
> +          ],
> +          [if test "x$with_fuse" = "xyes" ; then
> +             AC_MSG_ERROR([You must install fuse library to compile libvirt])
> +           else
> +             with_fuse=no
> +           fi
> +          ])
> +        ])
> +AM_CONDITIONAL([HAVE_FUSE], [test "x$with_fuse" = "xyes"])
>  
>  dnl virsh libraries
>  AC_CHECK_HEADERS([readline/readline.h])
> @@ -3163,6 +3187,11 @@ AC_MSG_NOTICE([   capng: $CAPNG_CFLAGS $CAPNG_LIBS])
>  else
>  AC_MSG_NOTICE([   capng: no])
>  fi
> +if test "$with_fuse" = "yes" ; then
> +AC_MSG_NOTICE([    fuse: $FUSE_CFLAGS $FUSE_LIBS])
> +else
> +AC_MSG_NOTICE([    fuse: no])
> +fi
>  if test "$with_xen" = "yes" ; then
>  AC_MSG_NOTICE([     xen: $XEN_CFLAGS $XEN_LIBS])
>  else
> diff --git a/libvirt.spec.in b/libvirt.spec.in
> index b6ded04..55408b6 100644
> --- a/libvirt.spec.in
> +++ b/libvirt.spec.in
> @@ -93,6 +93,7 @@
>  # A few optional bits off by default, we enable later
>  %define with_polkit        0%{!?_without_polkit:0}
>  %define with_capng         0%{!?_without_capng:0}
> +%define with_fuse          0%{!?_without_fuse:0}
>  %define with_netcf         0%{!?_without_netcf:0}
>  %define with_udev          0%{!?_without_udev:0}
>  %define with_hal           0%{!?_without_hal:0}
> @@ -503,6 +504,9 @@ BuildRequires: numactl-devel
>  %if %{with_capng}
>  BuildRequires: libcap-ng-devel >= 0.5.0
>  %endif
> +%if %{with_fuse}
> +BuildRequires: fuse-devel >= 2.8.6
> +%endif
>  %if %{with_phyp} || %{with_libssh2_transport}
>  %if %{with_libssh2_transport}
>  BuildRequires: libssh2-devel >= 1.3.0
> @@ -1186,6 +1190,10 @@ of recent versions of Linux (and other OSes).
>  %define _without_capng --without-capng
>  %endif
>  
> +%if ! %{with_fuse}
> +%define _without_fuse --without-fuse
> +%endif
> +
>  %if ! %{with_netcf}
>  %define _without_netcf --without-netcf
>  %endif
> @@ -1289,6 +1297,7 @@ autoreconf -if
>             %{?_without_numactl} \
>             %{?_without_numad} \
>             %{?_without_capng} \
> +           %{?_without_fuse} \
>             %{?_without_netcf} \
>             %{?_without_selinux} \
>             %{?_with_selinux_mount} \
> -- 
> 1.7.7.6

Look OK here, ACK.

Rich.

-- 
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones
virt-df lists disk usage of guests without needing to install any
software inside the virtual machine.  Supports Linux and Windows.
http://et.redhat.com/~rjones/virt-df/