VERSION.sh | 2 +-
m4/selinux.m4 | 3 ---
2 files changed, 1 insertion(+), 4 deletions(-)
New commits:
commit 83714bd2c60c62b2e06a9d1408b3a212d3dff0dd
Author: Nathan Kinder <nkinder(a)redhat.com>
Date: Tue Nov 16 11:03:06 2010 -0800
Bug 648949 - Merge selinux policy into base OS
This patch removes the configure check for the selinux Makefile
since we no longer need to build selinux policy as a part of
Admin Server.
This also bumps the version number in VERSION.sh in preparation
for the 1.1.12 release.
diff --git a/VERSION.sh b/VERSION.sh
index b600f3e..7541372 100644
--- a/VERSION.sh
+++ b/VERSION.sh
@@ -15,7 +15,7 @@ VERSION_MAINT=12
# if this is a PRERELEASE, set VERSION_PREREL
# otherwise, comment it out
# be sure to include the dot prefix in the prerel
-VERSION_PREREL=.a3
+#VERSION_PREREL=.a3
# NOTES on VERSION_PREREL
# use aN for an alpha release e.g. a1, a2, etc.
# use rcN for a release candidate e.g. rc1, rc2, etc.
diff --git a/m4/selinux.m4 b/m4/selinux.m4
index de97c94..d4e74b6 100644
--- a/m4/selinux.m4
+++ b/m4/selinux.m4
@@ -27,8 +27,5 @@ AC_ARG_WITH(selinux, [ --with-selinux Build SELinux policy],
with_selinux=yes
AC_MSG_RESULT(yes)
AC_SUBST(with_selinux)
- if test ! -f "/usr/share/selinux/devel/Makefile"; then
- AC_MSG_ERROR([SELinux development tools (selinux-policy) not found])
- fi
],
AC_MSG_RESULT(no))