From e0c122119afea4c951c0c57144d26a473118c254 Mon Sep 17 00:00:00 2001 From: Reinhard Tartler Date: Wed, 14 Jun 2017 19:53:34 -0400 Subject: Fixup botched merge --- infrastructure/m4/ax_check_ssl.m4 | 4 ---- 1 file changed, 4 deletions(-) (limited to 'infrastructure/m4/ax_check_ssl.m4') diff --git a/infrastructure/m4/ax_check_ssl.m4 b/infrastructure/m4/ax_check_ssl.m4 index 1714080c..78b99f7e 100644 --- a/infrastructure/m4/ax_check_ssl.m4 +++ b/infrastructure/m4/ax_check_ssl.m4 @@ -27,12 +27,8 @@ AC_DEFUN([AX_CHECK_SSL], [ ax_check_ssl_found=yes AC_CHECK_HEADERS([openssl/ssl.h],, [ax_check_ssl_found=no]) -<<<<<<< HEAD - AC_CHECK_LIB([ssl], [SSL_read],, [ax_check_ssl_found=no], [-lcrypto]) -======= AC_SEARCH_LIBS([HMAC_CTX_init], [crypto]) AC_SEARCH_LIBS([SSL_read], [ssl],, [ax_check_ssl_found=no]) ->>>>>>> 0.12 if test "x$ax_check_ssl_found" = "xyes"; then AC_DEFINE([HAVE_SSL], 1, [Define to 1 if SSL is available]) -- cgit v1.2.3