[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE_3_4_BRANCH: kdebase/kioslave/media
From:       Jérôme Lodewyck <jerome.lodewyck () normalesup ! org>
Date:       2005-03-30 21:26:00
Message-ID: 20050330212600.265DF4A6 () office ! kde ! org
[Download RAW message or body]

CVS commit by lodewyck: 

Backport of Coolo's patch completion about halDrive check

configure.in.in check for HAL 0.4 : KDE 3.4 does not compile with HAL 0.5


  M +11 -2     configure.in.in   1.7.2.1
  M +2 -0      kdedmodule/halbackend.cpp   1.7.2.2


--- kdebase/kioslave/media/configure.in.in  #1.7:1.7.2.1
@@ -14,7 +14,7 @@
 if test "x$hal_test" = "xyes" ; then
   
-########### Check for the HAL
+########### Check for the HAL, version 0.4.x
   
-  AC_MSG_CHECKING(for the HAL)
+  AC_MSG_CHECKING(for the HAL 0.4)
   
   hal_inc=NOTFOUND
@@ -38,4 +38,13 @@
   fi
   
+  if test -r $hal_incdir/libhal.h ; then
+    hal_version=5
+    grep LibHalFunctions $hal_incdir/libhal.h \
+    > /dev/null 2>&1 && hal_version=4
+    if test $hal_version = 5 ; then
+      hal_lib=NOT_FOUND
+    fi
+  fi
+                                
   
   if [test $hal_inc = FOUND] && [test $hal_lib = FOUND] ; then

--- kdebase/kioslave/media/kdedmodule/halbackend.cpp  #1.7.2.1:1.7.2.2
@@ -386,4 +386,6 @@ void HALBackend::setFloppyProperties(Med
 
         HalDrive*  halDrive  = hal_drive_from_udi(m_halContext, udi);
+        if (!halDrive)
+                return;
         int numVolumes;
         char** volumes = hal_drive_find_all_volumes(m_halContext, halDrive, &numVolumes);


[prev in list] [next in list] [prev in thread] [next in thread]