diff options
| author | Darren Tucker <dtucker@zip.com.au> | 2006-10-07 09:09:26 +1000 |
|---|---|---|
| committer | Darren Tucker <dtucker@zip.com.au> | 2006-10-07 09:09:26 +1000 |
| commit | 66964decfa32eec004a9f3fb1505d16864e173d9 (patch) | |
| tree | 546c77967860e5cb0f469d5fe19d618c274aad16 | |
| parent | 4a760096e64c6cb62ab1399cad0ad3b785091897 (diff) | |
- (dtucker) [configure.ac] Set put -lselinux into $LIBS while testing forV_4_4
SELinux functions so they're detected correctly. Patch from pebenito at
gentoo.org.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | configure.ac | 7 |
2 files changed, 11 insertions, 3 deletions
@@ -1,3 +1,8 @@ +20061006 + - (dtucker) [configure.ac] Set put -lselinux into $LIBS while testing for + SELinux functions so they're detected correctly. Patch from pebenito at + gentoo.org. + 20061001 - (dtucker) [audit-bsm.c] Include errno.h. Pointed out by des at des.no. @@ -5500,4 +5505,4 @@ - (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu -$Id: ChangeLog,v 1.4558.2.6 2006/09/30 22:10:20 dtucker Exp $ +$Id: ChangeLog,v 1.4558.2.7 2006/10/06 23:09:26 dtucker Exp $ diff --git a/configure.ac b/configure.ac index 17a34863..bc549c40 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -# $Id: configure.ac,v 1.367.2.1 2006/09/29 10:16:31 dtucker Exp $ +# $Id: configure.ac,v 1.367.2.2 2006/10/06 23:09:27 dtucker Exp $ # # Copyright (c) 1999-2004 Damien Miller # @@ -15,7 +15,7 @@ # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. AC_INIT(OpenSSH, Portable, openssh-unix-dev@mindrot.org) -AC_REVISION($Revision: 1.367.2.1 $) +AC_REVISION($Revision: 1.367.2.2 $) AC_CONFIG_SRCDIR([ssh.c]) AC_CONFIG_HEADER(config.h) @@ -3145,7 +3145,10 @@ AC_ARG_WITH(selinux, AC_MSG_ERROR(SELinux support requires selinux.h header)) AC_CHECK_LIB(selinux, setexeccon, [ LIBSELINUX="-lselinux" ], AC_MSG_ERROR(SELinux support requires libselinux library)) + save_LIBS="$LIBS" + LIBS="$LIBS $LIBSELINUX" AC_CHECK_FUNCS(getseuserbyname get_default_context_with_level) + LIBS="$save_LIBS" fi ] ) AC_SUBST(LIBSELINUX) |