From 3f5cdf39282a7e758dffa127b38913fab1d88663 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 27 Jul 2010 13:31:58 -0700 Subject: openssh.inc: Enable pam if present in DISTRO_FEATURES Signed-off-by: Sean Hudson Signed-off-by: Khem Raj --- recipes/openssh/openssh.inc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'recipes') 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 \ -- cgit v1.2.3