Changeset 14989 in vbox

Timestamp:

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

Author:

vboxsync

Message:

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

Location:

trunk

Files:

• Config.kmk (modified) (3 diffs)
• configure (modified) (7 diffs)

trunk/Config.kmk

@@ -302 +302 @@
 # Enable Pulse support for Linux
 VBOX_WITH_PULSE = 1
-# Enable statically linked libhal support for Linux
+# Enable statically linked dbus support for Linux
 ifeq ($(KBUILD_TARGET),linux)
-# VBOX_WITH_LIBHAL = 1
+# VBOX_WITH_DBUS = 1
 endif
 # Disable WINMM support for Windows (not implemented)
@@ -366 +366 @@
 # Temporary switch for enabling / disabling the new USB code on Darwin.
 VBOX_WITH_NEW_USB_CODE_ON_DARWIN=1
-# Enable the hal/sysfs USB code on Linux.  This depends on VBOX_WITH_LIBHAL.
-ifdef VBOX_WITH_LIBHAL
+# Enable the hal/sysfs USB code on Linux.  This depends on VBOX_WITH_DBUS.
+ifdef VBOX_WITH_DBUS
 # VBOX_USB_WITH_SYSFS=1
 endif
@@ -1339 +1339 @@
 VBOX_LIBPATH32_X11 ?= /usr/X11R6/lib32 /usr/X11R6/lib
 
-# libhal settings for Linux
+# dbus settings for Linux
 ifeq ($(KBUILD_TARGET),linux)
- ifdef VBOX_WITH_LIBHAL
-  VBOX_LIBHAL_CFLAGS := $(shell pkg-config hal --cflags)
-  VBOX_LIBHAL_CXXFLAGS := $(VBOX_LIBHAL_CFLAGS)
-  VBOX_LIBHAL_LDFLAGS := $(shell pkg-config hal --libs)
+ ifdef VBOX_WITH_DBUS
+  VBOX_DBUS_CFLAGS := $(shell pkg-config dbus-1 --cflags)
+  VBOX_DBUS_CXXFLAGS := $(VBOX_DBUS_CFLAGS)
+  VBOX_DBUS_LDFLAGS := $(shell pkg-config dbus-1 --libs)
  endif
 endif

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