generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-11-04 12:17:39 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1834 from garlick/config_nacl

Browse Source 
minor automake fixes plus tweetnacl logic change
This commit is contained in:
Pieter Hintjens
2016-03-02 23:16:25 +01:00
parent ec6209737e 54389fefb5
commit 36abdf7bd5
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
configure.ac
View File

@@ -416,7 +416,7 @@ fi
# To disable curve, use --disable-curve # To disable curve, use --disable-curve
AC_ARG_WITH([libsodium], AC_ARG_WITH([libsodium],
AS_HELP_STRING([--with-libsodium], [use libsodium instead of built-in tweetnacl [default=no]])) [AS_HELP_STRING([--with-libsodium], [use libsodium instead of built-in tweetnacl [default=no]])])
AS_IF([test "x$with_libsodium" = "xyes"], [ AS_IF([test "x$with_libsodium" = "xyes"], [
PKG_CHECK_MODULES([sodium], [libsodium], [libsodium_found=yes], [ PKG_CHECK_MODULES([sodium], [libsodium], [libsodium_found=yes], [
@@ -425,12 +425,11 @@ AS_IF([test "x$with_libsodium" = "xyes"], [
]) ])
AC_ARG_ENABLE([curve], AC_ARG_ENABLE([curve],
AS_HELP_STRING([--disable-curve], [disable CURVE security [default=no]])) [AS_HELP_STRING([--disable-curve], [disable CURVE security [default=no]])])
if test "x$enable_curve" == "xno"; then if test "x$enable_curve" == "xno"; then
curve_library="" curve_library=""
AC_MSG_NOTICE([CURVE security is disabled]) AC_MSG_NOTICE([CURVE security is disabled])
AM_CONDITIONAL(ENABLE_CURVE_KEYGEN, 0)
elif test "x$with_libsodium" == "xyes"; then elif test "x$with_libsodium" == "xyes"; then
AC_MSG_NOTICE([Using libsodium for CURVE security]) AC_MSG_NOTICE([Using libsodium for CURVE security])
@@ -451,6 +450,7 @@ else
curve_library="tweetnacl" curve_library="tweetnacl"
fi fi
AM_CONDITIONAL(ENABLE_CURVE_KEYGEN, test "x$enable_curve" == "xyes")
AM_CONDITIONAL(USE_LIBSODIUM, test "$curve_library" == "libsodium") AM_CONDITIONAL(USE_LIBSODIUM, test "$curve_library" == "libsodium")
AM_CONDITIONAL(USE_TWEETNACL, test "$curve_library" == "tweetnacl") AM_CONDITIONAL(USE_TWEETNACL, test "$curve_library" == "tweetnacl")