summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Schneider <asn@samba.org>2012-04-17 12:34:48 +0200
committerAndreas Schneider <asn@cryptomilk.org>2012-04-17 16:17:35 +0200
commit2c49782dc1069eebc9f5a5cd2a055b5912665595 (patch)
tree47eb531f8266952d122cc02fa57408879fb5c3b6
parente3ffb31554927a24df35576bd753ee4eb2dc2a3c (diff)
downloadsamba-2c49782dc1069eebc9f5a5cd2a055b5912665595.tar.gz
waf: Add possibility to build with system libwbclient.
-rw-r--r--nsswitch/libwbclient/wscript28
-rw-r--r--nsswitch/libwbclient/wscript_build9
-rwxr-xr-xwscript1
3 files changed, 29 insertions, 9 deletions
diff --git a/nsswitch/libwbclient/wscript b/nsswitch/libwbclient/wscript
new file mode 100644
index 0000000000..8390af19e5
--- /dev/null
+++ b/nsswitch/libwbclient/wscript
@@ -0,0 +1,28 @@
+#!/usr/bin/env python
+
+import Options, Logs
+
+def configure(conf):
+ if conf.CHECK_BUNDLED_SYSTEM_PKG('wbclient', minversion='0'):
+ conf.define('USING_SYSTEM_LIBWBCLIENT', 1)
+
+def build(bld):
+ if bld.CONFIG_SET('USING_SYSTEM_LIBWBCLIENT'):
+ Logs.info("\tSelected system libwbclient build")
+ return
+
+ Logs.info("\tSelected embedded libwbclient build")
+
+ bld.SAMBA_LIBRARY('wbclient',
+ source='''
+ wbc_guid.c
+ wbc_idmap.c
+ wbclient.c
+ wbc_pam.c
+ wbc_pwd.c
+ wbc_sid.c
+ wbc_util.c''',
+ deps='winbind-client',
+ pc_files='wbclient.pc',
+ public_headers='wbclient.h',
+ vnum='0')
diff --git a/nsswitch/libwbclient/wscript_build b/nsswitch/libwbclient/wscript_build
deleted file mode 100644
index 2b7fc08a33..0000000000
--- a/nsswitch/libwbclient/wscript_build
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/env python
-
-bld.SAMBA_LIBRARY('wbclient',
- source='wbc_guid.c wbc_idmap.c wbclient.c wbc_pam.c wbc_pwd.c wbc_sid.c wbc_util.c',
- deps='winbind-client',
- pc_files='wbclient.pc',
- public_headers='wbclient.h',
- vnum='0'
- )
diff --git a/wscript b/wscript
index f96327c90d..d1c7121700 100755
--- a/wscript
+++ b/wscript
@@ -95,6 +95,7 @@ def configure(conf):
conf.RECURSE('source4/auth')
conf.RECURSE('lib/nss_wrapper')
conf.RECURSE('nsswitch')
+ conf.RECURSE('nsswitch/libwbclient')
conf.RECURSE('lib/socket_wrapper')
conf.RECURSE('lib/uid_wrapper')
conf.RECURSE('lib/popt')