diff options
| author | Khem Raj <raj.khem@gmail.com> | 2010-07-27 13:31:58 -0700 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2010-07-27 13:31:58 -0700 |
| commit | 3f5cdf39282a7e758dffa127b38913fab1d88663 (patch) | |
| tree | b437f04584f240766b08d13f299ffd9776f29c3c /recipes | |
| parent | cef13c59975fdbcd938156ed2f9c894e612d86f4 (diff) | |
openssh.inc: Enable pam if present in DISTRO_FEATURES
Signed-off-by: Sean Hudson <Sean_Hudson@Dell.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'recipes')
| -rw-r--r-- | recipes/openssh/openssh.inc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/recipes/openssh/openssh.inc b/recipes/openssh/openssh.inc index 9e4ca1467e..a70cffd8ce 100644 --- a/recipes/openssh/openssh.inc +++ b/recipes/openssh/openssh.inc @@ -1,4 +1,5 @@ DEPENDS = "zlib openssl" +DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" RCONFLICTS_${PN} = "dropbear" RCONFLICTS_${PN}-sshd = "dropbear" @@ -16,7 +17,7 @@ used to provide applications with a secure communication channel." HOMEPAGE = "http://www.openssh.org/" LICENSE = "BSD" -INC_PR = "r8" +INC_PR = "r9" inherit autotools @@ -26,7 +27,8 @@ CFLAGS_prepend = "-I${S} " CFLAGS_append = " -D__FILE_OFFSET_BITS=64" LDFLAGS_prepend = "-L${S} -L${S}/openbsd-compat " EXTRA_OECONF = "--disable-suid-ssh --with-ssl=${STAGING_LIBDIR}/ssl \ - --with-rand-helper=no --without-pam \ + --with-rand-helper=no \ + ${@base_contains('DISTRO_FEATURES', 'pam', '--with-pam', '--without-pam', d)} --without-zlib-version-check \ --with-privsep-path=/var/run/sshd \ --sysconfdir=${sysconfdir}/ssh \ |