diff options
author | Andrew Bartlett <abartlet@samba.org> | 2012-04-23 15:00:47 +1000 |
---|---|---|
committer | Andrew Bartlett <abartlet@samba.org> | 2012-04-23 20:48:02 +1000 |
commit | c45f2508d5a7445df86d01400f14463ea8346a2a (patch) | |
tree | e16fbee77158b6d0679741fd76f99e61404f6472 /nsswitch/libwbclient | |
parent | df27ba3e8b8a96c64b3966f2474391e5ec3cdec1 (diff) | |
download | samba-c45f2508d5a7445df86d01400f14463ea8346a2a.tar.gz samba-c45f2508d5a7445df86d01400f14463ea8346a2a.tar.bz2 samba-c45f2508d5a7445df86d01400f14463ea8346a2a.zip |
build: Remove support for system libwbclient
This effectively reverts commit 2c49782dc1069eebc9f5a5cd2a055b5912665595
This also adds explaination about what would need to be done to
support a system libwbclient
Andrew Bartlett
Diffstat (limited to 'nsswitch/libwbclient')
-rw-r--r-- | nsswitch/libwbclient/wscript | 27 |
1 files changed, 19 insertions, 8 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=''' |