From d910d848e367deedccaf410d2397c74dfec6bd24 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Mon, 23 Apr 2012 15:03:05 +1000 Subject: [PATCH] build: Remove support for a system libsmbclient With the new --private-libraries option, there is no longer the need to have this support, which was aimed at avoiding the duplication between two different libsmbclient binaries in a packaged distribution. By using --private-libraries instead, we do not introduce a dependency between Samba 4.0 packages and whatever other packages are on the system. This effectivly reverts part of e3ffb31554927a24df35576bd753ee4eb2dc2a3c while kpeeing the improved SAMBA_LIBRARY declaration. Andrew Bartlett --- source3/libsmb/wscript | 9 --------- wscript | 1 - 2 files changed, 10 deletions(-) diff --git a/source3/libsmb/wscript b/source3/libsmb/wscript index 6260945c11f..e614557e35a 100644 --- a/source3/libsmb/wscript +++ b/source3/libsmb/wscript @@ -2,16 +2,7 @@ import Options, Logs -def configure(conf): - if conf.CHECK_BUNDLED_SYSTEM_PKG('smbclient', minversion='0'): - conf.define('USING_SYSTEM_LIBSMBCLIENT', 1) - def build(bld): - if bld.CONFIG_SET('USING_SYSTEM_LIBSMBCLIENT'): - Logs.info("\tSelected system libsmbclient build") - return - - Logs.info("\tSelected embedded libsmbclient build") bld.SAMBA3_LIBRARY('smbclient', source=''' libsmb_cache.c diff --git a/wscript b/wscript index f96327c90d7..15e1ce51bfc 100755 --- a/wscript +++ b/wscript @@ -105,7 +105,6 @@ def configure(conf): conf.RECURSE('selftest') conf.RECURSE('source3') conf.RECURSE('lib/addns') - conf.RECURSE('source3/libsmb') conf.SAMBA_CHECK_UNDEFINED_SYMBOL_FLAGS() -- 2.11.4.GIT