Changeset 3934 in vbox for trunk/configure

Timestamp:

Jul 31, 2007 8:36:16 AM (17 years ago)

Author:

vboxsync

Message:

Switched to runtime detection and loading of dbus and libhal on Linux hosts (in Main)

File:

• trunk/configure (modified) (8 diffs)

trunk/configure

@@ -32 +32 @@
 WITH_QT=1
 WITH_SDL_TTF=1
-WITH_HAL=1
 CC="gcc"
 CC32=""
@@ -58 +57 @@
 INCPNG=""
 LIBPNG="-lpng"
-CFLAGSHAL="-I/usr/include/hal -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include"
-LIBPATHHAL=""
-LIBHAL="-lhal -ldbus-1"
 QTDIR="/usr/qt/3 /usr/lib/qt3 /usr/lib/qt-3.3 /usr/share/qt3 /usr/lib64/qt-3.3 /usr/X11R6"
 KBUILDDIR="`cd $(dirname $0); pwd`/kBuild"
@@ -1093 +1089 @@
 
 #
-# Check for the libhal library for obtaining hardware information on Linux
-#
-check_libhal()
-{
-  test_header libhal
-  pc_cflagshal=`pkg-config hal --cflags 2>/dev/null`
-  pc_libhal=`pkg-config hal --libs-only-l 2>/dev/null`
-  pc_libpathhal=`pkg-config hal --libs-only-L 2>/dev/null`
-  pc_verhal=`pkg-config hal --modversion 2>/dev/null`
-  if [ ! -z "$pc_cflagshal" ]; then # is this acceptable?
-    CFLAGSHAL=$pc_cflagshal
-    LIBPATHHAL=$pc_libpathhal
-    LIBHAL=$pc_libhal
-  fi
-  cat > .tmp_src.cc << EOF
-#include <cstdio>
-#include <libhal.h>
-extern "C" int main(void)
-{
-  DBusError dbusError;
-  dbus_error_init (&dbusError);
-  LibHalContext *halContext = libhal_ctx_new();
-  if (halContext != 0)
-  {
-      libhal_ctx_free(halContext);
-  }
-  return 0;
-}
-EOF
-  if test_compile "$CFLAGSHAL $LIBPATHHAL $LIBHAL" libhal libhal; then
-    log_success "found version $pc_verhal"
-    cnf_append "LIB_HAL_CFLAGS"   "$CFLAGSHAL"
-    cnf_append "LIB_HAL_LIBS"     "`strip_l "$LIBHAL"`"
-    cnf_append "LIB_HAL_LIBPATH"  "`strip_L "$LIBPATHHAL"`"
-    cnf_append "VBOX_WITH_LIBHAL" "1"
-  fi
-}
-
-
-#
 # Show help
 #
@@ -1146 +1102 @@
   --disable-sdl-ttf       disable SDL_ttf detection
   --build-xalan           build xalan & xerces from shipped sources
-  --without-hal           do not use libhal, even if it is available
 
 Paths:
@@ -1153 +1108 @@
   --with-kbuild=DIR       kbuild directory [$KBUILDDIR]
   --with-iasl=PATH        location of the iasl compiler [$IASL]
-  --with-hal-cflags=FLAGS cflags for libhal [$CFLAGSHAL]
-  --with-hal=LIB          location of the libhal libraries [$LIBHAL]
   --with-linux=DIR        Linux kernel source directory [$LINUX]
   --with-mkisofs=PATH     location of mkisofs [$MKISOFS]
@@ -1198 +1151 @@
       QTDIR=`echo $option | cut -d'=' -f2`
       ;;
-    --with-hal-dir=*)
-      INCHAL=`echo $option | cut -d'=' -f2`
-      ;;
-    --with-hal=*)
-      LIBHAL=`echo $option | cut -d'=' -f2`
-      ;;
     --with-iasl=*)
       IASL=`echo $option | cut -d'=' -f2`
@@ -1227 +1174 @@
     --disable-qt)
       WITH_QT=0
-      ;;
-    --without-hal)
-      WITH_HAL=0
       ;;
     --build-debug|-d)
@@ -1367 +1311 @@
   check_alsa
   check_compiler_h
-  [ "$WITH_HAL" = "1" ] && check_libhal
 fi