summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--configure.ac6
2 files changed, 5 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index f40e0c057..4c2df0181 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -51,6 +51,7 @@
51 disable no-replace rename test now that we prefer a POSIX rename; spotted 51 disable no-replace rename test now that we prefer a POSIX rename; spotted
52 by dkrause@ 52 by dkrause@
53 - (djm) [configure.ac] fix alignment of --without-stackprotect description 53 - (djm) [configure.ac] fix alignment of --without-stackprotect description
54 - (djm) [configure.ac] --with-selinux too
54 55
5520080315 5620080315
56 - (djm) [regress/test-exec.sh] Quote putty-related variables in case they are 57 - (djm) [regress/test-exec.sh] Quote putty-related variables in case they are
@@ -3819,4 +3820,4 @@
3819 OpenServer 6 and add osr5bigcrypt support so when someone migrates 3820 OpenServer 6 and add osr5bigcrypt support so when someone migrates
3820 passwords between UnixWare and OpenServer they will still work. OK dtucker@ 3821 passwords between UnixWare and OpenServer they will still work. OK dtucker@
3821 3822
3822$Id: ChangeLog,v 1.4892 2008/03/27 01:30:18 djm Exp $ 3823$Id: ChangeLog,v 1.4893 2008/03/27 01:33:07 djm Exp $
diff --git a/configure.ac b/configure.ac
index aa3ee359d..7b92bad1d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
1# $Id: configure.ac,v 1.396 2008/03/27 01:30:18 djm Exp $ 1# $Id: configure.ac,v 1.397 2008/03/27 01:33:07 djm Exp $
2# 2#
3# Copyright (c) 1999-2004 Damien Miller 3# Copyright (c) 1999-2004 Damien Miller
4# 4#
@@ -15,7 +15,7 @@
15# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. 15# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
16 16
17AC_INIT(OpenSSH, Portable, openssh-unix-dev@mindrot.org) 17AC_INIT(OpenSSH, Portable, openssh-unix-dev@mindrot.org)
18AC_REVISION($Revision: 1.396 $) 18AC_REVISION($Revision: 1.397 $)
19AC_CONFIG_SRCDIR([ssh.c]) 19AC_CONFIG_SRCDIR([ssh.c])
20 20
21AC_CONFIG_HEADER(config.h) 21AC_CONFIG_HEADER(config.h)
@@ -3258,7 +3258,7 @@ int main() { return 0; }
3258SELINUX_MSG="no" 3258SELINUX_MSG="no"
3259LIBSELINUX="" 3259LIBSELINUX=""
3260AC_ARG_WITH(selinux, 3260AC_ARG_WITH(selinux,
3261 [ --with-selinux Enable SELinux support], 3261 [ --with-selinux Enable SELinux support],
3262 [ if test "x$withval" != "xno" ; then 3262 [ if test "x$withval" != "xno" ; then
3263 save_LIBS="$LIBS" 3263 save_LIBS="$LIBS"
3264 AC_DEFINE(WITH_SELINUX,1,[Define if you want SELinux support.]) 3264 AC_DEFINE(WITH_SELINUX,1,[Define if you want SELinux support.])