Attention is currently required from: flichtenheld.
Hello flichtenheld,
I'd like you to do a code review.
Please visit
http://gerrit.openvpn.net/c/openvpn/+/1085?usp=email
to review the following change.
Change subject: Do not check for pkcs11-helper when pkcs11 is not enabled
......................................................................
Do not check for pkcs11-helper when pkcs11 is not enabled
On my system with mac and homebrew this pulls in a version from homebrew
that adds OpenSSL paths/flags from homebrew as well. Those flags then
end up in various other locations.
Change-Id: I152577b7d9b3b3a0d298971f47ba412d3f43d50d
Signed-off-by: Arne Schwabe <a...@rfc2549.org>
---
M configure.ac
1 file changed, 8 insertions(+), 6 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/85/1085/1
diff --git a/configure.ac b/configure.ac
index 51c20ef..c1ee69c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -798,12 +798,14 @@
;;
esac
-PKG_CHECK_MODULES(
- [PKCS11_HELPER],
- [libpkcs11-helper-1 >= 1.11],
- [have_pkcs11_helper="yes"],
- []
-)
+if test "${enable_pkcs11}" = "yes"; then
+ PKG_CHECK_MODULES(
+ [PKCS11_HELPER],
+ [libpkcs11-helper-1 >= 1.11],
+ [have_pkcs11_helper="yes"],
+ []
+ )
+fi
if test "$enable_dco" != "no"; then
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1085?usp=email
To unsubscribe, or for help writing mail filters, visit
http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I152577b7d9b3b3a0d298971f47ba412d3f43d50d
Gerrit-Change-Number: 1085
Gerrit-PatchSet: 1
Gerrit-Owner: plaisthos <arne-open...@rfc2549.org>
Gerrit-Reviewer: flichtenheld <fr...@lichtenheld.com>
Gerrit-CC: openvpn-devel <openvpn-devel@lists.sourceforge.net>
Gerrit-Attention: flichtenheld <fr...@lichtenheld.com>
Gerrit-MessageType: newchange
_______________________________________________
Openvpn-devel mailing list
Openvpn-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openvpn-devel
