From e8775226ad2e40b96d8d5aae6c31c5845c562f20 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Sun, 21 Mar 2010 11:04:57 +1100
Subject: build: added --disable-shared option

---
 buildtools/wafsamba/wafsamba.py | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

(limited to 'buildtools')

diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
index 7324f8ff48..bfe20ce5eb 100644
--- a/buildtools/wafsamba/wafsamba.py
+++ b/buildtools/wafsamba/wafsamba.py
@@ -79,10 +79,10 @@ def SAMBA_LIBRARY(bld, libname, source,
         SET_TARGET_TYPE(bld, libname, 'EMPTY')
         return
 
-    if not SET_TARGET_TYPE(bld, libname, 'LIBRARY'):
-        return
-
-    obj_target = libname + '.objlist'
+    if bld.env.DISABLE_SHARED:
+        obj_target = libname
+    else:
+        obj_target = libname + '.objlist'
 
     # first create a target for building the object files for this library
     # by separating in this way, we avoid recompiling the C files
@@ -99,6 +99,12 @@ def SAMBA_LIBRARY(bld, libname, source,
                         depends_on     = depends_on,
                         local_include  = local_include)
 
+    if bld.env.DISABLE_SHARED:
+        return
+
+    if not SET_TARGET_TYPE(bld, libname, 'LIBRARY'):
+        return
+
     # the library itself will depend on that object target
     deps += ' ' + public_deps
     deps = TO_LIST(deps)
@@ -283,7 +289,7 @@ def SAMBA_MODULE(bld, modname, source,
     # all disabled
     bld.ADD_INIT_FUNCTION(subsystem, modname, init_function)
 
-    if internal_module:
+    if internal_module or bld.env.DISABLE_SHARED:
         # treat internal modules as subsystems for now
         SAMBA_SUBSYSTEM(bld, modname, source,
                         deps=deps,
-- 
cgit