From d33b3911b1b53511f83850722bc6fd19d237638a Mon Sep 17 00:00:00 2001
From: Jason Volk <jason@zemos.net>
Date: Mon, 18 Feb 2019 15:45:50 -0800
Subject: [PATCH] configure: Check for openssl-1.0/ directory before openssl/.

---
 configure.ac | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/configure.ac b/configure.ac
index 69c0d93fb..2fef734aa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -948,16 +948,22 @@ dnl OpenSSL support
 dnl
 dnl
 
-RB_CHK_SYSHEADER(openssl/err.h,    [OPENSSL_ERR_H])
-RB_CHK_SYSHEADER(openssl/sha.h,    [OPENSSL_SHA_H])
-RB_CHK_SYSHEADER(openssl/hmac.h,   [OPENSSL_HMAC_H])
-RB_CHK_SYSHEADER(openssl/ssl.h,    [OPENSSL_SSL_H])
-RB_CHK_SYSHEADER(openssl/ec.h,     [OPENSSL_EC_H])
-RB_CHK_SYSHEADER(openssl/rsa.h,    [OPENSSL_RSA_H])
-RB_CHK_SYSHEADER(openssl/x509.h,   [OPENSSL_X509_H])
-RB_CHK_SYSHEADER(openssl/evp.h,    [OPENSSL_EVP_H])
-RB_CHK_SYSHEADER(openssl/ripemd.h, [OPENSSL_RIPEMD_H])
-RB_CHK_SYSHEADER(openssl/dh.h,     [OPENSSL_DH_H])
+AC_DEFUN([RB_CHK_OPENSSL_HEADER],
+[
+	RB_CHK_SYSHEADER([openssl-1.0/$1], [[OPENSSL_$2]])
+	RB_CHK_SYSHEADER([openssl/$1], [[OPENSSL_$2]])
+])
+
+RB_CHK_OPENSSL_HEADER(err.h, [ERR_H])
+RB_CHK_OPENSSL_HEADER(sha.h, [SHA_H])
+RB_CHK_OPENSSL_HEADER(hmac.h, [HMAC_H])
+RB_CHK_OPENSSL_HEADER(ssl.h, [SSL_H])
+RB_CHK_OPENSSL_HEADER(ec.h, [EC_H])
+RB_CHK_OPENSSL_HEADER(rsa.h, [RSA_H])
+RB_CHK_OPENSSL_HEADER(x509.h, [X509_H])
+RB_CHK_OPENSSL_HEADER(evp.h, [EVP_H])
+RB_CHK_OPENSSL_HEADER(ripemd.h, [RIPEMD_H])
+RB_CHK_OPENSSL_HEADER(dh.h, [DH_H])
 
 AC_CHECK_LIB(ssl, SSL_version,
 [