0
0
mirror of https://github.com/zeromq/libzmq.git synced 2024-12-31 01:43:02 +08:00

Merge pull request #914 from drewcrawford/issue_912

Libsodium is now required if and only if --with-libsodium is used
This commit is contained in:
Pieter Hintjens 2014-03-10 21:06:06 +01:00
commit e224be25dc
2 changed files with 7 additions and 1 deletions

View File

@ -37,6 +37,7 @@ Dhammika Pathirana <dhammika@gmail.com>
Dhruva Krishnamurthy <dhruva@ymail.com>
Dirk O. Kaar <dok@dok-net.net>
Douglas Creager <douglas.creager@redjack.com>
Drew Crawford <drew@sealedabstract.com>
Erich Heine <sophacles@gmail.com>
Erik Hugne <erik.hugne@ericsson.com>
Erik Rigtorp <erik@rigtorp.com>

View File

@ -299,7 +299,12 @@ esac
# Checks for libraries
AC_CHECK_LIB([pthread], [pthread_create])
AC_CHECK_LIB([rt], [clock_gettime])
if test "x$zmq_search_libsodium" = "xyes"; then
AC_CHECK_LIB([sodium], [sodium_init],,AC_MSG_ERROR(libsodium is not installed. Install it or don't pass --with-libsodium to configure script))
else
AC_CHECK_LIB([sodium], [sodium_init],,AC_MSG_WARN(libsodium is needed for CURVE security))
fi
#
# Check if the compiler supports -fvisibility=hidden flag. MinGW32 uses __declspec