aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlloyd <[email protected]>2013-01-30 15:17:28 +0000
committerlloyd <[email protected]>2013-01-30 15:17:28 +0000
commit8270e41a6510f5988a1c53cbffe2c525e630705b (patch)
tree6634fd1c0422c50ec31cf462c9da0788ef234c95
parent806c5462adf9e836cdb48448defbc5f68ade51cf (diff)
Document --link-method and make it obvious what it controls
-rwxr-xr-xconfigure.py13
1 files changed, 7 insertions, 6 deletions
diff --git a/configure.py b/configure.py
index c17f5db07..980b22684 100755
--- a/configure.py
+++ b/configure.py
@@ -274,6 +274,11 @@ def process_command_line(args):
metavar='DIR', default='',
help='setup the build in DIR')
+ build_group.add_option('--link-method',
+ default=None,
+ metavar='METHOD',
+ help='choose how links are created')
+
build_group.add_option('--makefile-style', metavar='STYLE', default=None,
help='choose a makefile style (unix or nmake)')
@@ -313,10 +318,6 @@ def process_command_line(args):
action='store_false', default=True,
help=optparse.SUPPRESS_HELP)
- build_group.add_option('--link-method',
- default=None,
- help=optparse.SUPPRESS_HELP)
-
wrapper_group = optparse.OptionGroup(parser, 'Wrapper options')
wrapper_group.add_option('--with-boost-python', dest='boost_python',
@@ -1391,7 +1392,7 @@ def setup_build(build_config, options, template_vars):
if req_method is None or req_method == method:
return method
- logging.info('Could not use requested link method %s' % (req_method))
+ logging.warning('Could not use requested link method "%s", defaulting to copy' % (req_method))
return 'copy'
"""
@@ -1490,7 +1491,7 @@ def setup_build(build_config, options, template_vars):
f.close()
link_method = choose_link_method(options.link_method)
- logging.info('Using %s to link files into build directory' % (link_method))
+ logging.info('Using %s to link files into build directory (use --link-method to change)' % (link_method))
def link_headers(header_list, type, dir):
logging.debug('Linking %d %s header files in %s' % (