From a2418b21add72037f3f16163c13c8cfe246a1292 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Mon, 4 Feb 2008 09:47:29 +0000 Subject: * Fix configure detection of getseuserbyname and get_default_context_with_level (LP: #188136). --- configure | 2 ++ configure.ac | 9 ++++++--- debian/changelog | 8 ++++++++ 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 98a7bb261..3e578307d 100755 --- a/configure +++ b/configure @@ -25708,6 +25708,8 @@ fi echo "${ECHO_T}$ac_cv_lib_selinux_setexeccon" >&6; } if test $ac_cv_lib_selinux_setexeccon = yes; then LIBSELINUX="-lselinux" + LIBS="$LIBS -lselinux" + else { { echo "$as_me:$LINENO: error: SELinux support requires libselinux library" >&5 echo "$as_me: error: SELinux support requires libselinux library" >&2;} diff --git a/configure.ac b/configure.ac index 64ef3c67b..487a9d6ae 100644 --- a/configure.ac +++ b/configure.ac @@ -3239,9 +3239,12 @@ AC_ARG_WITH(selinux, AC_DEFINE(WITH_SELINUX,1,[Define if you want SELinux support.]) SELINUX_MSG="yes" AC_CHECK_HEADER([selinux/selinux.h], , - AC_MSG_ERROR(SELinux support requires selinux.h header)) - AC_CHECK_LIB(selinux, setexeccon, [ LIBSELINUX="-lselinux" ], - AC_MSG_ERROR(SELinux support requires libselinux library)) + AC_MSG_ERROR(SELinux support requires selinux.h header)) + AC_CHECK_LIB(selinux, setexeccon, + [ LIBSELINUX="-lselinux" + LIBS="$LIBS -lselinux" + ], + AC_MSG_ERROR(SELinux support requires libselinux library)) SSHDLIBS="$SSHDLIBS $LIBSELINUX" AC_CHECK_FUNCS(getseuserbyname get_default_context_with_level) LIBS="$save_LIBS" diff --git a/debian/changelog b/debian/changelog index 5ad60f16d..765aa9584 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +openssh (1:4.7p1-4) UNRELEASED; urgency=low + + [ Caleb Case ] + * Fix configure detection of getseuserbyname and + get_default_context_with_level (LP: #188136). + + -- Colin Watson Mon, 04 Feb 2008 09:47:31 +0000 + openssh (1:4.7p1-3) unstable; urgency=low * Improve grammar of ssh-askpass-gnome description. -- cgit v1.2.3