diff options
| author | Andrew Tridgell <tridge@samba.org> | 2010-03-28 14:10:15 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2010-04-06 20:27:12 +1000 |
| commit | 42c9380760de4e0ad3f69810b8d623b3a77cc692 (patch) | |
| tree | d7d7f486de0b7f15c0d5997baeb2387e26b79d4f | |
| parent | f6a7d5b90762fee39ae117dc2bf926eac0dbab8a (diff) | |
| download | samba-42c9380760de4e0ad3f69810b8d623b3a77cc692.tar.gz samba-42c9380760de4e0ad3f69810b8d623b3a77cc692.tar.bz2 samba-42c9380760de4e0ad3f69810b8d623b3a77cc692.zip | |
s4-waf: set the bundled library extension for some libs
| -rw-r--r-- | lib/tdb/wscript | 1 | ||||
| -rw-r--r-- | lib/tevent/wscript | 1 | ||||
| -rw-r--r-- | source4/lib/ldb/wscript | 11 | ||||
| -rw-r--r-- | source4/wscript | 15 |
4 files changed, 14 insertions, 14 deletions
diff --git a/lib/tdb/wscript b/lib/tdb/wscript index 39ea7b18d2..69db91f7e7 100644 --- a/lib/tdb/wscript +++ b/lib/tdb/wscript @@ -16,6 +16,7 @@ def set_options(opt): opt.recurse(LIBREPLACE_DIR) def configure(conf): + conf.BUNDLED_LIBRARY_EXTENSION('tdb') conf.sub_config(LIBREPLACE_DIR) conf.SAMBA_CONFIG_H() diff --git a/lib/tevent/wscript b/lib/tevent/wscript index 1ac503e31d..fba6bcee6b 100644 --- a/lib/tevent/wscript +++ b/lib/tevent/wscript @@ -17,6 +17,7 @@ def set_options(opt): opt.recurse(LIBTALLOC_DIR) def configure(conf): + conf.BUNDLED_LIBRARY_EXTENSION('tevent') conf.sub_config(LIBREPLACE_DIR) conf.sub_config(LIBTALLOC_DIR) diff --git a/source4/lib/ldb/wscript b/source4/lib/ldb/wscript index 4ba9c18a76..2cde5ee36a 100644 --- a/source4/lib/ldb/wscript +++ b/source4/lib/ldb/wscript @@ -17,6 +17,8 @@ def set_options(opt): opt.recurse(LIBTEVENT_DIR) def configure(conf): + conf.BUNDLED_LIBRARY_EXTENSION('ldb') + conf.sub_config(LIBTDB_DIR) conf.sub_config(LIBTEVENT_DIR) # where does the default LIBDIR end up? in conf.env somewhere? @@ -126,16 +128,9 @@ def build(bld): ldb_deps = 'tevent LIBLDB' if s4_build: - # the s4 build of ldb is really quite different from the normal build - # so we give the library a different name to prevent problems with apps - # that may depend on the distro version of ldb - lib_name = 'ldb-s4' - bld.TARGET_ALIAS(lib_name, 'ldb') ldb_deps += ' LDBSAMBA POPT_CREDENTIALS POPT_SAMBA LIBCMDLINE_CREDENTIALS gensec' - else: - lib_name = 'ldb' - bld.SAMBA_LIBRARY(lib_name, + bld.SAMBA_LIBRARY('ldb', COMMON_SRC + ' ' + LDB_MAP_SRC, deps=ldb_deps, includes='include', diff --git a/source4/wscript b/source4/wscript index 7cf82907f0..1320ceab57 100644 --- a/source4/wscript +++ b/source4/wscript @@ -21,16 +21,19 @@ def set_options(opt): opt.recurse('../pidl') def configure(conf): - conf.define('PACKAGE_NAME', 'samba') - conf.define('PACKAGE_STRING', 'samba 4') - conf.define('PACKAGE_TARNAME', 'samba') - conf.define('PACKAGE_URL', "") - conf.define('PACKAGE_VERSION', "4") - conf.define('PACKAGE_BUGREPORT', 'samba-technical@samba.org') + conf.DEFINE('PACKAGE_NAME', 'samba', quote=True) + conf.DEFINE('PACKAGE_STRING', 'samba 4', quote=True) + conf.DEFINE('PACKAGE_TARNAME', 'samba', quote=True) + conf.DEFINE('PACKAGE_URL', "http://www.samba.org/", quote=True) + conf.DEFINE('PACKAGE_VERSION', "4", quote=True) + conf.DEFINE('PACKAGE_BUGREPORT', 'http://bugzilla.samba.org/', quote=True) conf.DEFINE('CONFIG_H_IS_FROM_SAMBA', 1) conf.DEFINE('_SAMBA_BUILD_', 4, add_to_cflags=True) conf.DEFINE('HAVE_CONFIG_H', 1, add_to_cflags=True) + + conf.BUNDLED_LIBRARY_EXTENSION('s4') + if Options.options.developer: conf.ADD_CFLAGS('-DDEVELOPER -DDEBUG_PASSWORD') |