From: Maximilian Wilhelm Date: Wed, 5 Aug 2009 08:47:18 +0000 (+0200) Subject: Configure UML support only if sys/inotify.h present X-Git-Tag: v0.7.0~14 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=16928a161b19ea4c8ff480268041e7e18bf00050;p=thirdparty%2Flibvirt.git Configure UML support only if sys/inotify.h present * configure.in: UML support requires sys/inotify.h so make it check by default. --- diff --git a/configure.in b/configure.in index 284a1c6a5b..0cab6275c6 100644 --- a/configure.in +++ b/configure.in @@ -184,7 +184,7 @@ AC_ARG_WITH([xen-inotify], AC_ARG_WITH([qemu], [ --with-qemu add QEMU/KVM support (on)],[],[with_qemu=yes]) AC_ARG_WITH([uml], -[ --with-uml add UML support (on)],[],[with_uml=yes]) +[ --with-uml add UML support (on)],[],[with_uml=check]) AC_ARG_WITH([openvz], [ --with-openvz add OpenVZ support (on)],[],[with_openvz=yes]) AC_ARG_WITH([libssh], @@ -780,6 +780,29 @@ AM_CONDITIONAL([HAVE_NUMACTL], [test "$with_numactl" != "no"]) AC_SUBST([NUMACTL_CFLAGS]) AC_SUBST([NUMACTL_LIBS]) + +dnl +dnl Checks for the UML driver +dnl + +if test "$with_uml" = "yes" -o "$with_uml" = "check"; then + AC_CHECK_HEADER([sys/inotify.h], [ + with_uml=yes + ], [ + if test "$with_uml" = "check"; then + with_uml=no + AC_MSG_NOTICE([ is required for the UML driver, disabling it]) + else + AC_MSG_ERROR([The is required for the UML driver. Upgrade your libc6.]) + fi + ]) +fi + + +dnl +dnl libssh checks +dnl + if test "$with_libssh" != "yes" -a "$with_libssh" != "no"; then libssh_path="$with_libssh" elif test "$with_libssh" = "yes"; then