HAL mini-patch

[Martin Waitz]

hi :)

> More patches would be great.
of course :) -- some small patches are below

>  http://freedesktop.org/Software/HalBuildInstructions
> >From the current CVS, skip all steps involving the hal-sysfs-agent;
> that's built into the HAL daemon to simplify things.
are you gonna update this in the wiki or should i ask for write-acces
to the hal pages?

here they come...

--- configure.in        14 Dec 2003 21:22:43 -0000      1.5
+++ configure.in        18 Dec 2003 22:27:43 -0000
@@ -13,6 +13,7 @@ AM_PROG_CC_STDC
 AC_HEADER_STDC
 AM_PROG_LIBTOOL
 AC_PROG_MAKE_SET
+AM_PATH_PYTHON
 
 AC_ARG_WITH(dbus-sys, [  --with-dbus-sys=<dir>   where D-BUS system.d directory is (default is /etc/dbus-1/system.d)])
 
@@ -123,7 +124,7 @@ fi
 
 
 
-pkg_modules="glib-2.0 >= 2.2.2, dbus-glib-1 >= 0.11"
+pkg_modules="glib-2.0 >= 2.2.2, dbus-glib-1 >= 0.20"
 PKG_CHECK_MODULES(PACKAGE, [$pkg_modules])
 
 AC_ARG_WITH(expat, [  --with-expat=<dir>      Use expat from here],


- we'll want to install the python tools later, and need automake
  support for that.
- bump dbus dependency, well ok, waiting for a working version
  to be released, but anyway


Index: hald/Makefile.am
===================================================================
RCS file: /cvs/hal/hal/hald/Makefile.am,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile.am
--- hald/Makefile.am    14 Dec 2003 21:22:43 -0000      1.3
+++ hald/Makefile.am    18 Dec 2003 22:27:44 -0000
@@ -6,7 +6,7 @@ INCLUDES = \
        -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
        @PACKAGE_CFLAGS@
 
-bin_PROGRAMS = hald
+sbin_PROGRAMS = hald
 
 hald_SOURCES =                                                          \
                                         main.c                          \


i guess the deamon should live in sbin...




Index: hald/linux/linux_class_input.c
===================================================================
RCS file: /cvs/hal/hal/hald/linux/linux_class_input.c,v
retrieving revision 1.1
diff -u -p -r1.1 linux_class_input.c
--- hald/linux/linux_class_input.c	14 Dec 2003 21:22:43 -0000	1.1
+++ hald/linux/linux_class_input.c	18 Dec 2003 22:35:49 -0000
@@ -440,8 +440,10 @@ static void process_input_proc_info(inpu
                                  i->evbit&(1<<EV_FF));
     ds_property_set_bool(d, "input.misc", 
                                  i->evbit&(1<<EV_MSC));
+#ifdef EV_RST
     ds_property_set_bool(d, "input.rst", 
                                  i->evbit&(1<<EV_RST));
+#endif
     
     if( i->evbit&(1<<EV_LED) )
     {


well, i can't find EV_RST on my system...
not sure what to do with it

Index: tools/linux/Makefile.am
===================================================================
RCS file: /cvs/hal/hal/tools/linux/Makefile.am,v
retrieving revision 1.1
diff -u -p -r1.1 Makefile.am
--- tools/linux/Makefile.am	14 Dec 2003 21:22:43 -0000	1.1
+++ tools/linux/Makefile.am	18 Dec 2003 22:35:49 -0000
@@ -6,7 +6,7 @@ INCLUDES = \
 	-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
 	@PACKAGE_CFLAGS@
 
-bin_PROGRAMS = hal.hotplug
+libexec_PROGRAMS = hal.hotplug
 
 hal_hotplug_SOURCES = hal_hotplug.c
 

no user/admin should ever need to execute this, so put it
in libexec (which means /usr/lib/hal/ here for debian)


i'm not yet familiar with python and am investigation how
to correctly install lshal and the device manager

-- 
CU,		  / Friedrich-Alexander University Erlangen, Germany
Martin Waitz	//  Department of Computer Science 3       _________
______________/// - - - - - - - - - - - - - - - - - - - - ///
dies ist eine manuell generierte mail, sie beinhaltet    //
tippfehler und ist auch ohne grossbuchstaben gueltig.   /
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
Url : http://lists.freedesktop.org/archives/xdg/attachments/20031218/33626008/attachment.pgp