From 9393d53538298e8a919efb92965759789da84d9b Mon Sep 17 00:00:00 2001
From: Viktor Dukhovni <viktor@twosigma.com>
Date: Sat, 7 May 2016 02:36:34 -0400
Subject: [PATCH] Actually capture libcrypto autoconf results

Also infer lib path not just include path, and set rpath if not from /usr.
Also need libcrypto for test_rand.
---
 cf/Makefile.am.common   | 3 +++
 cf/crypto.m4            | 7 +++++++
 lib/hcrypto/Makefile.am | 2 +-
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/cf/Makefile.am.common b/cf/Makefile.am.common
index c0cddf6a0..a9ea71edd 100644
--- a/cf/Makefile.am.common
+++ b/cf/Makefile.am.common
@@ -45,6 +45,9 @@ LIB_tgetent		= @LIB_tgetent@
 LIB_com_err		= @LIB_com_err@
 LIB_door_create		= @LIB_door_create@
 
+LIB_openssl_crypto      = @LIB_openssl_crypto@
+INCLUDE_openssl_crypto  = @INCLUDE_openssl_crypto@
+
 HESIODLIB = @HESIODLIB@
 HESIODINCLUDE = @HESIODINCLUDE@
 INCLUDE_hesiod = @INCLUDE_hesiod@
diff --git a/cf/crypto.m4 b/cf/crypto.m4
index 44b77c1d0..c6f72561e 100644
--- a/cf/crypto.m4
+++ b/cf/crypto.m4
@@ -94,6 +94,8 @@ if test "$with_openssl" = "yes"; then
         with_openssl=/usr
 fi
 if test "$with_openssl" != "no"; then
+        saved_CFLAGS="${CFLAGS}"
+        saved_LDFLAGS="${LDFLAGS}"
 	INCLUDE_openssl_crypto=
 	LIB_openssl_crypto=
 	if test "$with_openssl_include" != ""; then
@@ -103,8 +105,11 @@ if test "$with_openssl" != "no"; then
 	fi
 	if test "$with_openssl_lib" != ""; then
 		LIB_openssl_crypto="-L${with_openssl_lib}"
+        elif test "${with_openssl}" != "/usr" -a -d "${with_openssl}/lib"; then
+                LIB_openssl_crypto="-L${with_openssl}/lib -Wl,-R,${with_openssl}/lib"
 	fi
 	CFLAGS="-DHAVE_HCRYPTO_W_OPENSSL -I${INCLUDE_openssl_crypto} ${CFLAGS}"
+        LDFLAGS="${LIB_openssl_crypto} ${LDFLAGS}"
         # XXX What about rpath?  Yeah...
         AC_CHECK_LIB([crypto], [OPENSSL_init],
                      [LIB_openssl_crypto="${LIB_openssl_crypto} -lcrypto"; openssl=yes], [openssl=no], [])
@@ -122,6 +127,8 @@ if test "$with_openssl" != "no"; then
                 AC_CHECK_LIB([crypto], [OPENSSL_init],
                              [LIB_openssl_crypto="${LIB_openssl_crypto} -lcrypto -ldl -lnsl -lsocket"; openssl=yes], [openssl=no], [-ldl -lnsl -lsocket])
         fi
+        CFLAGS="${saved_CFLAGS}"
+        LDFLAGS="${saved_LDFLAGS}"
 fi
 
 LIB_hcrypto='$(top_builddir)/lib/hcrypto/libhcrypto.la'
diff --git a/lib/hcrypto/Makefile.am b/lib/hcrypto/Makefile.am
index d2bb42494..6ef5cf9a4 100644
--- a/lib/hcrypto/Makefile.am
+++ b/lib/hcrypto/Makefile.am
@@ -99,7 +99,7 @@ check_SCRIPTS = $(SCRIPT_TESTS)
 
 TESTS = $(PROGRAM_TESTS) $(SCRIPT_TESTS)
 
-LDADD = $(lib_LTLIBRARIES) $(LIB_roken)
+LDADD = $(lib_LTLIBRARIES) $(LIB_roken) $(LIB_openssl_crypto)
 test_rand_LDADD = $(LDADD) -lm
 
 libhcrypto_la_SOURCES =	\