From e9314adf4bcf5591d8fbd4fe038cf74b397eb3de Mon Sep 17 00:00:00 2001
From: Jakub Jelen <jjelen@redhat.com>
Date: Thu, 28 Jun 2018 13:40:27 +0200
Subject: [PATCH] Testsuite also depends on openssl, use correct variables for
 linking

---
 configure.ac                  | 31 +++++++++++++++++--------------
 src/tests/p11test/Makefile.am |  2 +-
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/configure.ac b/configure.ac
index 6abad0b7..290b513f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -527,20 +527,6 @@ AC_CHECK_HEADER([cmocka.h],, [have_cmocka="no"],
 #include <setjmp.h>
 ])
 
-if test "${enable_tests}" = "detect"; then
-	if test "${have_cmocka}" = "yes"; then
-		enable_tests="yes"
-	else
-		enable_tests="no"
-	fi
-fi
-
-if test "${enable_tests}" = "yes"; then
-	if test "${have_cmocka}" != "yes"; then
-		AC_MSG_ERROR([Tests required, but cmocka is not available])
-	fi
-fi
-
 AC_ARG_VAR([ZLIB_CFLAGS], [C compiler flags for zlib])
 AC_ARG_VAR([ZLIB_LIBS], [linker flags for zlib])
 if test -z "${ZLIB_LIBS}"; then
@@ -667,6 +653,23 @@ else
 	OPENSSL_LIBS=""
 fi
 
+if test "${enable_tests}" = "detect"; then
+	if test "${have_cmocka}" = "yes" -a "${have_openssl}" = "yes"; then
+		enable_tests="yes"
+	else
+		enable_tests="no"
+	fi
+fi
+
+if test "${enable_tests}" = "yes"; then
+	if test "${have_cmocka}" != "yes"; then
+		AC_MSG_ERROR([Tests required, but cmocka is not available])
+	fi
+	if test "${have_openssl}" != "yes"; then
+		AC_MSG_ERROR([Tests required, but openssl is not available])
+	fi
+fi
+
 
 
 PKG_CHECK_EXISTS([libeac], [PKG_CHECK_MODULES([OPENPACE], [libeac >= 0.9])],
diff --git a/src/tests/p11test/Makefile.am b/src/tests/p11test/Makefile.am
index 1ecc09af..a7e88f1b 100644
--- a/src/tests/p11test/Makefile.am
+++ b/src/tests/p11test/Makefile.am
@@ -23,7 +23,7 @@ p11test_SOURCES = p11test.c p11test_loader.c \
 	p11test_case_pss_oaep.c \
 	p11test_helpers.c
 p11test_CFLAGS = -DNDEBUG $(CMOCKA_CFLAGS)
-p11test_LDADD = -lssl -lcrypto $(CMOCKA_LIBS)
+p11test_LDADD = $(OPTIONAL_OPENSSL_LIBS) $(CMOCKA_LIBS)
 
 if WIN32
 p11test_SOURCES += $(top_builddir)/win32/versioninfo.rc