diff options
author | Colin Watson <cjwatson@debian.org> | 2011-01-25 01:51:25 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2011-01-25 01:51:25 +0000 |
commit | 5e750371bb19c8cc58b5faea70278d857acdae0a (patch) | |
tree | fa223746d886bda4acb9e242675bbcc4ddba4efb /configure.ac | |
parent | 26883397c648afa38ed502e68652945a794b0cd3 (diff) |
Backport SELinux build fix from CVS.
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index d7d1a988d..f15518b78 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -761,7 +761,6 @@ mips-sony-bsd|mips-sony-newsos4) | |||
761 | [ AC_DEFINE(USE_SOLARIS_PROCESS_CONTRACTS, 1, | 761 | [ AC_DEFINE(USE_SOLARIS_PROCESS_CONTRACTS, 1, |
762 | [Define if you have Solaris process contracts]) | 762 | [Define if you have Solaris process contracts]) |
763 | SSHDLIBS="$SSHDLIBS -lcontract" | 763 | SSHDLIBS="$SSHDLIBS -lcontract" |
764 | AC_SUBST(SSHDLIBS) | ||
765 | SPC_MSG="yes" ], ) | 764 | SPC_MSG="yes" ], ) |
766 | ], | 765 | ], |
767 | ) | 766 | ) |
@@ -772,7 +771,6 @@ mips-sony-bsd|mips-sony-newsos4) | |||
772 | [ AC_DEFINE(USE_SOLARIS_PROJECTS, 1, | 771 | [ AC_DEFINE(USE_SOLARIS_PROJECTS, 1, |
773 | [Define if you have Solaris projects]) | 772 | [Define if you have Solaris projects]) |
774 | SSHDLIBS="$SSHDLIBS -lproject" | 773 | SSHDLIBS="$SSHDLIBS -lproject" |
775 | AC_SUBST(SSHDLIBS) | ||
776 | SP_MSG="yes" ], ) | 774 | SP_MSG="yes" ], ) |
777 | ], | 775 | ], |
778 | ) | 776 | ) |
@@ -3539,11 +3537,14 @@ AC_ARG_WITH(selinux, | |||
3539 | LIBS="$LIBS -lselinux" | 3537 | LIBS="$LIBS -lselinux" |
3540 | ], | 3538 | ], |
3541 | AC_MSG_ERROR(SELinux support requires libselinux library)) | 3539 | AC_MSG_ERROR(SELinux support requires libselinux library)) |
3540 | SSHLIBS="$SSHLIBS $LIBSELINUX" | ||
3542 | SSHDLIBS="$SSHDLIBS $LIBSELINUX" | 3541 | SSHDLIBS="$SSHDLIBS $LIBSELINUX" |
3543 | AC_CHECK_FUNCS(getseuserbyname get_default_context_with_level) | 3542 | AC_CHECK_FUNCS(getseuserbyname get_default_context_with_level) |
3544 | LIBS="$save_LIBS" | 3543 | LIBS="$save_LIBS" |
3545 | fi ] | 3544 | fi ] |
3546 | ) | 3545 | ) |
3546 | AC_SUBST(SSHLIBS) | ||
3547 | AC_SUBST(SSHDLIBS) | ||
3547 | 3548 | ||
3548 | # Check whether user wants Kerberos 5 support | 3549 | # Check whether user wants Kerberos 5 support |
3549 | KRB5_MSG="no" | 3550 | KRB5_MSG="no" |
@@ -4365,6 +4366,9 @@ echo " Libraries: ${LIBS}" | |||
4365 | if test ! -z "${SSHDLIBS}"; then | 4366 | if test ! -z "${SSHDLIBS}"; then |
4366 | echo " +for sshd: ${SSHDLIBS}" | 4367 | echo " +for sshd: ${SSHDLIBS}" |
4367 | fi | 4368 | fi |
4369 | if test ! -z "${SSHLIBS}"; then | ||
4370 | echo " +for ssh: ${SSHLIBS}" | ||
4371 | fi | ||
4368 | 4372 | ||
4369 | echo "" | 4373 | echo "" |
4370 | 4374 | ||