summaryrefslogtreecommitdiff
path: root/security/heimdal
diff options
context:
space:
mode:
authorobache <obache>2014-02-22 09:50:47 +0000
committerobache <obache>2014-02-22 09:50:47 +0000
commitd9e457d96f9eb947b57f4d6b1d9ed36c23751047 (patch)
treec0177b5e34afd71fa53eedfe16e35882ab357d8d /security/heimdal
parent26edbe30907b16338354ca25fdd1f71c01993702 (diff)
downloadpkgsrc-d9e457d96f9eb947b57f4d6b1d9ed36c23751047.tar.gz
Additionally check underlying builtin openssl for builtin detection.
It will be done in mk/buildlink3/bsd.buildlink3.mk later, but not for standalone builtin check (with CHECK_BUILTIN.heimdal=yes).
Diffstat (limited to 'security/heimdal')
-rw-r--r--security/heimdal/builtin.mk12
1 files changed, 10 insertions, 2 deletions
diff --git a/security/heimdal/builtin.mk b/security/heimdal/builtin.mk
index 68bb367c4fb..569efb0f155 100644
--- a/security/heimdal/builtin.mk
+++ b/security/heimdal/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.14 2013/11/23 12:10:13 obache Exp $
+# $NetBSD: builtin.mk,v 1.15 2014/02/22 09:50:47 obache Exp $
BUILTIN_PKG:= heimdal
@@ -72,9 +72,17 @@ MAKEVARS+= BUILTIN_PKG.heimdal
USE_BUILTIN.heimdal= no
. else
USE_BUILTIN.heimdal= ${IS_BUILTIN.heimdal}
+. if !empty(USE_BUILTIN.heimdal:M[yY][eE][sS])
+CHECK_BUILTIN.openssl:= yes
+. include "../../security/openssl/builtin.mk"
+CHECK_BUILTIN.openssl:= no
+. if !empty(USE_BUILTIN.openssl:M[Nn][Oo])
+USE_BUILTIN.heimdal= no
+. endif
+. endif
. if defined(BUILTIN_PKG.heimdal) && \
!empty(IS_BUILTIN.heimdal:M[yY][eE][sS])
-USE_BUILTIN.heimdal= yes
+USE_BUILTIN.heimdal?= yes
. for _dep_ in ${BUILDLINK_API_DEPENDS.heimdal}
. if !empty(USE_BUILTIN.heimdal:M[yY][eE][sS])
USE_BUILTIN.heimdal!= \