[389-commits] Branch 'refs/tags/389-ds-base-1.2.7' - 2 commits - m4/selinux.m4 VERSION.sh

[Nathan Kinder]

 VERSION.sh    |    4 ++--
 m4/selinux.m4 |    5 +----
 2 files changed, 3 insertions(+), 6 deletions(-)

New commits:
commit a42cc3da7f5ac9c06eda28a98d487486e8e10ada
Author: Nathan Kinder <nkinder at redhat.com>
Date:   Tue Nov 16 07:51:53 2010 -0800

    Bug 648949 - Move selinux policy into base OS
    
    Now that the dirsrv selinux policy is going to be in the base OS,
    we don't need to have configure require the selinux Makefile to be
    present when the --with-selinux option is used.  We still need the
    --with-selinux option to enable the installer code to label ports.

diff --git a/m4/selinux.m4 b/m4/selinux.m4
index 5a574d1..d89d6a8 100644
--- a/m4/selinux.m4
+++ b/m4/selinux.m4
@@ -22,7 +22,7 @@ AC_CHECKING(for SELinux)
 
 # check for --with-selinux
 AC_MSG_CHECKING(for --with-selinux)
-AC_ARG_WITH(selinux, AS_HELP_STRING([--with-selinux],[Build SELinux policy]),
+AC_ARG_WITH(selinux, AS_HELP_STRING([--with-selinux],[Support SELinux policy]),
 [
   if test "$withval" = "no"; then
     AC_MSG_RESULT(no)
@@ -30,9 +30,6 @@ AC_ARG_WITH(selinux, AS_HELP_STRING([--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
   fi
 ],
 AC_MSG_RESULT(no))


commit 69fa85aaad2d950b3dc6d8323a2faacc881b6f0e
Author: Nathan Kinder <nkinder at redhat.com>
Date:   Mon Nov 15 13:54:27 2010 -0800

    Bump VERSION.sh to 1.2.8.a1

diff --git a/VERSION.sh b/VERSION.sh
index f003bcb..c0ae824 100644
--- a/VERSION.sh
+++ b/VERSION.sh
@@ -10,11 +10,11 @@ vendor="389 Project"
 # PACKAGE_VERSION is constructed from these
 VERSION_MAJOR=1
 VERSION_MINOR=2
-VERSION_MAINT=7
+VERSION_MAINT=8
 # if this is a PRERELEASE, set VERSION_PREREL
 # otherwise, comment it out
 # be sure to include the dot prefix in the prerel
-VERSION_PREREL=.a6
+VERSION_PREREL=.a1
 # 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.