openssh unix dev - Feb 2008 - configure/makefile cleanup: remove LIBSELINUX, LIBWRAP and LIBPAM

<snip>
> @@ -3157,19 +3155,18 @@ LIBSELINUX=""
>  AC_ARG_WITH(selinux,
>  	[  --with-selinux   Enable SELinux support],
>  	[ if test "x$withval" != "xno" ; then
> +		save_LIBS="$LIBS"
>  		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))
> -		save_LIBS="$LIBS"
> -		LIBS="$LIBS $LIBSELINUX"
> +		SSHDLIBS="$SSHDLIBS $LIBSELINUX"
>  		AC_CHECK_FUNCS(getseuserbyname get_default_context_with_level)
This breaks AC_CHECK_FUNCS :( If LIBS doesn't have $LIBSELINUX it will
always fail to find getseuserbyname get_default_context_with_level.
>  		LIBS="$save_LIBS"
>  	fi ]
>  )
> -AC_SUBST(LIBSELINUX)
>
>  # Check whether user wants Kerberos 5 support
>  KRB5_MSG="no"
<snip>

This patch adds -lselinux to LIBS during the check for getseuserbyname
get_default_context_with_level.

Thanks,

Caleb

---
 configure.ac |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: openssh/configure.ac
==================================================================---
openssh.orig/configure.ac
+++ openssh/configure.ac
@@ -3223,7 +3223,7 @@ AC_ARG_WITH(selinux,
                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_CHECK_LIB(selinux, setexeccon, [
LIBSELINUX="-lselinux" LIBS="-lselinux $LIBS" ],
                    AC_MSG_ERROR(SELinux support requires libselinux library))
                SSHDLIBS="$SSHDLIBS $LIBSELINUX"
                AC_CHECK_FUNCS(getseuserbyname get_default_context_with_level)