gnunet: try to fix unbound option.

[ng0 <ng0%n0.is@localhost>]

Module Name:	pkgsrc-wip
Committed By:	ng0 <ng0%n0.is@localhost>
Pushed By:	ng0
Date:		Sat Mar 9 21:09:23 2019 +0000
Changeset:	943a3518b558d954f71cc1aff15a75f728dc4c14

Modified Files:
	gnunet/Makefile
	gnunet/options.mk

Log Message:
gnunet: try to fix unbound option.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=943a3518b558d954f71cc1aff15a75f728dc4c14

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 gnunet/Makefile   | 1 +
 gnunet/options.mk | 7 +------
 2 files changed, 2 insertions(+), 6 deletions(-)

diffs:
diff --git a/gnunet/Makefile b/gnunet/Makefile
index c32517b97b..be14677ccb 100644
--- a/gnunet/Makefile
+++ b/gnunet/Makefile
@@ -100,6 +100,7 @@ post-install:
 .include "../../devel/libextractor/buildlink3.mk"
 .include "../../devel/libgsf/buildlink3.mk"
 .include "../../devel/libltdl/buildlink3.mk"
+.include "../../wip/gnutls/buildlink3.mk"
 .include "../../security/libgcrypt/buildlink3.mk"
 .include "../../textproc/libunistring/buildlink3.mk"
 .include "../../textproc/jansson/buildlink3.mk"
diff --git a/gnunet/options.mk b/gnunet/options.mk
index ad1c1ccce3..f582c1cf7d 100644
--- a/gnunet/options.mk
+++ b/gnunet/options.mk
@@ -68,11 +68,6 @@ CONFIGURE_ARGS+=	--enable-experimental
 PLIST.experimental=	yes
 .endif
 
-.if !empty(PKG_OPTIONS:Munbound)
-.if empty(PKG_BUILD_OPTIONS.gnutls:Munbound)
+.if !empty(PKG_OPTIONS:Munbound) && empty(PKG_BUILD_OPTIONS.gnutls:Munbound)
 PKG_FAIL_REASON+=	"Requires the unbound option enabled in gnutls"
 .endif
-.include "../../wip/gnutls/buildlink3.mk"
-.else
-.include "../../wip/gnutls/buildlink3.mk"
-.endif