Skip to content

Commit 3734b68

Browse files
committed
Configure echo if openssl tests are enabled
1 parent e669277 commit 3734b68

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

configure.ac

+6-3
Original file line numberDiff line numberDiff line change
@@ -395,8 +395,8 @@ esac
395395

396396
if 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
415415
else
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
419420
fi
420421

421422
if test x"$set_bignum" = x"gmp"; then
@@ -503,6 +504,8 @@ echo "Build Options:"
503504
echo " with ecmult precomp = $set_precomp"
504505
echo " with external callbacks = $use_external_default_callbacks"
505506
echo " with benchmarks = $use_benchmark"
507+
echo " with tests = $use_tests"
508+
echo " with openssl tests = $enable_openssl_tests"
506509
echo " with coverage = $enable_coverage"
507510
echo " module ecdh = $enable_module_ecdh"
508511
echo " module recovery = $enable_module_recovery"

0 commit comments

Comments
 (0)