From 85299bea65e152b4423ee40dd7f241189d52c6af Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Fri, 17 Dec 2010 18:42:34 +0100
Subject: heimdal_build: Simplify library handling.

---
 source4/heimdal_build/wscript_build | 29 ++++++++++++-----------------
 1 file changed, 12 insertions(+), 17 deletions(-)

(limited to 'source4')

diff --git a/source4/heimdal_build/wscript_build b/source4/heimdal_build/wscript_build
index 16af81acc3..77165e61a8 100644
--- a/source4/heimdal_build/wscript_build
+++ b/source4/heimdal_build/wscript_build
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-import os, Utils, Build
+import os, Utils
 from samba_utils import SET_TARGET_TYPE
 from samba_autoconf import CURRENT_CFLAGS
 
@@ -202,10 +202,7 @@ def HEIMDAL_GENERATOR(name, rule, source='', target='',
         name=name)
 
 
-def HEIMDAL_LIBRARY(libname, source, deps, vnum,
-                  includes='',
-                  cflags='',
-                  private_library=True):
+def HEIMDAL_LIBRARY(libname, source, deps, vnum, includes='', cflags=''):
     '''define a Heimdal library'''
 
     obj_target = libname + '.objlist'
@@ -229,16 +226,14 @@ def HEIMDAL_LIBRARY(libname, source, deps, vnum,
 
     ldflags = []
 
-    if not private_library:
-        # Sanitize the library name
-        bundled_name = libname.lower().replace('_', '-')
-        while bundled_name.startswith("lib"):
-            bundled_name = bundled_name[3:]
-        version = "%s_%s" % (Utils.g_module.APPNAME, Utils.g_module.VERSION.split(".")[0])
-    else:
+    # FIXME: When building upstream heimdal, we should not be adding this
+    # suffix.
+    bundled_build = True
+    if bundled_build:
         bundled_name = libname + '-samba4'
-        vnum = Utils.g_module.VERSION[0]
-        version = "%s_%s" % (Utils.g_module.APPNAME, Utils.g_module.VERSION)
+    else:
+        bundled_name = libname
+    version = "%s_%s" % (Utils.g_module.APPNAME, Utils.g_module.VERSION)
 
     if bld.env.HAVE_LD_VERSION_SCRIPT:
         vscript = "%s.vscript" % libname
@@ -262,9 +257,9 @@ def HEIMDAL_LIBRARY(libname, source, deps, vnum,
         vnum            = vnum,
         install_path    = None,
         name            = libname,
-        ldflags		= ldflags,
-        vars		= [version],
-        private_library = private_library
+        ldflags         = ldflags,
+        vars            = [version],
+        private_library = bundled_build,
         )
 
 
-- 
cgit