From 5c2a3cb25a8b0b1e1701a55c277e8ee165d4ffce Mon Sep 17 00:00:00 2001
From: Nicolas Williams <nico@twosigma.com>
Date: Wed, 30 Mar 2016 14:27:18 -0500
Subject: [PATCH] Always build hcrypto

---
 doc/Makefile.am | 2 --
 lib/Makefile.am | 5 +----
 lib/NTMakefile  | 5 +----
 3 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/doc/Makefile.am b/doc/Makefile.am
index bf301c40e..e79bd4856 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -65,9 +65,7 @@ vars.texi: vars.tin Makefile
 
 PROJECTS = base hdb hx509 gssapi krb5 ntlm wind 
 
-if !HAVE_OPENSSL
 PROJECTS += hcrypto
-endif
 
 doxyout doxygen: base.dxy hdb.dxy hx509.dxy hcrypto.dxy gssapi.dxy krb5.dxy ntlm.dxy wind.dxy
 	@find $(srcdir)/doxyout -type d ! -perm -200 -exec chmod u+w {} ';' ; \
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 53f220e76..055868dac 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -14,9 +14,6 @@ endif
 if COM_ERR
 dir_com_err = com_err
 endif
-if !HAVE_OPENSSL
-dir_hcrypto = hcrypto
-endif
 if !SQLITE3
 dir_sqlite = sqlite
 endif
@@ -34,7 +31,7 @@ SUBDIRS = \
 	wind \
 	asn1 \
 	$(dir_sqlite) \
-	$(dir_hcrypto) \
+	hcrypto \
 	ipc \
 	hx509 \
 	krb5 \
diff --git a/lib/NTMakefile b/lib/NTMakefile
index 4e7e2174c..f97c4c0d7 100644
--- a/lib/NTMakefile
+++ b/lib/NTMakefile
@@ -36,9 +36,6 @@ dir_otp = otp
 !ifdef DCE
 dir_dce = kdfs
 !endif
-!ifndef HAVE_OPENSSL
-dir_hcrypto = hcrypto
-!endif
 
 # Third party plugins must be added to the assembly
 # Permit third party assembly scripts
@@ -54,7 +51,7 @@ assembly=..\packages\windows\assembly
 !endif
 
 SUBDIRS = roken base vers com_err sl wind asn1 sqlite \
-	$(dir_hcrypto) hx509 krb5 heimdal ntlm kafs gssapi hdb \
+	hcrypto hx509 krb5 heimdal ntlm kafs gssapi hdb \
 	kadm5 $(dir_45) $(dir_otp) $(dir_dce) $(plugin) $(assembly)
 
 !include ../windows/NTMakefile.w32