hal ChangeLog,1.301,1.302 configure.in,1.39,1.40

[David Zeuthen]

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

Modified Files:
	ChangeLog configure.in 
Log Message:
2004-09-19  David Zeuthen  <david at fubar.dk>

	* hald/hald_dbus.c: Include dbus-glib-lowlevel.h instead of dbus-glib.h
	(filter_function): Remove some debug output

	* configure.in: Check for selinux_removable_context_path in 
	libselinux

	* tools/fstab-sync.c:
	(get_removable_context):
	(fs_table_add_volume):
	(add_udi):
	(remove_udi):
	(clean): 
	Patch from Dan Walsh <dwalsh at redhat.com> to add fscontext to
	/etc/fstab for SELinux. Also removes patch that restored context
	for /etc/fstab since this is not needed.



Index: ChangeLog
===================================================================
RCS file: /cvs/hal/hal/ChangeLog,v
retrieving revision 1.301
retrieving revision 1.302
diff -u -d -r1.301 -r1.302
--- ChangeLog	17 Sep 2004 17:22:27 -0000	1.301
+++ ChangeLog	19 Sep 2004 13:47:51 -0000	1.302
@@ -1,3 +1,21 @@
+2004-09-19  David Zeuthen  <david at fubar.dk>
+
+	* hald/hald_dbus.c: Include dbus-glib-lowlevel.h instead of dbus-glib.h
+	(filter_function): Remove some debug output
+
+	* configure.in: Check for selinux_removable_context_path in 
+	libselinux
+
+	* tools/fstab-sync.c:
+	(get_removable_context):
+	(fs_table_add_volume):
+	(add_udi):
+	(remove_udi):
+	(clean): 
+	Patch from Dan Walsh <dwalsh at redhat.com> to add fscontext to
+	/etc/fstab for SELinux. Also removes patch that restored context
+	for /etc/fstab since this is not needed.
+
 2004-09-17  Joe Shaw  <joeshaw at novell.com>
 
 	* doc/TODO: Remove the device locking section, it's done now. Woo!

Index: configure.in
===================================================================
RCS file: /cvs/hal/hal/configure.in,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- configure.in	16 Sep 2004 22:23:10 -0000	1.39
+++ configure.in	19 Sep 2004 13:47:51 -0000	1.40
@@ -57,7 +57,7 @@
 AC_ARG_ENABLE(verbose-mode,     [  --enable-verbose-mode   support verbose debug mode],enable_verbose_mode=$enableval,enable_verbose_mode=$USE_MAINTAINER_MODE)
 AC_ARG_ENABLE(doxygen-docs,     [  --enable-doxygen-docs   build DOXYGEN documentation (requires Doxygen)],enable_doxygen_docs=$enableval,enable_doxygen_docs=auto)
 AC_ARG_ENABLE(docbook-docs,     [  --enable-docbook-docs   build DocBook documentation (requires docbook2html)],enable_docbook_docs=$enableval,enable_docbook_docs=auto)
-AC_ARG_ENABLE(selinux,          [  --enable-selinux      build with SELinux support],enable_selinux=$enableval,enable_selinux=auto)
+AC_ARG_ENABLE(selinux,          [  --enable-selinux        build with SELinux support],enable_selinux=$enableval,enable_selinux=auto)
 
 if test x$enable_verbose_mode = xyes; then
     AC_DEFINE(ENABLE_VERBOSE_MODE,1,[Support a verbose mode])
@@ -71,7 +71,7 @@
 AM_CONDITIONAL(FSTAB_SYNC_ENABLED, test x$enable_fstab_sync = xyes)
 
 
-AC_ARG_ENABLE(hotplug_map,         [  --enable-hotplug-map   Install hotplug-map callout],enable_hotplug_map=yes,enable_hotplug_map=no)
+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])
 fi
@@ -347,8 +347,8 @@
 if test x$enable_selinux = xno ; then
     have_selinux=no;
 else
-    # See if we have SELinux library
-    AC_CHECK_LIB(selinux, is_selinux_enabled, 
+    # See if we have sufficiently new SELinux library
+    AC_CHECK_LIB(selinux, selinux_removable_context_path, 
                  have_selinux=yes, have_selinux=no)
 
     if test x$enable_selinux = xauto ; then
@@ -357,7 +357,7 @@
         fi
     else 
         if test x$have_selinux = xno ; then
-                AC_MSG_ERROR([SElinux explicitly required, and SELinux library not found])
+                AC_MSG_ERROR([SELinux explicitly required, and sufficiently new SELinux library not found])
         fi
     fi
 fi