From bfbf43cc36ab360b34b49d7e07c2f594e2b7e7c9 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Sun, 28 Mar 2010 16:38:27 +1100 Subject: s4-waf: support the use of system libraries distros can set --bundled-libraries=NONE to force use of all system libraries. If the right version isn't found then configure will fail. Users may choose which libraries to use from the system, and which to use bundled libs. The default is to try system libs, and use them if their version matches the one in the source tree. --- buildtools/wafsamba/wscript | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'buildtools/wafsamba/wscript') diff --git a/buildtools/wafsamba/wscript b/buildtools/wafsamba/wscript index 315c3e58a9..1ff0fd3cb3 100644 --- a/buildtools/wafsamba/wscript +++ b/buildtools/wafsamba/wscript @@ -12,7 +12,7 @@ def set_options(opt): opt.tool_options('gnu_dirs') opt.add_option('--bundled-libraries', - help=("list of bundled libraries. Can be 'NONE' or 'ALL' [auto]"), + help=("comma separated list of bundled libraries. May include !LIBNAME to disable bundling a library. Can be 'NONE' or 'ALL' [auto]"), action="store", dest='BUNDLED_LIBS', default='') extension_default = Options.options['BUNDLED_EXTENSION_DEFAULT'] @@ -22,12 +22,12 @@ def set_options(opt): extension_exception = Options.options['BUNDLED_EXTENSION_EXCEPTION'] opt.add_option('--bundled-extension-exception', - help=("list of libraries to not apply extension to [%s]" % extension_exception), + help=("comman separated list of libraries to not apply extension to [%s]" % extension_exception), action="store", dest='BUNDLED_EXTENSION_EXCEPTION', default=extension_exception) builtin_defauilt = Options.options['BUILTIN_LIBRARIES_DEFAULT'] opt.add_option('--builtin-libraries', - help=("list of libraries to build directly into binaries [%s]" % builtin_defauilt), + help=("command separated list of libraries to build directly into binaries [%s]" % builtin_defauilt), action="store", dest='BUILTIN_LIBRARIES', default=builtin_defauilt) opt.add_option('--libdir', -- cgit