0
0
mirror of https://github.com/zeromq/libzmq.git synced 2024-12-27 15:41:05 +08:00

Merge pull request #1837 from obache/neatsrc/fix-test-portability

Problem: Fix unportable `==` operator for `test`
This commit is contained in:
Luca Boccassi 2016-03-04 09:41:15 +00:00
commit 693d6384b6

View File

@ -428,11 +428,11 @@ AS_IF([test "x$with_libsodium" = "xyes"], [
AC_ARG_ENABLE([curve],
[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=""
AC_MSG_NOTICE([CURVE security is disabled])
elif test "x$with_libsodium" == "xyes"; then
elif test "x$with_libsodium" = "xyes"; then
AC_MSG_NOTICE([Using libsodium for CURVE security])
AC_DEFINE(ZMQ_HAVE_CURVE, [1], [Using curve encryption])
AC_DEFINE(HAVE_LIBSODIUM, [1], [Using libsodium for curve encryption])
@ -451,9 +451,9 @@ 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")
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")
# build using pgm
have_pgm_library="no"