From 3858b5db8be50dda5d994ecc8863b32a150a2528 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 31 May 2010 02:43:17 +0200
Subject: s4-waf: sanitize library names like the old build system did, only
 add -samba4 suffix for libraries that are bundled.

---
 lib/popt/wscript   | 3 ++-
 lib/talloc/wscript | 4 ++--
 lib/tdb/wscript    | 2 +-
 lib/tevent/wscript | 3 ++-
 4 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'lib')

diff --git a/lib/popt/wscript b/lib/popt/wscript
index 425402ebe7..7d236dd336 100644
--- a/lib/popt/wscript
+++ b/lib/popt/wscript
@@ -14,5 +14,6 @@ def build(bld):
 
     bld.SAMBA_LIBRARY('popt',
                       source='findme.c popt.c poptconfig.c popthelp.c poptparse.c',
-                      cflags='-DDBL_EPSILON=__DBL_EPSILON__'
+                      cflags='-DDBL_EPSILON=__DBL_EPSILON__',
+					  is_bundled=True,
                       )
diff --git a/lib/talloc/wscript b/lib/talloc/wscript
index 3a875060d7..61930f67e3 100644
--- a/lib/talloc/wscript
+++ b/lib/talloc/wscript
@@ -60,14 +60,14 @@ def build(bld):
                           abi_file='ABI/talloc-%s.sigs' % VERSION,
                           abi_match='talloc* _talloc*',
                           hide_symbols=True,
-                          vnum=VERSION)
+                          vnum=VERSION, is_bundled=True)
 
         # should we also install the symlink to libtalloc1.so here?
         bld.SAMBA_LIBRARY('talloc-compat1',
                           'compat/talloc_compat1.c',
                           deps='talloc',
                           enabled = bld.env.TALLOC_COMPAT1,
-                          vnum=VERSION)
+                          vnum=VERSION, is_bundled=True)
 
     if not getattr(bld.env, '_SAMBA_BUILD_', 0) == 4:
         # s4 already has the talloc testsuite builtin to smbtorture
diff --git a/lib/tdb/wscript b/lib/tdb/wscript
index 70eb8cf5d0..084be40c8f 100644
--- a/lib/tdb/wscript
+++ b/lib/tdb/wscript
@@ -69,7 +69,7 @@ def build(bld):
                           abi_file='ABI/tdb-%s.sigs' % VERSION,
                           abi_match='tdb_*',
                           hide_symbols=True,
-                          vnum=VERSION)
+                          vnum=VERSION, is_bundled=not bld.env.standalone_tdb)
 
     bld.SAMBA_BINARY('tdbtorture',
                      'tools/tdbtorture.c',
diff --git a/lib/tevent/wscript b/lib/tevent/wscript
index e61133c2dc..46ac62066f 100644
--- a/lib/tevent/wscript
+++ b/lib/tevent/wscript
@@ -57,7 +57,8 @@ def build(bld):
                           enabled= not bld.CONFIG_SET('USING_SYSTEM_TEVENT'),
                           abi_file='ABI/tevent-%s.sigs' % VERSION,
                           abi_match='tevent_* _tevent_*',
-                          vnum=VERSION)
+                          vnum=VERSION, 
+						  is_bundled=not bld.env.standalone_tevent)
 
     if bld.env.standalone_tevent:
         bld.env.PKGCONFIGDIR = '${LIBDIR}/pkgconfig'
-- 
cgit