aboutsummaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorMarc-André Lureau <marcandre.lureau@redhat.com>2019-07-15 15:04:49 +0400
committerPaolo Bonzini <pbonzini@redhat.com>2020-08-21 06:30:13 -0400
commitec0d5893da20a5f35dcbd901d98be24346bf9cc2 (patch)
treea3054fbb1ede92b8aa4325c1a499c22bf6c4e921 /configure
parent157e7b13b93e7fc5440093486932a69ef0ecfdee (diff)
meson: add virtfs-proxy-helper
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure7
1 files changed, 5 insertions, 2 deletions
diff --git a/configure b/configure
index 013ebed9ff..5e5923dfd6 100755
--- a/configure
+++ b/configure
@@ -4388,6 +4388,7 @@ fi
##########################################
# attr probe
+libattr_libs=
if test "$attr" != "no" ; then
cat > $TMPC <<EOF
#include <stdio.h>
@@ -4404,7 +4405,8 @@ EOF
# Older distros have <attr/xattr.h>, and need -lattr:
elif compile_prog "-DCONFIG_LIBATTR" "-lattr" ; then
attr=yes
- LIBS="-lattr $LIBS"
+ libattr_libs="-lattr"
+ LIBS="$libattr_libs $LIBS"
libattr=yes
else
if test "$attr" = "yes" ; then
@@ -6716,6 +6718,7 @@ if [ "$eventfd" = "yes" ]; then
fi
tools=""
+helpers=""
if test "$want_tools" = "yes" ; then
tools="qemu-img\$(EXESUF) qemu-io\$(EXESUF) $tools"
if [ "$linux" = "yes" -o "$bsd" = "yes" -o "$solaris" = "yes" ] ; then
@@ -6726,7 +6729,6 @@ if test "$softmmu" = yes ; then
if test "$linux" = yes; then
if test "$virtfs" != no && test "$cap_ng" = yes && test "$attr" = yes ; then
virtfs=yes
- helpers="$helpers fsdev/virtfs-proxy-helper\$(EXESUF)"
else
if test "$virtfs" = yes; then
error_exit "VirtFS requires libcap-ng devel and libattr devel"
@@ -7308,6 +7310,7 @@ if test "$linux_io_uring" = "yes" ; then
fi
if test "$attr" = "yes" ; then
echo "CONFIG_ATTR=y" >> $config_host_mak
+ echo "LIBATTR_LIBS=$libattr_libs" >> $config_host_mak
fi
if test "$libattr" = "yes" ; then
echo "CONFIG_LIBATTR=y" >> $config_host_mak