diff options
| -rw-r--r-- | buildtools/wafsamba/samba_bundled.py | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/buildtools/wafsamba/samba_bundled.py b/buildtools/wafsamba/samba_bundled.py index 27234fb055..2e3e1300e3 100644 --- a/buildtools/wafsamba/samba_bundled.py +++ b/buildtools/wafsamba/samba_bundled.py @@ -6,13 +6,11 @@ from samba_utils import * def PRIVATE_NAME(bld, name, private_extension, private_library): '''possibly rename a library to include a bundled extension''' - if bld.env.DISABLE_SHARED or not private_extension: - return name - if name in bld.env.PRIVATE_EXTENSION_EXCEPTION and not private_library: - return name - extension = getattr(bld.env, 'PRIVATE_EXTENSION', '') - if extension: - return name + '-' + extension + + # we now use the same private name for libraries as the public name. + # see http://git.samba.org/?p=tridge/junkcode.git;a=tree;f=shlib for a + # demonstration that this is the right thing to do + # also see http://lists.samba.org/archive/samba-technical/2011-January/075816.html return name |