hal/hald Makefile.am,1.38,1.39

[David Zeuthen]

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

Modified Files:
	Makefile.am 
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: Makefile.am
===================================================================
RCS file: /cvs/hal/hal/hald/Makefile.am,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- Makefile.am	14 Oct 2004 19:16:30 -0000	1.38
+++ Makefile.am	26 Oct 2004 17:35:21 -0000	1.39
@@ -60,6 +60,9 @@
 
 #					linux/ieee1394_host_class_device.c
 
+if PCMCIA_SUPPORT_ENABLE
+hald_SOURCES += linux/pcmcia_utils.c linux/pcmcia_utils.h linux/pcmcia_cs.h
+endif
 
 hald_SOURCES +=                                                         \
         linux/libsysfs/libsysfs.h                                       \