Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 25 Feb 2014 20:16:29 +0000 (UTC)
From:      Thierry Thomas <thierry@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r346071 - head/net-im/tox
Message-ID:  <201402252016.s1PKGTtQ096012@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: thierry
Date: Tue Feb 25 20:16:29 2014
New Revision: 346071
URL: http://svnweb.freebsd.org/changeset/ports/346071
QAT: https://qat.redports.org/buildarchive/r346071/

Log:
  Fix configure for default case.
  
  ${opt}_CONFIGURE_WITH does not work as I expected...

Modified:
  head/net-im/tox/Makefile

Modified: head/net-im/tox/Makefile
==============================================================================
--- head/net-im/tox/Makefile	Tue Feb 25 20:11:12 2014	(r346070)
+++ head/net-im/tox/Makefile	Tue Feb 25 20:16:29 2014	(r346071)
@@ -41,10 +41,15 @@ SODIUM_LIB_DEPENDS=	libsodium.so:${PORTS
 
 NACL_DESC=		Prefer NaCl
 NACL_CONFIGURE_ENABLE=	nacl
-NACL_CONFIGURE_WITH=	nacl-libs=${LOCALBASE}/lib
 NACL_BUILD_DEPENDS=	${LOCALBASE}/lib/libnacl.a:${PORTSDIR}/security/nacl
 NACL_RUN_DEPENDS=	${LOCALBASE}/lib/libnacl.a:${PORTSDIR}/security/nacl
 
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MNACL}
+CONFIGURE_ARGS+=	--with-nacl-libs=${LOCALBASE}/lib
+.endif
+
 pre-configure:
 	${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' ${WRKSRC}/configure.ac
 	cd ${WRKSRC} && ./autogen.sh



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201402252016.s1PKGTtQ096012>