hal ChangeLog,1.764,1.765 configure.in,1.115,1.116

[David Zeuthen]

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

Modified Files:
	ChangeLog configure.in 
Log Message:
2006-01-21  David Zeuthen  <davidz at redhat.com>

        * configure.in: Remove selinux detection as it is not used anywhere



Index: ChangeLog
===================================================================
RCS file: /cvs/hal/hal/ChangeLog,v
retrieving revision 1.764
retrieving revision 1.765
diff -u -d -r1.764 -r1.765
--- ChangeLog	21 Jan 2006 19:51:18 -0000	1.764
+++ ChangeLog	21 Jan 2006 20:06:09 -0000	1.765
@@ -1,7 +1,11 @@
 2006-01-21  David Zeuthen  <davidz at redhat.com>
 
+	* configure.in: Remove selinux detection as it is not used anywhere
+
+2006-01-21  David Zeuthen  <davidz at redhat.com>
+
 	* configure.in: Remove options for pcmcia as we now rely on sysfs on
-	Linux
+	Linux	
 
 	* hald/linux2/Makefile.am (libhald_linux2_la_SOURCES): Remove
 	pcmcia_cs.h and pcmcia.utils.[ch]

Index: configure.in
===================================================================
RCS file: /cvs/hal/hal/configure.in,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -d -r1.115 -r1.116
--- configure.in	21 Jan 2006 19:51:18 -0000	1.115
+++ configure.in	21 Jan 2006 20:06:09 -0000	1.116
@@ -76,7 +76,6 @@
 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])
@@ -381,35 +380,6 @@
 AC_SUBST(HALD_PID_FILE)
 AC_DEFINE_UNQUOTED(HALD_PID_FILE, "$HALD_PID_FILE", [pid file])
 
-# SELinux detection
-if test x$enable_selinux = xno ; then
-    have_selinux=no;
-else
-    # 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
-        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 sufficiently new 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
-
-
 # documentation target
 AC_ARG_WITH(doc-dir,   [  --with-doc-dir=[dirname] directory to install documentation])
 if ! test -z "$with_doc_dir"; then
@@ -505,7 +475,6 @@
         Group for HAL:            ${HAL_GROUP}
         hald pidfile:             ${HALD_PID_FILE}
         hald backend:             ${HALD_BACKEND}
-        Building SELinux support: ${have_selinux}
         acpi proc support:        ${acpi_proc}
         acpi daemon support:      ${acpi_acpid}