diff --git a/configure.ac b/configure.ac
index 96937d79eb..ebc284b47a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1052,8 +1052,7 @@ AM_CONDITIONAL(ENABLE_CLIENT, [test "${enable_client}" = yes])
 AM_CONDITIONAL(ENABLE_MANAGER, [ test "x${ac_cv_have_wxwidgets}" = xyes -a "${enable_manager}" = yes ])
 AM_CONDITIONAL(ENABLE_LIBRARIES, [test "${enable_libraries}" = yes])
 AM_CONDITIONAL(ENABLE_BOINCZIP, [test "${enable_boinczip}" = yes])
-AM_CONDITIONAL(ENABLE_BOINCCRYPT, [test "${enable_server}" = yes])
-AM_CONDITIONAL(ENABLE_BOINCCRYPT, [test "${enable_client}" = yes])
+AM_CONDITIONAL(ENABLE_BOINCCRYPT, [test "x${enable_server}" = xyes  || test "x${enable_client}" = xyes ])
 AM_CONDITIONAL(INSTALL_HEADERS, [test "${enable_install_headers}" = yes])
 AM_CONDITIONAL(HAVE_CUDA_LIB, [test "${enable_client}" = yes -a -f ./coprocs/CUDA/posix/${boinc_platform}/libcudart.so])