meson: consistenlty spell 'CommonCrypto'

The 'CommonCrypto' backend can be specified as HTTPS and SHA1 backends,
but the value that one needs to use is inconsistent across those two
build options. Unify it to 'CommonCrypto'.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/meson.build b/meson.build
index 0064eb6..9da58da 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -1367,7 +1367,7 @@ if sha1_backend == 'sha1dc'
     'sha1dc/sha1.c',
     'sha1dc/ubc_check.c',
   ]
-elif sha1_backend == 'common-crypto'
+elif sha1_backend == 'CommonCrypto'
   libgit_c_args += '-DCOMMON_DIGEST_FOR_OPENSSL'
   libgit_c_args += '-DSHA1_APPLE'
   # Apple CommonCrypto requires chunking

diff --git a/meson_options.txt b/meson_options.txt
index 4be7eab..a7f308d 100644 (file)
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -49,7 +49,7 @@ option('regex', type: 'feature', value: 'auto',
 # Backends.
 option('https_backend', type: 'combo', value: 'auto', choices: ['auto', 'openssl', 'CommonCrypto', 'none'],
   description: 'The HTTPS backend to use when connecting to remotes.')
-option('sha1_backend', type: 'combo', choices: ['openssl', 'block', 'sha1dc', 'common-crypto'], value: 'sha1dc',
+option('sha1_backend', type: 'combo', choices: ['openssl', 'block', 'sha1dc', 'CommonCrypto'], value: 'sha1dc',
   description: 'The backend used for hashing objects with the SHA1 object format')
 option('sha256_backend', type: 'combo', choices: ['openssl', 'nettle', 'gcrypt', 'block'], value: 'block',
   description: 'The backend used for hashing objects with the SHA256 object format')