gvfs r1814 - trunk

[gicmo svn gnome org]

Author: gicmo
Date: Tue Jul  1 14:16:31 2008
New Revision: 1814
URL: http://svn.gnome.org/viewvc/gvfs?rev=1814&view=rev

Log:
Correctly check the right libhal for hal features

        * configure.ac: Correctly check the right libhal for hal features.
        Patch from Andreas Rottmann <a rottmann gmx at> (#537149)


Modified:
   trunk/ChangeLog
   trunk/configure.ac

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Tue Jul  1 14:16:31 2008
@@ -214,10 +214,13 @@
   if test "x$msg_hal" == "xyes"; then
     PKG_CHECK_MODULES([HAL],[hal >= $HAL_REQUIRED])
     AC_DEFINE(HAVE_HAL, 1, [Define to 1 if HAL is available])
+    save_libs="$LIBS"
+    LIBS="$HAL_LIBS"
     AC_CHECK_LIB(hal, libhal_get_all_devices_with_properties, have_hal_fast_init=yes)
     if test "x$have_hal_fast_init" == "xyes"; then
       AC_DEFINE(HAVE_HAL_FAST_INIT, 1, [Define to 1 if libhal_get_all_devices_with_properties is available])
     fi
+    LIBS="$save_libs"
   fi
 fi