aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.objs1
-rwxr-xr-xconfigure22
2 files changed, 16 insertions, 7 deletions
diff --git a/Makefile.objs b/Makefile.objs
index 7a9828da28..c968a9aedd 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -104,6 +104,7 @@ common-obj-$(CONFIG_WIN32) += os-win32.o
common-obj-$(CONFIG_POSIX) += os-posix.o
common-obj-$(CONFIG_LINUX) += fsdev/
+common-obj-$(CONFIG_DARWIN) += fsdev/
common-obj-y += migration/
diff --git a/configure b/configure
index db97930314..ff2a54c585 100755
--- a/configure
+++ b/configure
@@ -5636,16 +5636,28 @@ if test "$want_tools" = "yes" ; then
fi
fi
if test "$softmmu" = yes ; then
- if test "$linux" = yes; then
- if test "$virtfs" != no && test "$cap" = yes && test "$attr" = yes ; then
+ if test "$virtfs" != no; then
+ if test "$linux" = yes; then
+ if test "$cap" = yes && test "$attr" = yes ; then
+ virtfs=yes
+ tools="$tools fsdev/virtfs-proxy-helper\$(EXESUF)"
+ else
+ if test "$virtfs" = yes; then
+ error_exit "VirtFS requires libcap devel and libattr devel under Linux"
+ fi
+ virtfs=no
+ fi
+ elif test "$darwin" = yes; then
virtfs=yes
tools="$tools fsdev/virtfs-proxy-helper\$(EXESUF)"
else
if test "$virtfs" = yes; then
- error_exit "VirtFS requires libcap devel and libattr devel"
+ error_exit "VirtFS is supported only on Linux and Darwin"
fi
virtfs=no
fi
+ fi
+ if test "$linux" = yes; then
if test "$mpath" != no && test "$mpathpersist" = yes ; then
mpath=yes
else
@@ -5656,10 +5668,6 @@ if test "$softmmu" = yes ; then
fi
tools="$tools scsi/qemu-pr-helper\$(EXESUF)"
else
- if test "$virtfs" = yes; then
- error_exit "VirtFS is supported only on Linux"
- fi
- virtfs=no
if test "$mpath" = yes; then
error_exit "Multipath is supported only on Linux"
fi