shaba/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-25 10:03:49 +03:00
Code Releases Activity

configure: disable network and storage-fs drivers on mac os x

Browse Source 
Disabling these two drivers on MacOS X, where they are known to
not work, allows libvirt (including the daemon) to compile without
any further changes.
This commit is contained in:
Justin Clift 2010-10-05 12:31:05 +11:00
parent 2e224f197c
commit 577ad920d7
1 changed files with 31 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
configure.ac
View File

@ -182,22 +182,29 @@ if test "$prefix" = "/usr" && test "$sysconfdir" = '${prefix}/etc' ; then
sysconfdir='/etc' sysconfdir='/etc'
fi fi
dnl lxc and qemu drivers require linux headers dnl Make some notes about which OS we're compiling for, as the lxc and qemu
case "$host" in dnl drivers require linux headers, while storage_mpath and nwfilter are also
*-*-linux*) dnl linux specific. The "network" and storage_fs drivers are known to not
# match linux here so the *) case will match anything non-linux dnl work on MacOS X presently, so we also make a note if compiling for that
;;
*) with_linux=no with_osx=no
if test "x$with_lxc" != "xyes" case $host in
*-*-linux*) with_linux=yes ;;
*-*-darwin*) with_osx=yes ;;
esac
if test $with_linux = no; then
if test "x$with_lxc" != xyes
then then
with_lxc=no with_lxc=no
fi fi
if test "x$with_qemu" != "xyes" if test "x$with_qemu" != xyes
then then
with_qemu=no with_qemu=no
fi fi
;; fi
esac
AM_CONDITIONAL([WITH_LINUX], [test "$with_linux" = "yes"])
dnl Allow to build without Xen, QEMU/KVM, test or remote driver dnl Allow to build without Xen, QEMU/KVM, test or remote driver
AC_ARG_WITH([xen], AC_ARG_WITH([xen],
@ -1306,12 +1313,18 @@ fi
AC_SUBST([READLINE_CFLAGS]) AC_SUBST([READLINE_CFLAGS])
AC_SUBST([VIRSH_LIBS]) AC_SUBST([VIRSH_LIBS])
dnl check if the network driver should be compiled
AC_ARG_WITH([network], AC_ARG_WITH([network],
AC_HELP_STRING([--with-network], [with virtual network driver @<:@default=yes@:>@]),[],[with_network=yes]) AC_HELP_STRING([--with-network], [with virtual network driver @<:@default=yes@:>@]),[],[with_network=yes])
if test "$with_libvirtd" = "no" ; then
dnl there's no use compiling the network driver without the libvirt
dnl daemon, nor compiling it for MacOS X, where it breaks the compile
if test "$with_libvirtd" = "no" || test "$with_osx" = "yes"; then
with_network=no with_network=no
fi fi
if test "$with_network" = "yes" ; then if test "$with_network" = "yes" ; then
AC_DEFINE_UNQUOTED([WITH_NETWORK], 1, [whether network driver is enabled]) AC_DEFINE_UNQUOTED([WITH_NETWORK], 1, [whether network driver is enabled])
fi fi
@ -1389,6 +1402,11 @@ if test "$with_storage_dir" = "yes" ; then
fi fi
AM_CONDITIONAL([WITH_STORAGE_DIR], [test "$with_storage_dir" = "yes"]) AM_CONDITIONAL([WITH_STORAGE_DIR], [test "$with_storage_dir" = "yes"])
dnl storage-fs does not work on MacOS X
if test "$with_osx" = "yes"; then
with_storage_fs=no
fi
if test "$with_storage_fs" = "yes" || test "$with_storage_fs" = "check"; then if test "$with_storage_fs" = "yes" || test "$with_storage_fs" = "check"; then
AC_PATH_PROG([MOUNT], [mount], [], [$PATH:/sbin:/usr/sbin]) AC_PATH_PROG([MOUNT], [mount], [], [$PATH:/sbin:/usr/sbin])
@ -1503,14 +1521,6 @@ if test "$with_storage_scsi" = "check"; then
fi fi
AM_CONDITIONAL([WITH_STORAGE_SCSI], [test "$with_storage_scsi" = "yes"]) AM_CONDITIONAL([WITH_STORAGE_SCSI], [test "$with_storage_scsi" = "yes"])
with_linux=no
case "$host" in
*-*-linux*)
with_linux=yes
;;
esac
AM_CONDITIONAL([WITH_LINUX], [test "$with_linux" = "yes"])
if test "$with_storage_mpath" = "check" && test "$with_linux" = "yes"; then if test "$with_storage_mpath" = "check" && test "$with_linux" = "yes"; then
with_storage_mpath=yes with_storage_mpath=yes
@ -2030,6 +2040,8 @@ then
fi fi
AM_CONDITIONAL([WITH_NODE_DEVICES], [test "$with_nodedev" = "yes"]) AM_CONDITIONAL([WITH_NODE_DEVICES], [test "$with_nodedev" = "yes"])
dnl nwfilter should only be compiled for linux, and only if the
dnl libvirt daemon is also being compiled
with_nwfilter=yes with_nwfilter=yes
if test "$with_libvirtd" = "no" || test "$with_linux" != "yes"; then if test "$with_libvirtd" = "no" || test "$with_linux" != "yes"; then
@ -2040,7 +2052,6 @@ if test "$with_nwfilter" = "yes" ; then
fi fi
AM_CONDITIONAL([WITH_NWFILTER], [test "$with_nwfilter" = "yes"]) AM_CONDITIONAL([WITH_NWFILTER], [test "$with_nwfilter" = "yes"])
AC_ARG_WITH([qemu-user], AC_ARG_WITH([qemu-user],
AC_HELP_STRING([--with-qemu-user], [username to run QEMU system instance as @<:@default=root@:>@]), AC_HELP_STRING([--with-qemu-user], [username to run QEMU system instance as @<:@default=root@:>@]),
[QEMU_USER=${withval}], [QEMU_USER=${withval}],