waf: Add possibility to build with system libwbclient.

diff --git a/nsswitch/libwbclient/wscript b/nsswitch/libwbclient/wscript
new file mode 100644 (file)
index 0000000..8390af1
--- /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 (file)
index 2b7fc08..0000000
--- 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 f96327c90d73bfbfc060d78f881184e39539a264..d1c71217002f19c350a1f6f6648b1cc37fc08ba1 100755 (executable)
--- 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')