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

   SELinux functions so they're detected correctly.  Patch from pebenito at
   gentoo.org.

diff --git a/ChangeLog b/ChangeLog
index 297399560cfd8b4a1c4bda73487b9e9a145442bd..eea43699683cd75479da653073c9ac08d7a955ef 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 17a34863a9a592e09f4e33daa3d77340c80331c8..bc549c407dfc84e20435b0ef0a64449dc890fb13 100644 (file)
--- 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)