diff options
| author | Johan van Selst <johans@FreeBSD.org> | 2009-10-05 17:03:28 +0000 |
|---|---|---|
| committer | Johan van Selst <johans@FreeBSD.org> | 2009-10-05 17:03:28 +0000 |
| commit | a74d54845b471d8a6c75d0d685395aac7b2e7656 (patch) | |
| tree | 8d9912b734d793bf342b7e7d6ef6dfdc28e96a75 /security/xmlsec1 | |
| parent | d0bfb85ac2101830782c7a6156c3e6d16886ff37 (diff) | |
Fix build with GNUTLS option (auto-detection failed)
Notes
Notes:
svn path=/head/; revision=242495
Diffstat (limited to 'security/xmlsec1')
| -rw-r--r-- | security/xmlsec1/Makefile | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/security/xmlsec1/Makefile b/security/xmlsec1/Makefile index 6c0ba0edeafd..0b7ab6f56fec 100644 --- a/security/xmlsec1/Makefile +++ b/security/xmlsec1/Makefile @@ -63,6 +63,13 @@ LIB_DEPENDS+= gnutls:${PORTSDIR}/security/gnutls CONFIGURE_ARGS+= --without-gnutls .endif +.if defined(WITH_NSS) +CONFIGURE_ARGS+= --with-nss="${LOCALBASE}" --with-nspr="${LOCALBASE}" +LIB_DEPENDS+= nss3:${PORTSDIR}/security/nss +.else +CONFIGURE_ARGS+= --without-nss +.endif + CONFIGURE_ARGS+= --with-openssl="${OPENSSLBASE}" post-patch: @@ -85,16 +92,17 @@ post-patch: @${REINPLACE_CMD} \ -e 's,total_time.*/ 1000),total_time*1000/CLOCKS_PER_SEC,' \ ${WRKSRC}/apps/xmlsec.c +.if defined(WITH_GNUTLS) +# Don't rely on broken autodetection + @${REINPLACE_CMD} -e '/^GNUTLS_FOUND/s/no/yes/' \ + -e '/^GNUTLS_LIBS=/s,"","-L${LOCALBASE}/lib -lgnutls",' \ + ${WRKSRC}/${CONFIGURE_SCRIPT} +.endif .if defined(WITH_NSS) - # Makeing the xmlsec1 executable multi-threaded to let load -lnss, - # when needed. +# Makeing the xmlsec1 executable multi-threaded to let load -lnss, +# when needed. @${REINPLACE_CMD} -e 's,^\(xmlsec1_LDADD = \)\\$$,\1 -L${LOCALBASE}/lib ${PTHREAD_LIBS}\\,' \ ${WRKSRC}/apps/Makefile.in - -CONFIGURE_ARGS+= --with-nss="${LOCALBASE}" --with-nspr="${LOCALBASE}" -LIB_DEPENDS+= nss3:${PORTSDIR}/security/nss -.else -CONFIGURE_ARGS+= --without-nss .endif .include <bsd.port.post.mk> |