395395
396396if test x"$use_tests" = x"yes"; then
397397 SECP_OPENSSL_CHECK
398- if test x"$has_openssl_ec" = x"yes"; then
399- if test x"$ enable_openssl_tests" != x"no"; then
398+ if test x"$enable_openssl_tests" != x"no" && test x"$ has_openssl_ec" = x"yes"; then
399+ enable_openssl_tests=yes
400400 AC_DEFINE ( ENABLE_OPENSSL_TESTS , 1 , [ Define this symbol if OpenSSL EC functions are available] )
401401 SECP_TEST_INCLUDES="$SSL_CFLAGS $CRYPTO_CFLAGS $CRYPTO_CPPFLAGS"
402402 SECP_TEST_LIBS="$CRYPTO_LIBS"
@@ -406,16 +406,17 @@ if test x"$use_tests" = x"yes"; then
406406 SECP_TEST_LIBS="$SECP_TEST_LIBS -lgdi32"
407407 ;;
408408 esac
409- fi
410409 else
411410 if test x"$enable_openssl_tests" = x"yes"; then
412411 AC_MSG_ERROR ( [ OpenSSL tests requested but OpenSSL with EC support is not available] )
413412 fi
413+ enable_openssl_tests=no
414414 fi
415415else
416416 if test x"$enable_openssl_tests" = x"yes"; then
417417 AC_MSG_ERROR ( [ OpenSSL tests requested but tests are not enabled] )
418418 fi
419+ enable_openssl_tests=no
419420fi
420421
421422if test x"$set_bignum" = x"gmp"; then
@@ -503,6 +504,8 @@ echo "Build Options:"
503504echo " with ecmult precomp = $set_precomp"
504505echo " with external callbacks = $use_external_default_callbacks"
505506echo " with benchmarks = $use_benchmark"
507+ echo " with tests = $use_tests"
508+ echo " with openssl tests = $enable_openssl_tests"
506509echo " with coverage = $enable_coverage"
507510echo " module ecdh = $enable_module_ecdh"
508511echo " module recovery = $enable_module_recovery"
0 commit comments