Commit aa84e851 authored by Matt Connolly's avatar Matt Connolly

Add '-lssp' linker flag for Solaris. Check for libraries after host specific setup.

parent 2af23cf4
...@@ -102,11 +102,6 @@ if test "x$zmq_search_libsodium_lib" = "xyes"; then ...@@ -102,11 +102,6 @@ if test "x$zmq_search_libsodium_lib" = "xyes"; then
fi fi
fi fi
# Checks for libraries
AC_CHECK_LIB([pthread], [pthread_create])
AC_CHECK_LIB([rt], [clock_gettime])
AC_CHECK_LIB([sodium], [sodium_init],,AC_MSG_WARN(libsodium is needed for CURVE security))
# Set pedantic # Set pedantic
libzmq_pedantic="yes" libzmq_pedantic="yes"
...@@ -161,6 +156,8 @@ case "${host_os}" in ...@@ -161,6 +156,8 @@ case "${host_os}" in
if test "x$solaris_has_atomic" = "xno"; then if test "x$solaris_has_atomic" = "xno"; then
AC_DEFINE(ZMQ_FORCE_MUTEXES, 1, [Force to use mutexes]) AC_DEFINE(ZMQ_FORCE_MUTEXES, 1, [Force to use mutexes])
fi fi
# ssp library is required for libsodium on Solaris-like systems
LDFLAGS="-lssp $LDFLAGS"
;; ;;
*freebsd*) *freebsd*)
# Define on FreeBSD to enable all library features # Define on FreeBSD to enable all library features
...@@ -254,6 +251,11 @@ case "${host_os}" in ...@@ -254,6 +251,11 @@ case "${host_os}" in
;; ;;
esac esac
# Checks for libraries
AC_CHECK_LIB([pthread], [pthread_create])
AC_CHECK_LIB([rt], [clock_gettime])
AC_CHECK_LIB([sodium], [sodium_init],,AC_MSG_WARN(libsodium is needed for CURVE security))
# #
# Check if the compiler supports -fvisibility=hidden flag. MinGW32 uses __declspec # Check if the compiler supports -fvisibility=hidden flag. MinGW32 uses __declspec
# #
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment