Changeset 28746 in vbox

Timestamp:

Apr 26, 2010 11:30:36 AM (15 years ago)

Author:

vboxsync

Message:

configure: --disable-fam

File:

• trunk/configure (modified) (5 diffs)

trunk/configure

@@ -92 +92 @@
 WITH_HARDENING=1
 WITH_VDE=0
+WITH_FAM=1
 BUILD_LIBXML2=
 BUILD_LIBXSLT=
@@ -2086 +2087 @@
 [ $WITH_PULSE   -eq 1 ] && echo "  --disable-pulse          disable the PulseAudio backend"
 [ $WITH_DBUS    -eq 1 ] && echo "  --disable-dbus           don't use DBus and hal for hardware detection"
+[ $OSE -eq 0 -a $WITH_FAM -eq 1 ] && echo "  --disable-fam            don't use FAM for USB polling"
 [ $WITH_KMODS   -eq 1 ] && echo "  --disable-kmods          don't build Linux kernel modules (host and guest)"
 [ $WITH_OPENGL  -eq 1 ] && echo "  --disable-opengl         disable OpenGL support"
@@ -2094 +2096 @@
   --build-libxml2          build libxml2 from sources
   --build-libxslt          build libxslt from sources
-  --build-libssl           build openssl from sources (PUEL only)
-  --build-libcurl          build libcurl from sources (PUEL only)
+EOF
+[ $OSE -eq 0 ] && cat << EOF
+  --build-libssl           build openssl from sources
+  --build-libcurl          build libcurl from sources
 EOF
 [ "$OS"   != "darwin" ] && echo "  --setup-wine             setup a Wine directory and register the hhc hack"
@@ -2238 +2242 @@
     --disable-dbus)
       [ $WITH_DBUS -eq 1 ] && WITH_DBUS=0
+      ;;
+    --disable-fam)
+      [ $WITH_FAM -eq 1 ] && WITH_FAM=0
       ;;
     --disable-kmods)
@@ -2441 +2448 @@
 [ "$OS" != "darwin" -a "$OS" != "freebsd" ] && check_png
 [ $OSE -eq 0 -a "$OS" = "linux" ] && check_pam
-[ $OSE -eq 0 -a "$OS" = "linux" ] && check_fam
+if [ $WITH_FAM -eq 1 ]; then
+  [ $OSE -eq 0 -a "$OS" = "linux" ] && check_fam
+else
+  cnf_append "VBOX_USB_WITH_FAM" ""
+fi
 [ $WITH_SDL -eq 1 ]    && check_sdl
 [ $WITH_SDL_TTF -eq 1 -a $OSE -eq 0 ] && check_sdl_ttf