hal ChangeLog,1.762,1.763 configure.in,1.113,1.114

[Kay Sievers]

Update of /cvs/hal/hal
In directory gabe:/tmp/cvs-serv12064

Modified Files:
	ChangeLog configure.in 
Log Message:
2006-01-21  Kay Sievers  <kay.sievers at vrfy.org>

        Remove hotplug helper and depend on udev passing events over
        a socket.

        * configure.in:
        * hald/linux2/osspec.c: (osspec_init):
        * tools/linux/.cvsignore:
        * tools/linux/90-hal.rules:
        * tools/linux/Makefile.am:
        * tools/linux/hal_hotplug.c:



Index: ChangeLog
===================================================================
RCS file: /cvs/hal/hal/ChangeLog,v
retrieving revision 1.762
retrieving revision 1.763
diff -u -d -r1.762 -r1.763
--- ChangeLog	21 Jan 2006 19:08:26 -0000	1.762
+++ ChangeLog	21 Jan 2006 19:39:58 -0000	1.763
@@ -1,3 +1,15 @@
+2006-01-21  Kay Sievers  <kay.sievers at vrfy.org>
+
+	Remove hotplug helper and depend on udev passing events over
+	a socket.
+
+	* configure.in:
+	* hald/linux2/osspec.c: (osspec_init):
+	* tools/linux/.cvsignore:
+	* tools/linux/90-hal.rules:
+	* tools/linux/Makefile.am:
+	* tools/linux/hal_hotplug.c:
+
 2006-01-21  David Zeuthen  <davidz at redhat.com>
 
 	* hald/property.c (hal_property_to_string): Ugh, make this work on

Index: configure.in
===================================================================
RCS file: /cvs/hal/hal/configure.in,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -d -r1.113 -r1.114
--- configure.in	21 Jan 2006 17:59:46 -0000	1.113
+++ configure.in	21 Jan 2006 19:39:58 -0000	1.114
@@ -345,8 +345,6 @@
 
 
 
-
-
 AS_AC_EXPAND(LOCALSTATEDIR, $localstatedir)
 AS_AC_EXPAND(SYSCONFDIR, $sysconfdir)
 AS_AC_EXPAND(DATADIR, $datadir)
@@ -367,19 +365,6 @@
 AC_DEFINE_UNQUOTED(DBUS_SYSTEMD_DIR, "$DBUS_SYS_DIR", [Where system.d dir for DBUS is])
 
 
-AC_ARG_WITH(hotplug-dir, [  --with-hotplug=<dir>    where hotplug.d directory is])
-
-if ! test -z "$with_hotplug" ; then
-    LINUX_HOTPLUG_DIR="$with_hotplug"
-else
-#    LINUX_HOTPLUG_DIR="$SYSCONFDIR/hotplug.d"
-# It's quite uncommon to have hotplug.d other places than this, so default
-# to it
-    LINUX_HOTPLUG_DIR=/etc/hotplug.d
-fi
-AC_SUBST(LINUX_HOTPLUG_DIR)
-AC_DEFINE_UNQUOTED(LINUX_HOTPLUG_DIR, "$LINUX_HOTPLUG_DIR", [where hotplug.d directory is])
-
 #### Check our operating system (distro-tweaks required)
 operating_system=unknown
 if test -f /etc/redhat-release || test -f SYSCONFDIR/redhat-release ; then
@@ -526,8 +511,7 @@
         docdir:                   ${DOCDIR}
         dbus-1 system.d dir:      ${DBUS_SYS_DIR}
         pci.ids, usb.ids dir:     ${HWDATA_DIR}
-        linux hotplug.d dir:      ${LINUX_HOTPLUG_DIR}
-      
+
         compiler:                 ${CC}
         cflags:                   ${CFLAGS}
         cppflags:                 ${CPPFLAGS}
@@ -571,6 +555,6 @@
 echo "NOTE: For development, use run-hald.sh and debug-hald.sh scripts in hald/ to "
 echo "      use programs (callouts, probers, addons) and device information files "
 echo "      from build directories."
-echo "      (You still need 'make install' to set up hotplug.d agent)"
+echo "      (You may still need 'make install' to install the udev rule to receive events)"
 echo