3party/libzmq
0
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-03-09 15:26:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1602 from scemama/master

Browse Source 
Fixes issue #1556
This commit is contained in:
Constantin Rack 2015-10-07 22:30:53 +02:00
commit ca52520944
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
configure.ac
View File

@ -184,9 +184,6 @@ 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"
CPPFLAGS="$CPPFLAGS -Wno-long-long"
;; ;;
*freebsd*) *freebsd*)
# Define on FreeBSD to enable all library features # Define on FreeBSD to enable all library features
@ -420,7 +417,7 @@ fi
have_sodium_library="no" have_sodium_library="no"
AC_ARG_WITH([libsodium], [AS_HELP_STRING([--with-libsodium], AC_ARG_WITH([libsodium], [AS_HELP_STRING([--with-libsodium],
[require libzmq build with libsodium. Requires pkg-config [default=no]])], [require libzmq build with libsodium crypto library. Requires pkg-config [default=yes]])],
[require_libsodium_ext=$withval], [require_libsodium_ext=$withval],
[require_libsodium_ext=yes]) [require_libsodium_ext=yes])
@ -431,8 +428,17 @@ fi
if test "x$have_sodium_library" != "xno"; then if test "x$have_sodium_library" != "xno"; then
AC_DEFINE(HAVE_LIBSODIUM, 1, [The libsodium library is to be used.]) AC_DEFINE(HAVE_LIBSODIUM, 1, [The libsodium library is to be used.])
# ssp library is required for libsodium on Solaris-like systems
case "${host_os}" in
*solaris*)
LDFLAGS="-lssp $LDFLAGS"
CPPFLAGS="$CPPFLAGS -Wno-long-long"
;;
esac
fi fi
AM_CONDITIONAL(HAVE_SODIUM, test "x$have_sodium_library" != "xno") AM_CONDITIONAL(HAVE_SODIUM, test "x$have_sodium_library" != "xno")
# build using pgm # build using pgm