Problem: AM_CONDITIONAL is used incorrectly

Move AM_CONDITIONAL for --disable-curve outside of shell
conditional (per sec 20.1 of automake manual) and fix its
second argument to be a test rather than a literal zero.
This commit is contained in:
Jim Garlick 2016-03-02 11:24:35 -08:00
parent ec6209737e
commit 9d75a9c27d

View File

@ -430,7 +430,6 @@ AC_ARG_ENABLE([curve],
if test "x$enable_curve" == "xno"; then
curve_library=""
AC_MSG_NOTICE([CURVE security is disabled])
AM_CONDITIONAL(ENABLE_CURVE_KEYGEN, 0)
elif test "x$with_libsodium" == "xyes"; then
AC_MSG_NOTICE([Using libsodium for CURVE security])
@ -451,6 +450,7 @@ else
curve_library="tweetnacl"
fi
AM_CONDITIONAL(ENABLE_CURVE_KEYGEN, test "x$enable_curve" == "xyes")
AM_CONDITIONAL(USE_LIBSODIUM, test "$curve_library" == "libsodium")
AM_CONDITIONAL(USE_TWEETNACL, test "$curve_library" == "tweetnacl")