From cb7e39b303386a5e9ec7f93b2d5575e4632419ed Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 13 Jul 2013 15:55:36 +0200 Subject: [PATCH] samba: add dependency on zlib popt, PACKAGECONFIG for pam * zlib, popt are autodetected or used in bundled versions * pam is autodetected if available (From meta-openembedded rev: 337b1bac68c548d5e21525961b8a52b72d2cc613) Signed-off-by: Martin Jansa Signed-off-by: Patrick Ohly --- meta-openembedded/meta-oe/recipes-connectivity/samba/samba.inc | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/meta-openembedded/meta-oe/recipes-connectivity/samba/samba.inc b/meta-openembedded/meta-oe/recipes-connectivity/samba/samba.inc index e7defaa..df8ed68 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/samba/samba.inc +++ b/meta-openembedded/meta-oe/recipes-connectivity/samba/samba.inc @@ -1,6 +1,6 @@ SECTION = "console/network" LICENSE = "GPL-3.0" -DEPENDS = "readline virtual/libiconv talloc" +DEPENDS = "readline virtual/libiconv talloc zlib popt" SRC_URI = "http://samba.org/samba/ftp/stable/samba-${PV}.tar.gz \ file://volatiles.03_samba \ @@ -33,12 +33,17 @@ EXTRA_OECONF='--disable-cups \ --with-mandir=${mandir} \ --with-swatdir=${datadir}/swat \ --with-aio-support \ + --with-winbind \ + --with-wbclient \ --without-libtalloc \ --without-acl-support \ --disable-avahi \ samba_cv_struct_timespec=yes \ libreplace_cv_HAVE_MMAP=${SAMBAMMAP}' +PACKAGECONFIG = "${@base_contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" +PACKAGECONFIG[pam] = "--with-pam,--without-pam,libpam" + INITSCRIPT_PACKAGES = "samba winbind" INITSCRIPT_NAME_samba = "samba" INITSCRIPT_NAME_winbind = "winbind" -- 2.7.4