[SCM] Samba Shared Repository - branch master updated
Andrew Tridgell
tridge at samba.org
Tue Apr 13 07:04:51 MDT 2010
The branch, master has been updated
via 3909088... s4: prevent the autoconf build from removing source4/librpc/gen_ndr/README
via c10d267... s4-waf: don't try to use the system lib for the library build
via 483d059... tevent-waf: added man page and pkgconfig file
from be813ff... libwbclient: Re-Fix a bug that was fixed with e5741e27c4c
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 3909088e13c24183d22df6a77cd0717a6ed50c72
Author: Andrew Tridgell <tridge at samba.org>
Date: Tue Apr 13 21:40:59 2010 +1000
s4: prevent the autoconf build from removing source4/librpc/gen_ndr/README
commit c10d267a7620d53e34f79c2514849cd82a47b9aa
Author: Andrew Tridgell <tridge at samba.org>
Date: Tue Apr 13 21:33:04 2010 +1000
s4-waf: don't try to use the system lib for the library build
when building library FOO, don't try to find the system library FOO
Pair-Programmed-With: Andrew Bartlett <abartlet at samba.org>
commit 483d059c8e08473c9c9b27025bfb80f0d6b89c4a
Author: Andrew Tridgell <tridge at samba.org>
Date: Tue Apr 13 21:20:52 2010 +1000
tevent-waf: added man page and pkgconfig file
this allows libtevent to build under rpmbuild
Pair-Programmed-With: Andrew Bartlett <abartlet at samba.org>
-----------------------------------------------------------------------
Summary of changes:
.gitignore | 2 +-
lib/talloc/wscript | 9 +++++----
lib/tdb/wscript | 11 ++++++-----
lib/tevent/wscript | 14 +++++++++++---
source4/build/make/rules.mk | 2 +-
source4/lib/ldb/wscript | 10 ++++++----
6 files changed, 30 insertions(+), 18 deletions(-)
Changeset truncated at 500 lines:
diff --git a/.gitignore b/.gitignore
index b109993..23174e9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -235,7 +235,7 @@ source4/lib/registry/tdr_regf.c
source4/lib/registry/tdr_regf.h
source4/lib/registry/tests/proto.h
source4/lib/registry/tools/common.h
-source4/librpc/gen_ndr
+source4/librpc/gen_ndr/*.*
source4/librpc/idl-deps
source4/librpc/ndr/libndr_proto.h
source4/librpc/ndr/ndr_compression.h
diff --git a/lib/talloc/wscript b/lib/talloc/wscript
index bd47be8..f6170ef 100644
--- a/lib/talloc/wscript
+++ b/lib/talloc/wscript
@@ -33,12 +33,13 @@ def set_options(opt):
def configure(conf):
conf.RECURSE('lib/replace')
- if conf.CHECK_BUNDLED_SYSTEM('talloc', minversion=VERSION,
- implied_deps='replace'):
- conf.define('USING_SYSTEM_TALLOC', 1)
-
conf.env.standalone_talloc = conf.IN_LAUNCH_DIR()
+ if not conf.env.standalone_talloc:
+ if conf.CHECK_BUNDLED_SYSTEM('talloc', minversion=VERSION,
+ implied_deps='replace'):
+ conf.define('USING_SYSTEM_TALLOC', 1)
+
conf.env.TALLOC_COMPAT1 = Options.options.TALLOC_COMPAT1
if conf.env.standalone_talloc:
diff --git a/lib/tdb/wscript b/lib/tdb/wscript
index c5706a2..de62d4a 100644
--- a/lib/tdb/wscript
+++ b/lib/tdb/wscript
@@ -30,11 +30,13 @@ def set_options(opt):
def configure(conf):
conf.RECURSE('lib/replace')
- if conf.CHECK_BUNDLED_SYSTEM('tdb', minversion=VERSION,
- implied_deps='replace'):
- conf.define('USING_SYSTEM_TDB', 1)
-
conf.env.standalone_tdb = conf.IN_LAUNCH_DIR()
+
+ if not conf.env.standalone_tdb:
+ if conf.CHECK_BUNDLED_SYSTEM('tdb', minversion=VERSION,
+ implied_deps='replace'):
+ conf.define('USING_SYSTEM_TDB', 1)
+
conf.env.disable_python = getattr(Options.options, 'disable_python', False)
if conf.env.standalone_tdb:
@@ -93,7 +95,6 @@ def build(bld):
if bld.env.standalone_tdb:
bld.env.PKGCONFIGDIR = '${LIBDIR}/pkgconfig'
- bld.env.TALLOC_VERSION = VERSION
bld.PKG_CONFIG_FILES('tdb.pc', vnum=VERSION)
bld.INSTALL_FILES('${INCLUDEDIR}', 'include/tdb.h', flat=True)
diff --git a/lib/tevent/wscript b/lib/tevent/wscript
index 4244db1..c90ed7a 100644
--- a/lib/tevent/wscript
+++ b/lib/tevent/wscript
@@ -27,9 +27,12 @@ def configure(conf):
conf.RECURSE('lib/replace')
conf.RECURSE('lib/talloc')
- if conf.CHECK_BUNDLED_SYSTEM('tevent', minversion=VERSION,
- onlyif='talloc', implied_deps='replace talloc'):
- conf.define('USING_SYSTEM_TEVENT', 1)
+ conf.env.standalone_tevent = conf.IN_LAUNCH_DIR()
+
+ if not conf.env.standalone_tevent:
+ if conf.CHECK_BUNDLED_SYSTEM('tevent', minversion=VERSION,
+ onlyif='talloc', implied_deps='replace talloc'):
+ conf.define('USING_SYSTEM_TEVENT', 1)
if conf.CHECK_FUNCS('epoll_create', headers='sys/epoll.h'):
conf.DEFINE('HAVE_EPOLL', 1)
@@ -54,6 +57,11 @@ def build(bld):
enabled= not bld.CONFIG_SET('USING_SYSTEM_TEVENT'),
vnum=VERSION)
+ if bld.env.standalone_tevent:
+ bld.env.PKGCONFIGDIR = '${LIBDIR}/pkgconfig'
+ bld.PKG_CONFIG_FILES('tevent.pc', vnum=VERSION)
+ bld.INSTALL_FILES('${INCLUDEDIR}', 'tevent.h')
+
def test(ctx):
'''test tevent'''
print("The tevent testsuite is part of smbtorture in samba4")
diff --git a/source4/build/make/rules.mk b/source4/build/make/rules.mk
index b922f7c..30622cc 100644
--- a/source4/build/make/rules.mk
+++ b/source4/build/make/rules.mk
@@ -53,7 +53,7 @@ clean:: clean_pch
@-rm -f bin/.*_*
@echo Removing generated files
@-rm -f bin/*_init_module.c
- @-rm -rf librpc/gen_*
+ @-rm -f librpc/gen_ndr/*.*
distclean:: clean
-rm -f include/config.h include/config_tmp.h include/build.h
diff --git a/source4/lib/ldb/wscript b/source4/lib/ldb/wscript
index d796bc0..ea0219f 100644
--- a/source4/lib/ldb/wscript
+++ b/source4/lib/ldb/wscript
@@ -37,12 +37,14 @@ def configure(conf):
s4_build = getattr(conf.env, '_SAMBA_BUILD_', 0) == 4
+ conf.env.standalone_ldb = conf.IN_LAUNCH_DIR()
if not s4_build:
- if conf.CHECK_BUNDLED_SYSTEM('ldb', minversion=VERSION,
- onlyif='talloc tdb tevent',
- implied_deps='replace talloc tdb tevent'):
- conf.define('USING_SYSTEM_LDB', 1)
+ if not conf.env.standalone_ldb:
+ if conf.CHECK_BUNDLED_SYSTEM('ldb', minversion=VERSION,
+ onlyif='talloc tdb tevent',
+ implied_deps='replace talloc tdb tevent'):
+ conf.define('USING_SYSTEM_LDB', 1)
# we need this for the ldap backend
if conf.CHECK_FUNCS_IN('ber_flush ldap_open', 'lber ldap', headers='lber.h ldap.h'):
conf.env.ENABLE_LDAP_BACKEND = True
--
Samba Shared Repository
More information about the samba-cvs
mailing list