Changeset 14989 in vbox for trunk/configure

Timestamp:

Dec 4, 2008 2:42:43 PM (16 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

40359

Message:

Config.kmk/configure: use libdbus-1 directly instead of libhal on Linux

File:

• trunk/configure (modified) (7 diffs)

trunk/configure

@@ -63 +63 @@
 WITH_ALSA=1
 WITH_PULSE=1
-WITH_LIBHAL=1
+WITH_DBUS=1
 WITH_KMODS=1
 WITH_HARDENING=1
@@ -93 +93 @@
 PKGCONFIG="`which_wrapper pkg-config`"
 if [ -n $PKGCONFIG ]; then
-  FLAGSHAL="`$PKGCONFIG hal --cflags 2>/dev/null`"
-  LIBDIRHAL="`$PKGCONFIG hal --libs-only-L 2>/dev/null`"
-  LIBHAL="`$PKGCONFIG hal --libs-only-l 2>/dev/null`"
+  FLAGSDBUS="`$PKGCONFIG dbus-1 --cflags 2>/dev/null`"
+  LIBDIRDBUS="`$PKGCONFIG dbus-1 --libs-only-L 2>/dev/null`"
+  LIBDBUS="`$PKGCONFIG dbus-1 --libs-only-l 2>/dev/null`"
 fi
 PYTHONDIR="/usr /usr/local"
@@ -1165 +1165 @@
 
 #
-# Check for libhal
-#
-check_libhal()
-{
-  test_header "libhal"
+# Check for DBus
+#
+check_dbus()
+{
+  test_header "DBus"
   cat > .tmp_src.cc << EOF
-#include <libhal.h>
+#include <dbus/dbus.h>
 extern "C" int main(void)
 {
@@ -1177 +1177 @@
 }
 EOF
-  if [ -n $PKGCONFIG ] && test_compile "$FLAGSHAL $LIBDIRHAL $LIBHAL" libhal libhal; then
+  if [ -n $PKGCONFIG ] && test_compile "$FLAGSDBUS $LIBDIRDBUS $LIBDBUS" DBus DBus; then
     log_success "found"
   fi
@@ -1786 +1786 @@
   --disable-alsa           disable the ALSA sound backend
   --disable-pulse          disable the PulseAudio backend
-  --disable-libhal         don't use hal for hardware detection
+  --disable-dbus           don't use DBus and hal for hardware detection
   --disable-kmods          don't build Linux kernel modules (host and guest)
   --disable-hardening      don't be strict about /dev/vboxdrv access
@@ -1886 +1886 @@
       WITH_PULSE=0
       ;;
-    --disable-libhal)
-      WITH_LIBHAL=0
+    --disable-dbus)
+      WITH_DBUS=0
       ;;
     --disable-kmods)
@@ -2085 +2085 @@
     cnf_append "VBOX_WITH_PULSE" ""
   fi
-  if [ $WITH_LIBHAL -eq 1 ]; then
-    check_libhal
+  if [ $WITH_DBUS -eq 1 ]; then
+    check_dbus
   else
-    cnf_append "VBOX_WITH_LIBHAL" ""
+    cnf_append "VBOX_WITH_DBUS" ""
   fi
   check_compiler_h