Commit Diff

Commit:
af5018021e44b18ee320ec23efdbf90039d40138
From:
Thomas Adam <thomas@xteddy.org>
Date:
Message:
portable: check for libcrypto unconditionally Don't exclude OpenBSD from checking for libcrypto; gotd still needs this.
Actions:
Patch | Tree
commit - 7e97fd319197d8a100a5de3f613a02253977b26b
commit + af5018021e44b18ee320ec23efdbf90039d40138
blob - b065fd4370af8bf8b2e9e1965d21cb5f905c12f0
blob + 18e3b9fa48ea95ade2ce6230d07557de4274bdcf
--- configure.ac
+++ configure.ac
@@ -759,20 +759,10 @@ AC_CHECK_DECL(
 	[#include <sys/tree.h>]
 )
 
-if test "x$PLATFORM" != "xopenbsd"; then
-PKG_CHECK_MODULES(
-	LIBTLS,
-	[libtls],
-	[
-		libtls_CFLAGS="$LIBTLS_CFLAGS"
-		libtls_LIBS="$LIBTLS_LIBS"
-		AC_SUBST(libtls_CFLAGS)
-		AC_SUBST(libtls_LIBS)
-	],
-	AC_MSG_ERROR(["*** Couldn't find libtls ***"])
-)
 
 # Look for crypto (part of openssl)
+# Note:  libcrypto (via openssl) has a .pc file in pretty-much all distros and
+# BSDs which we support.
 PKG_CHECK_MODULES(
 	LIBCRYPTO,
 	[libcrypto],
@@ -784,6 +774,19 @@ PKG_CHECK_MODULES(
 	],
 	AC_MSG_ERROR(["*** Couldn't find libcrypto ***"])
 )
+
+if test "x$PLATFORM" != "xopenbsd"; then
+PKG_CHECK_MODULES(
+	LIBTLS,
+	[libtls],
+	[
+		libtls_CFLAGS="$LIBTLS_CFLAGS"
+		libtls_LIBS="$LIBTLS_LIBS"
+		AC_SUBST(libtls_CFLAGS)
+		AC_SUBST(libtls_LIBS)
+	],
+	AC_MSG_ERROR(["*** Couldn't find libtls ***"])
+)
 fi
 
 # Look for __progname.