hal ChangeLog,1.367,1.368 configure.in,1.53,1.54

[David Zeuthen]

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

Modified Files:
	ChangeLog configure.in 
Log Message:
2004-10-26  David Zeuthen  <davidz at redhat.com>

	Patch from Dan Williams <dcbw at redhat.com> to add support for 
	integration with cardmgr.

	* configure.in: Add --enable-pcmcia-support and --with-stab-file
	options
	
	* hald/Makefile.am: Conditionally include linux/pcmcia_utils.c
	linux/pcmcia_utils.h linux/pcmcia_cs.h

	* hald/linux/net_class_device.c
	(net_class_pre_process): Check driver link and set net.linux.driver
	properties (me); add appropriate PCMCIA properties if applicable
	(net_class_accept): Only accept network devices with device links as
	well as PCMCIA devices
	(net_class_compute_udi): Fix a typo (me)
	
	* hald/linux/osspec.c
	(compute_coldplug_list): Accept network devices without device link
	
	* hald/linux/pcmcia_cs.h: New file

	* hald/linux/pcmcia_utils.c: New file
	
	* hald/linux/pcmcia_utils.h: New file



Index: ChangeLog
===================================================================
RCS file: /cvs/hal/hal/ChangeLog,v
retrieving revision 1.367
retrieving revision 1.368
diff -u -d -r1.367 -r1.368
--- ChangeLog	25 Oct 2004 16:32:10 -0000	1.367
+++ ChangeLog	26 Oct 2004 17:35:20 -0000	1.368
@@ -1,3 +1,30 @@
+2004-10-26  David Zeuthen  <davidz at redhat.com>
+
+	Patch from Dan Williams <dcbw at redhat.com> to add support for 
+	integration with cardmgr.
+
+	* configure.in: Add --enable-pcmcia-support and --with-stab-file
+	options
+	
+	* hald/Makefile.am: Conditionally include linux/pcmcia_utils.c
+	linux/pcmcia_utils.h linux/pcmcia_cs.h
+
+	* hald/linux/net_class_device.c
+	(net_class_pre_process): Check driver link and set net.linux.driver
+	properties (me); add appropriate PCMCIA properties if applicable
+	(net_class_accept): Only accept network devices with device links as
+	well as PCMCIA devices
+	(net_class_compute_udi): Fix a typo (me)
+	
+	* hald/linux/osspec.c
+	(compute_coldplug_list): Accept network devices without device link
+	
+	* hald/linux/pcmcia_cs.h: New file
+
+	* hald/linux/pcmcia_utils.c: New file
+	
+	* hald/linux/pcmcia_utils.h: New file
+
 2004-10-25  David Zeuthen  <davidz at redhat.com>
 
 	* fdi/90defaultpolicy/storage-policy.fdi: Allow fstype 'auto' for 

Index: configure.in
===================================================================
RCS file: /cvs/hal/hal/configure.in,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- configure.in	19 Oct 2004 23:06:01 -0000	1.53
+++ configure.in	26 Oct 2004 17:35:20 -0000	1.54
@@ -71,6 +71,22 @@
 AM_CONDITIONAL(FSTAB_SYNC_ENABLED, test x$enable_fstab_sync = xyes)
 
 
+AC_ARG_ENABLE(pcmcia-support,         [  --enable-pcmcia-support     Extended PCMCIA card support],enable_pcmcia_support=yes,enable_pcmcia_support=no)
+if test "x$enable_pcmcia_support" = "xyes" ; then
+   AC_DEFINE(PCMCIA_SUPPORT_ENABLE,1,[Whether PCMCIA card workarounds should be used (for kernels that don't have a sysfsized PCMCIA layer)])
+fi
+AC_SUBST(PCMCIA_SUPPORT_ENABLE)
+AM_CONDITIONAL(PCMCIA_SUPPORT_ENABLE, test x$enable_pcmcia_support = xyes)
+
+AC_ARG_WITH(stab_file,[  --with-stab-file=<file>  PCMCIA socket table file (/var/lib/pcmcia/stab)])
+if test -z "$with_stab_file" ; then
+    PCMCIA_STAB_FILE=/var/lib/pcmcia/stab
+else
+    PCMCIA_STAB_FILE=$with_stab_file
+fi
+AC_SUBST(PCMCIA_STAB_FILE)
+AC_DEFINE_UNQUOTED(PCMCIA_STAB_FILE,"$PCMCIA_STAB_FILE", [PCMCIA socket table file])
+
 AC_ARG_ENABLE(hotplug_map,         [  --enable-hotplug-map    Install hotplug-map callout],enable_hotplug_map=yes,enable_hotplug_map=no)
 if test "x$enable_hotplug_map" = "xyes" ; then
    AC_DEFINE(HOTPLUG_MAP_ENABLED,1,[Whether hotplug-map callout should be installed])
@@ -433,7 +449,10 @@
         hald pidfile:             ${HALD_PID_FILE}
         Building SELinux support: ${have_selinux}
 
-        install fstab-sync:                     ${enable_fstab_sync}
+        install fstab-sync:       ${enable_fstab_sync}
+
+        Extended PCMCIA support:  ${enable_pcmcia_support}
+        PCMCIA stab file:         ${PCMCIA_STAB_FILE}
 
         install hal-hotplug-map:  ${enable_hotplug_map}"