summaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorDaniel Bevenius <daniel.bevenius@gmail.com>2017-04-03 07:49:59 +0200
committerMyles Borins <mylesborins@google.com>2017-04-18 20:02:25 -0400
commit986ef6fffa39c37ccc8ebecbc4630f924b8bf0d3 (patch)
treedcb06156276bf65b9e1cc3de43c312943e523aa1 /configure
parentc2c467e24255c04c417fe0fec7d0759d001bf7cc (diff)
downloadnode-new-986ef6fffa39c37ccc8ebecbc4630f924b8bf0d3.tar.gz
build: add checks for openssl configure options
Currently it is possible to configure using --without-ssl and --shared-openssl/--openssl-no-asm/openssl-fips without an error occuring. The commit add check for these combinations: $ ./configure --without-ssl --shared-openssl Error: --without-ssl is incompatible with --shared-openssl $ ./configure --without-ssl --openssl-no-asm Error: --without-ssl is incompatible with --openssl-no-asm $ ./configure --without-ssl --openssl-fips=dummy Error: --without-ssl is incompatible with --openssl-fips PR-URL: https://github.com/nodejs/node/pull/12175 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure9
1 files changed, 9 insertions, 0 deletions
diff --git a/configure b/configure
index 3204822196..c8996b0b4a 100755
--- a/configure
+++ b/configure
@@ -965,6 +965,15 @@ def configure_openssl(o):
if options.without_ssl:
+ def without_ssl_error(option):
+ print('Error: --without-ssl is incompatible with %s' % option)
+ exit(1)
+ if options.shared_openssl:
+ without_ssl_error('--shared-openssl')
+ if options.openssl_no_asm:
+ without_ssl_error('--openssl-no-asm')
+ if options.openssl_fips:
+ without_ssl_error('--openssl-fips')
return
configure_library('openssl', o)