Skip to content

Commit

Permalink
build: add checks for openssl configure options
Browse files Browse the repository at this point in the history
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: #12175
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
  • Loading branch information
danbev authored and italoacasas committed Apr 10, 2017
1 parent b495b6a commit a703bde
Showing 1 changed file with 9 additions and 0 deletions.
9 changes: 9 additions & 0 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -977,6 +977,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)

Expand Down

0 comments on commit a703bde

Please sign in to comment.