Skip to content

Commit 0d4226c

Browse files
configure: Use canonical variable prefix _enable consistently
1 parent 64b3497 commit 0d4226c

File tree

1 file changed

+25
-25
lines changed

1 file changed

+25
-25
lines changed

configure.ac

+25-25
Original file line numberDiff line numberDiff line change
@@ -116,8 +116,8 @@ SECP_TRY_APPEND_DEFAULT_CFLAGS(SECP_CFLAGS)
116116

117117
AC_ARG_ENABLE(benchmark,
118118
AS_HELP_STRING([--enable-benchmark],[compile benchmark [default=yes]]),
119-
[use_benchmark=$enableval],
120-
[use_benchmark=yes])
119+
[enable_benchmark=$enableval],
120+
[enable_benchmark=yes])
121121

122122
AC_ARG_ENABLE(coverage,
123123
AS_HELP_STRING([--enable-coverage],[enable compiler flags to support kcov coverage analysis [default=no]]),
@@ -126,23 +126,23 @@ AC_ARG_ENABLE(coverage,
126126

127127
AC_ARG_ENABLE(tests,
128128
AS_HELP_STRING([--enable-tests],[compile tests [default=yes]]),
129-
[use_tests=$enableval],
130-
[use_tests=yes])
129+
[enable_tests=$enableval],
130+
[enable_tests=yes])
131131

132132
AC_ARG_ENABLE(experimental,
133133
AS_HELP_STRING([--enable-experimental],[allow experimental configure options [default=no]]),
134-
[use_experimental=$enableval],
135-
[use_experimental=no])
134+
[enable_experimental=$enableval],
135+
[enable_experimental=no])
136136

137137
AC_ARG_ENABLE(exhaustive_tests,
138138
AS_HELP_STRING([--enable-exhaustive-tests],[compile exhaustive tests [default=yes]]),
139-
[use_exhaustive_tests=$enableval],
140-
[use_exhaustive_tests=yes])
139+
[enable_exhaustive_tests=$enableval],
140+
[enable_exhaustive_tests=yes])
141141

142142
AC_ARG_ENABLE(examples,
143143
AS_HELP_STRING([--enable-examples],[compile the examples [default=no]]),
144-
[use_examples=$enableval],
145-
[use_examples=no])
144+
[enable_examples=$enableval],
145+
[enable_examples=no])
146146

147147
AC_ARG_ENABLE(module_ecdh,
148148
AS_HELP_STRING([--enable-module-ecdh],[enable ECDH shared secret computation]),
@@ -166,8 +166,8 @@ AC_ARG_ENABLE(module_schnorrsig,
166166

167167
AC_ARG_ENABLE(external_default_callbacks,
168168
AS_HELP_STRING([--enable-external-default-callbacks],[enable external default callback functions [default=no]]),
169-
[use_external_default_callbacks=$enableval],
170-
[use_external_default_callbacks=no])
169+
[enable_external_default_callbacks=$enableval],
170+
[enable_external_default_callbacks=no])
171171

172172
# Test-only override of the (autodetected by the C code) "widemul" setting.
173173
# Legal values are int64 (for [u]int64_t), int128 (for [unsigned] __int128), and auto (the default).
@@ -257,14 +257,14 @@ else
257257
fi
258258

259259
# Select assembly optimization
260-
use_external_asm=no
260+
enable_external_asm=no
261261

262262
case $set_asm in
263263
x86_64)
264264
AC_DEFINE(USE_ASM_X86_64, 1, [Define this symbol to enable x86_64 assembly optimizations])
265265
;;
266266
arm)
267-
use_external_asm=yes
267+
enable_external_asm=yes
268268
;;
269269
no)
270270
;;
@@ -273,7 +273,7 @@ no)
273273
;;
274274
esac
275275

276-
if test x"$use_external_asm" = x"yes"; then
276+
if test x"$enable_external_asm" = x"yes"; then
277277
AC_DEFINE(USE_EXTERNAL_ASM, 1, [Define this symbol if an external (non-inline) assembly implementation is used])
278278
fi
279279

@@ -361,7 +361,7 @@ if test x"$enable_module_extrakeys" = x"yes"; then
361361
AC_DEFINE(ENABLE_MODULE_EXTRAKEYS, 1, [Define this symbol to enable the extrakeys module])
362362
fi
363363

364-
if test x"$use_external_default_callbacks" = x"yes"; then
364+
if test x"$enable_external_default_callbacks" = x"yes"; then
365365
AC_DEFINE(USE_EXTERNAL_DEFAULT_CALLBACKS, 1, [Define this symbol if an external implementation of the default callbacks is used])
366366
fi
367367

@@ -400,15 +400,15 @@ AC_SUBST(SECP_TEST_LIBS)
400400
AC_SUBST(SECP_TEST_INCLUDES)
401401
AC_SUBST(SECP_CFLAGS)
402402
AM_CONDITIONAL([ENABLE_COVERAGE], [test x"$enable_coverage" = x"yes"])
403-
AM_CONDITIONAL([USE_TESTS], [test x"$use_tests" != x"no"])
404-
AM_CONDITIONAL([USE_EXHAUSTIVE_TESTS], [test x"$use_exhaustive_tests" != x"no"])
405-
AM_CONDITIONAL([USE_EXAMPLES], [test x"$use_examples" != x"no"])
406-
AM_CONDITIONAL([USE_BENCHMARK], [test x"$use_benchmark" = x"yes"])
403+
AM_CONDITIONAL([USE_TESTS], [test x"$enable_tests" != x"no"])
404+
AM_CONDITIONAL([USE_EXHAUSTIVE_TESTS], [test x"$enable_exhaustive_tests" != x"no"])
405+
AM_CONDITIONAL([USE_EXAMPLES], [test x"$enable_examples" != x"no"])
406+
AM_CONDITIONAL([USE_BENCHMARK], [test x"$enable_benchmark" = x"yes"])
407407
AM_CONDITIONAL([ENABLE_MODULE_ECDH], [test x"$enable_module_ecdh" = x"yes"])
408408
AM_CONDITIONAL([ENABLE_MODULE_RECOVERY], [test x"$enable_module_recovery" = x"yes"])
409409
AM_CONDITIONAL([ENABLE_MODULE_EXTRAKEYS], [test x"$enable_module_extrakeys" = x"yes"])
410410
AM_CONDITIONAL([ENABLE_MODULE_SCHNORRSIG], [test x"$enable_module_schnorrsig" = x"yes"])
411-
AM_CONDITIONAL([USE_EXTERNAL_ASM], [test x"$use_external_asm" = x"yes"])
411+
AM_CONDITIONAL([USE_EXTERNAL_ASM], [test x"$enable_external_asm" = x"yes"])
412412
AM_CONDITIONAL([USE_ASM_ARM], [test x"$set_asm" = x"arm"])
413413
AM_CONDITIONAL([BUILD_WINDOWS], [test "$build_windows" = "yes"])
414414
AC_SUBST(LIB_VERSION_CURRENT, _LIB_VERSION_CURRENT)
@@ -424,11 +424,11 @@ AC_OUTPUT
424424

425425
echo
426426
echo "Build Options:"
427-
echo " with external callbacks = $use_external_default_callbacks"
428-
echo " with benchmarks = $use_benchmark"
429-
echo " with tests = $use_tests"
427+
echo " with external callbacks = $enable_external_default_callbacks"
428+
echo " with benchmarks = $enable_benchmark"
429+
echo " with tests = $enable_tests"
430430
echo " with coverage = $enable_coverage"
431-
echo " with examples = $use_examples"
431+
echo " with examples = $enable_examples"
432432
echo " module ecdh = $enable_module_ecdh"
433433
echo " module recovery = $enable_module_recovery"
434434
echo " module extrakeys = $enable_module_extrakeys"

0 commit comments

Comments
 (0)