summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--nsswitch/libwbclient/wscript27
-rwxr-xr-xwscript1
2 files changed, 19 insertions, 9 deletions
diff --git a/nsswitch/libwbclient/wscript b/nsswitch/libwbclient/wscript
index f51c3d001f..6b9c99ced9 100644
--- a/nsswitch/libwbclient/wscript
+++ b/nsswitch/libwbclient/wscript
@@ -5,16 +5,27 @@ import Options, Logs
# Remember to also update wbclient.h
VERSION="0.9"
-def configure(conf):
- if conf.CHECK_BUNDLED_SYSTEM_PKG('wbclient', minversion=VERSION):
- conf.define('USING_SYSTEM_LIBWBCLIENT', 1)
+# It may be useful at some point to allow Samba to build against a
+# system libwbclient, such as the one provided by Likewise. To to
+# this, not only must the check below be activated but this must only
+# be activated with an off-by-default option to disable the internal
+# build of both winbindd implementations, and all the internal
+# references to libwbclient.h will need to be fixed to point at the
+# system libwbclient. Finally, as a system libwbclient would probably
+# not use the same version scheme as Samba, so this would need to
+# reference Likewise version numbers instead.
+#
+#def configure(conf):
+# if conf.CHECK_BUNDLED_SYSTEM_PKG('wbclient', minversion=VERSION):
+# 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")
+# 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='''
diff --git a/wscript b/wscript
index d1c7121700..f96327c90d 100755
--- a/wscript
+++ b/wscript
@@ -95,7 +95,6 @@ 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')