hal configure.in,1.36,1.37 ChangeLog,1.268,1.269

[David Zeuthen]

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

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

	* configure.in: Add SELinux checks
	
	* tools/Makefile.am: Build fstab-sync with selinux support if applicable
	
	* tools/fstab-sync.c: 
	(restore_selinux_context): New functions
	(add_udi): Use restore_selinux_context
	(remove_udi): Use restore_selinux_context
	
	* tools/linux/Makefile.am: Install hal.hotplug and hal.dev symlinks
	prefixed with 20- respectively 10-.



Index: configure.in
===================================================================
RCS file: /cvs/hal/hal/configure.in,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- configure.in	26 Aug 2004 18:04:20 -0000	1.36
+++ configure.in	29 Aug 2004 22:31:39 -0000	1.37
@@ -57,6 +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)
 
 if test x$enable_verbose_mode = xyes; then
     AC_DEFINE(ENABLE_VERBOSE_MODE,1,[Support a verbose mode])
@@ -340,6 +341,36 @@
 
 
 
+# SELinux detection
+if test x$enable_selinux = xno ; then
+    have_selinux=no;
+else
+    # See if we have SELinux library
+    AC_CHECK_LIB(selinux, is_selinux_enabled, 
+                 have_selinux=yes, have_selinux=no)
+
+    if test x$enable_selinux = xauto ; then
+        if test x$have_selinux = xno ; then
+                AC_MSG_WARN([Sufficiently new SELinux library not found])
+        fi
+    else 
+        if test x$have_selinux = xno ; then
+                AC_MSG_ERROR([SElinux explicitly required, and SELinux library not found])
+        fi
+    fi
+fi
+
+AM_CONDITIONAL(HAVE_SELINUX, test x$have_selinux = xyes)
+
+if test x$have_selinux = xyes ; then
+    SELINUX_LIBS=-lselinux
+    AC_DEFINE(HAVE_SELINUX,1,[SELinux support])
+else
+    SELINUX_LIBS=
+fi
+
+
+
 AC_OUTPUT([
 hal.pc
 hal.conf
@@ -386,6 +417,7 @@
         User for HAL:             ${HAL_USER}
         Group for HAL:            ${HAL_GROUP}
         hald pidfile:             ${HALD_PID_FILE}
+        Building SELinux support: ${have_selinux}
 
         install fstab-sync:       ${enable_fstab_sync}
         fstab-sync using noop:    ${enable_mnt_noop}

Index: ChangeLog
===================================================================
RCS file: /cvs/hal/hal/ChangeLog,v
retrieving revision 1.268
retrieving revision 1.269
diff -u -d -r1.268 -r1.269
--- ChangeLog	29 Aug 2004 15:57:41 -0000	1.268
+++ ChangeLog	29 Aug 2004 22:31:39 -0000	1.269
@@ -1,3 +1,23 @@
+2004-08-30  David Zeuthen  <david at fubar.dk>
+
+	* configure.in: Add SELinux checks
+	
+	* tools/Makefile.am: Build fstab-sync with selinux support if applicable
+	
+	* tools/fstab-sync.c: 
+	(restore_selinux_context): New functions
+	(add_udi): Use restore_selinux_context
+	(remove_udi): Use restore_selinux_context
+	
+	* tools/linux/Makefile.am: Install hal.hotplug and hal.dev symlinks
+	prefixed with 20- respectively 10-.
+
+2004-08-29  David Zeuthen  <david at fubar.dk>
+
+	* tools/linux/Makefile.am (install-data-local): Use 20-hal.hotplug for
+	hotplug helper and 10-hal.dev for dev.d helper. Suggested by Kay
+	Sievers <kay.sievers at vrfy.org>.
+
 2004-08-29  David Zeuthen  <david at fubar.dk>
 
 	* hald/linux/block_class_device.c (detect_media): Set volume.fsusage