Index: /trunk/aclocal.m4
===================================================================
--- /trunk/aclocal.m4	(revision 498)
+++ /trunk/aclocal.m4	(revision 499)
@@ -409,5 +409,5 @@
 x_libraries=NONE
 DESTDIR=
-SH_ENABLE_OPTS="asm ssp db-reload xml-log message-queue login-watch process-check port-check mounts-check logfile-monitor userfiles debug ptrace static network udp nocl stealth micro-stealth install-name identity khide suidcheck base largefile mail external-scripts encrypt srp dnmalloc ipv6 shellexpand suid"
+SH_ENABLE_OPTS="selinux posix-acl asm ssp db-reload xml-log message-queue login-watch process-check port-check mounts-check logfile-monitor userfiles debug ptrace static network udp nocl stealth micro-stealth install-name identity khide suidcheck base largefile mail external-scripts encrypt srp dnmalloc ipv6 shellexpand suid"
 SH_WITH_OPTS="prelude libprelude-prefix database libwrap cflags libs console altconsole timeserver alttimeserver rnd egd-socket port logserver altlogserver kcheck gpg keyid checksum fp recipient sender trusted tmp-dir config-file log-file pid-file state-dir data-file html-file"
 
@@ -1425,9 +1425,13 @@
                        [sh_facl=yes],[sh_facl=no])
   	LIBS="$OLDLIBS"
-
-	if test x"$sh_facl" = xyes; then
-	  AC_DEFINE(USE_ACL, 1, [Define if you want ACL support.])
+  fi	
+
+  if test x"$sh_facl" = xyes; then
+  	  AC_DEFINE(USE_ACL, 1, [Define if you want ACL support.])
 	  LIBS="$LIBS $LIBACL"
-        fi
+  else
+	  if test "x$enable_posix_acl" != xcheck; then
+             AC_MSG_FAILURE([--enable-posix-acl was given, but test for acl support failed])
+          fi
   fi
 ])
@@ -1450,9 +1454,13 @@
                        [sh_fattr=yes],[sh_fattr=no])
   	LIBS="$OLDLIBS"
-
-	if test x"$sh_fattr" = xyes; then
+  fi
+
+  if test x"$sh_fattr" = xyes; then
 	  AC_DEFINE(USE_XATTR, 1, [Define if you want extended attributes support.])
 	  LIBS="$LIBS $LIBATTR"
-        fi
+  else
+	  if test "x$enable_selinux" != xcheck; then
+             AC_MSG_FAILURE([--enable-selinux was given, but test for selinux support failed])
+          fi
   fi
 ])
Index: /trunk/configure.ac
===================================================================
--- /trunk/configure.ac	(revision 498)
+++ /trunk/configure.ac	(revision 499)
@@ -12,5 +12,5 @@
 dnl start
 dnl
-AM_INIT_AUTOMAKE(samhain, 4.1.1)
+AM_INIT_AUTOMAKE(samhain, 4.1.2)
 AC_DEFINE([SAMHAIN], 1, [Application is samhain])
 AC_CANONICAL_HOST
@@ -519,6 +519,19 @@
 dnl *****************************************
 
-sh_CHECK_XATTR
-sh_CHECK_POSIX_ACL
+AC_ARG_ENABLE([selinux],
+	[AS_HELP_STRING([--enable-selinux], [support checking selinux attributes])],
+	[],
+	[enable_selinux=check])
+if test "x$enable_selinux" != xno; then
+   sh_CHECK_XATTR
+fi
+
+AC_ARG_ENABLE([posix-acl],
+	[AS_HELP_STRING([--enable-posix-acl], [support checking posix acls])],
+	[],
+	[enable_posix_acl=check])
+if test "x$enable_posix_acl" != xno; then
+   sh_CHECK_POSIX_ACL
+fi
 
 dnl *****************************************
Index: /trunk/docs/Changelog
===================================================================
--- /trunk/docs/Changelog	(revision 498)
+++ /trunk/docs/Changelog	(revision 499)
@@ -1,4 +1,11 @@
+4.2.0:
+	* add options --enable-selinux and --enable-posix-acl for "hard fail"
+	if libraries aren't found (requested feature)
+	* fix wrong policy assignment when inotify is active and change occurs
+	during a reload (reported by Bond)
+	* fix failure to detect open UDP port for some daemons (reported by James)
 	* fix broken 'rpm' and 'rpm-light' makefile targets
 	(reported by Bond)
+	* fix message for self-check
 
 4.1.1: