From 66208705c4d1fc279c6658708486495dc18be9f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johan=20Bergstr=C3=B6m?= Date: Fri, 3 Apr 2015 16:08:06 +1100 Subject: [PATCH] fixup! avoid adding libraries if shared is unset --- configure | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/configure b/configure index 9fec95808d71d4..e5cadccb2b11e5 100755 --- a/configure +++ b/configure @@ -632,7 +632,8 @@ def configure_node(o): def configure_libz(o): o['variables']['node_shared_zlib'] = b(options.shared_zlib) - o['libraries'] += ['-l%s' % options.shared_zlib_libname] + if b(options.shared_zlib) == True + o['libraries'] += ['-l%s' % options.shared_zlib_libname] if options.shared_zlib_libpath: o['libraries'] += ['-L%s' % options.shared_zlib_libpath] if options.shared_zlib_includes: @@ -641,8 +642,9 @@ def configure_libz(o): def configure_http_parser(o): o['variables']['node_shared_http_parser'] = b(options.shared_http_parser) - - o['libraries'] += ['-l%s' % options.shared_http_parser_libname] + + if b(options.shared_http_parser) == True + o['libraries'] += ['-l%s' % options.shared_http_parser_libname] if options.shared_http_parser_libpath: o['libraries'] += ['-L%s' % options.shared_http_parser_libpath] if options.shared_http_parser_includes: @@ -652,7 +654,8 @@ def configure_http_parser(o): def configure_libuv(o): o['variables']['node_shared_libuv'] = b(options.shared_libuv) - o['libraries'] += ['-l%s' % options.shared_libuv_libname] + if b(options.shared_libuv) == True + o['libraries'] += ['-l%s' % options.shared_libuv_libname] if options.shared_libuv_libpath: o['libraries'] += ['-L%s' % options.shared_libuv_libpath] else: