diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2021-04-23 10:04:29 +0200 |
|---|---|---|
| committer | Thorsten Behrens <thorsten.behrens@allotropia.de> | 2021-05-05 21:14:30 +0200 |
| commit | 013ddc4f5307df512767ca23b3922540b2b36d52 (patch) | |
| tree | 2bff87fd1dcdcd8dc99358ba1ddaee606dd38b08 /configure.ac | |
| parent | 983c41278899674028040c70c6e6415574b701f1 (diff) | |
Switch OPENSSL config var from negative to positive
- align with most of the rest of config_host
- rename DISABLE_OPENSSL to ENABLE_OPENSSL
- make this configurable
Change-Id: Ic3b41fcdda38db66134939f12265e0da24833d60
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114564
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index ae6fc04fb5d2..1b0521624ac2 100644 --- a/configure.ac +++ b/configure.ac @@ -10688,10 +10688,11 @@ fi dnl =================================================================== dnl Check for system openssl dnl =================================================================== -DISABLE_OPENSSL= +ENABLE_OPENSSL= AC_MSG_CHECKING([whether to disable OpenSSL usage]) if test "$enable_openssl" = "yes"; then AC_MSG_RESULT([no]) + ENABLE_OPENSSL=TRUE if test "$_os" = Darwin ; then # OpenSSL is deprecated when building for 10.7 or later. # @@ -10719,16 +10720,15 @@ if test "$enable_openssl" = "yes"; then fi else AC_MSG_RESULT([yes]) - DISABLE_OPENSSL=TRUE # warn that although OpenSSL is disabled, system libraries may depend on it AC_MSG_WARN([OpenSSL has been disabled. No code compiled here will make use of it but system libraries may create indirect dependencies]) add_warning "OpenSSL has been disabled. No code compiled here will make use of it but system libraries may create indirect dependencies" fi -AC_SUBST([DISABLE_OPENSSL]) +AC_SUBST([ENABLE_OPENSSL]) -if test "$enable_cipher_openssl_backend" = yes && test "$DISABLE_OPENSSL" = TRUE; then +if test "$enable_cipher_openssl_backend" = yes && test "$ENABLE_OPENSSL" != TRUE; then if test "$libo_fuzzed_enable_cipher_openssl_backend" = yes; then AC_MSG_NOTICE([Resetting --enable-cipher-openssl-backend=no]) enable_cipher_openssl_backend=no |