The branch, master has been updated via 21974a9 ctdb-build: popt has moved from lib/ to third_party/ via 976f479 ctdb-build: Replace indentation tabs with spaces from 587befb lib/popt: Remove non third_party popt.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 21974a99b0e77982b7a023ceb62b486b0d9c23f5 Author: Amitay Isaacs <ami...@gmail.com> Date: Mon Aug 11 16:02:27 2014 +1000 ctdb-build: popt has moved from lib/ to third_party/ Signed-off-by: Amitay Isaacs <ami...@gmail.com> Reviewed-by: Martin Schwenke <mar...@meltin.net> Autobuild-User(master): Martin Schwenke <mart...@samba.org> Autobuild-Date(master): Mon Aug 11 10:58:43 CEST 2014 on sn-devel-104 commit 976f4790cfe277a3b674a27856874bddee785de4 Author: Amitay Isaacs <ami...@gmail.com> Date: Mon Aug 11 16:02:00 2014 +1000 ctdb-build: Replace indentation tabs with spaces Signed-off-by: Amitay Isaacs <ami...@gmail.com> Reviewed-by: Martin Schwenke <mar...@meltin.net> ----------------------------------------------------------------------- Summary of changes: ctdb/wscript | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) Changeset truncated at 500 lines: diff --git a/ctdb/wscript b/ctdb/wscript index 5014f05..35eeac4 100755 --- a/ctdb/wscript +++ b/ctdb/wscript @@ -29,8 +29,9 @@ VERSION = version.STRING.replace('-', '.') Options.default_prefix = '/usr/local' samba_dist.DIST_DIRS('''ctdb:. lib/replace:lib/replace lib/talloc:lib/talloc - lib/tevent:lib/tevent lib/tdb:lib/tdb lib/popt:lib/popt + lib/tevent:lib/tevent lib/tdb:lib/tdb lib/socket_wrapper:lib/socket_wrapper + third_party/popt:third_party/popt buildtools:buildtools''') @@ -67,7 +68,7 @@ def configure(conf): conf.RECURSE('lib/replace') if conf.CHECK_FOR_THIRD_PARTY(): - conf.RECURSE('third_party/popt') + conf.RECURSE('third_party/popt') else: if not conf.CHECK_POPT(): raise Utils.WafError('popt development packages have not been found\nIf third_party is installed, check that it is in the proper place.') @@ -163,7 +164,7 @@ def configure(conf): def build(bld): bld.RECURSE('lib/replace') if bld.CHECK_FOR_THIRD_PARTY(): - bld.RECURSE('third_party/popt') + bld.RECURSE('third_party/popt') bld.RECURSE('lib/talloc') bld.RECURSE('lib/tevent') -- Samba Shared Repository