- (dtucker) [configure.ac] Set put -lselinux into $LIBS while testing for

SELinux functions so they're detected correctly.  Patch from pebenito at
   gentoo.org.
This commit is contained in:
Darren Tucker 2006-10-07 09:07:20 +10:00
parent 09f1093a29
commit adc947d5a5
2 changed files with 9 additions and 3 deletions

View File

@ -1,6 +1,9 @@
20061006 20061006
- (tim) [buildpkg.sh.in] Use uname -r instead of -v in OS_VER for Solaris. - (tim) [buildpkg.sh.in] Use uname -r instead of -v in OS_VER for Solaris.
Differentiate between OpenServer 5 and OpenServer 6 Differentiate between OpenServer 5 and OpenServer 6
- (dtucker) [configure.ac] Set put -lselinux into $LIBS while testing for
SELinux functions so they're detected correctly. Patch from pebenito at
gentoo.org.
20061003 20061003
- (tim) [configure.ac] Move CHECK_HEADERS test before platform specific - (tim) [configure.ac] Move CHECK_HEADERS test before platform specific
@ -2519,4 +2522,4 @@
OpenServer 6 and add osr5bigcrypt support so when someone migrates OpenServer 6 and add osr5bigcrypt support so when someone migrates
passwords between UnixWare and OpenServer they will still work. OK dtucker@ passwords between UnixWare and OpenServer they will still work. OK dtucker@
$Id: ChangeLog,v 1.4567 2006/10/06 21:58:38 tim Exp $ $Id: ChangeLog,v 1.4568 2006/10/06 23:07:20 dtucker Exp $

View File

@ -1,4 +1,4 @@
# $Id: configure.ac,v 1.369 2006/10/03 16:34:35 tim Exp $ # $Id: configure.ac,v 1.370 2006/10/06 23:07:21 dtucker Exp $
# #
# Copyright (c) 1999-2004 Damien Miller # Copyright (c) 1999-2004 Damien Miller
# #
@ -15,7 +15,7 @@
# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
AC_INIT(OpenSSH, Portable, openssh-unix-dev@mindrot.org) AC_INIT(OpenSSH, Portable, openssh-unix-dev@mindrot.org)
AC_REVISION($Revision: 1.369 $) AC_REVISION($Revision: 1.370 $)
AC_CONFIG_SRCDIR([ssh.c]) AC_CONFIG_SRCDIR([ssh.c])
AC_CONFIG_HEADER(config.h) AC_CONFIG_HEADER(config.h)
@ -3145,7 +3145,10 @@ AC_ARG_WITH(selinux,
AC_MSG_ERROR(SELinux support requires selinux.h header)) AC_MSG_ERROR(SELinux support requires selinux.h header))
AC_CHECK_LIB(selinux, setexeccon, [ LIBSELINUX="-lselinux" ], AC_CHECK_LIB(selinux, setexeccon, [ LIBSELINUX="-lselinux" ],
AC_MSG_ERROR(SELinux support requires libselinux library)) AC_MSG_ERROR(SELinux support requires libselinux library))
save_LIBS="$LIBS"
LIBS="$LIBS $LIBSELINUX"
AC_CHECK_FUNCS(getseuserbyname get_default_context_with_level) AC_CHECK_FUNCS(getseuserbyname get_default_context_with_level)
LIBS="$save_LIBS"
fi ] fi ]
) )
AC_SUBST(LIBSELINUX) AC_SUBST(LIBSELINUX)