Problem: curve keygen build cannot be switched off

This commit is contained in:
Florian Ebeling 2015-02-07 15:30:32 +01:00
parent 2d59594a3a
commit 54b56210ad
2 changed files with 10 additions and 0 deletions

View File

@ -282,10 +282,12 @@ perf_inproc_thr_LDADD = src/libzmq.la
perf_inproc_thr_SOURCES = perf/inproc_thr.cpp perf_inproc_thr_SOURCES = perf/inproc_thr.cpp
endif endif
if ENABLE_CURVE_KEYGEN
bin_PROGRAMS = tools/curve_keygen bin_PROGRAMS = tools/curve_keygen
tools_curve_keygen_LDADD = src/libzmq.la tools_curve_keygen_LDADD = src/libzmq.la
tools_curve_keygen_SOURCES = tools/curve_keygen.cpp tools_curve_keygen_SOURCES = tools/curve_keygen.cpp
endif
# #
# tests # tests

View File

@ -354,6 +354,14 @@ AC_ARG_ENABLE([perf],
AM_CONDITIONAL(ENABLE_PERF, test "x$zmq_enable_perf" = "xyes") AM_CONDITIONAL(ENABLE_PERF, test "x$zmq_enable_perf" = "xyes")
# Conditionally build curve key generation tool
AC_ARG_ENABLE([curve-keygen],
[AS_HELP_STRING([--enable-curve-keygen], [Build curve key-generation tool [default=yes].])],
[zmq_enable_curve_keygen=$enableval],
[zmq_enable_curve_keygen=yes])
AM_CONDITIONAL(ENABLE_CURVE_KEYGEN, test "x$zmq_enable_curve_keygen" = "xyes")
# Use c++ in subsequent tests # Use c++ in subsequent tests
AC_LANG_PUSH(C++) AC_LANG_PUSH(C++)