gnunet: add more configure options.

[nikita <nikita%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	nikita <nikita%NetBSD.org@localhost>
Pushed By:	nikita
Date:		Thu Mar 31 17:31:35 2022 +0200
Changeset:	4c627427826e369954a0afea4987cda4ff21b9fc

Modified Files:
	gnunet/Makefile
	gnunet/options.mk

Log Message:
gnunet: add more configure options.

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

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

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

diffs:
diff --git a/gnunet/Makefile b/gnunet/Makefile
index 680d43971e..0d796d06a5 100644
--- a/gnunet/Makefile
+++ b/gnunet/Makefile
@@ -4,7 +4,7 @@ DISTNAME=		gnunet-0.16.2
 CATEGORIES=		net
 MASTER_SITES=		${MASTER_SITE_GNU:=gnunet/}
 
-MAINTAINER=		pkgsrc-users%NetBSD.org@localhost
+MAINTAINER=		nikita%NetBSD.org@localhost
 HOMEPAGE=		https://gnunet.org/
 COMMENT=		Framework for secure P2P networking
 LICENSE=		gnu-agpl-v3
diff --git a/gnunet/options.mk b/gnunet/options.mk
index a6600578fc..81325c5c0f 100644
--- a/gnunet/options.mk
+++ b/gnunet/options.mk
@@ -71,6 +71,7 @@ CONFIGURE_ARGS+=	--with-libidn=${BUILDLINK_PREFIX.libidn}
 # the build won't build when you have none of them.
 .if ${PKG_OPTIONS:Msqlite3}
 .include "../../databases/sqlite3/buildlink3.mk"
+CONFIGURE_ARGS+=	--with-sqlite3=${BUILDLINK_PREFIX.sqlite3}
 PLIST_SRC+=		PLIST.sqlite3
 .else
 CONFIGURE_ARGS+=	--without-sqlite3
@@ -81,6 +82,7 @@ CONFIGURE_ARGS+=	--without-sqlite3
 # mysql version >= 4.1 required. Will not use MySQL
 .if ${PKG_OPTIONS:Mmysql}
 .include "../../mk/mysql.buildlink3.mk"
+CONFIGURE_ARGS+=	--with-mysql=${BUILDLINK_PREFIX.mysql}
 PLIST_SRC+=		PLIST.mysql
 .else
 CONFIGURE_ARGS+=	--without-mysql
@@ -88,9 +90,10 @@ CONFIGURE_ARGS+=	--without-mysql
 
 .if ${PKG_OPTIONS:Mpgsql}
 .include "../../mk/pgsql.buildlink3.mk"
+CONFIGURE_ARGS+=	--with-postgresql=${BUILDLINK_PREFIX.pgsql}
 PLIST_SRC+=		PLIST.pgsql
 .else
-CONFIGURE_ARGS+=	--without-postgres
+CONFIGURE_ARGS+=	--without-postgresql
 .endif
 
 .if ${PKG_OPTIONS:Mexperimental}
@@ -110,12 +113,18 @@ CONFIGURE_ARGS+=	--disable-experimental
 .if ${PKG_OPTIONS:Maudio}
 .  if ${PKG_OPTIONS:Mopus}
 .include "../../audio/libopus/buildlink3.mk"
+CONFIGURE_ARGS+=	--with-opus=${BUILDLINK_PREFIX.libopus}
 PLIST_SRC+=		PLIST.conversations
+.  else
+CONFIGURE_ARGS+=	--without-opus
 .  endif
 
 .  if ${PKG_OPTIONS:Mogg}
 .include "../../multimedia/libogg/buildlink3.mk"
+CONFIGURE_ARGS+=	--with-ogg=${BUILDLINK_PREFIX.libogg}
 PLIST_SRC+=		PLIST.conversations
+.  else
+CONFIGURE_ARGS+=	--without-ogg
 .  endif
 
 .  if ${PKG_OPTIONS:Mgstreamer}
@@ -126,12 +135,16 @@ PLIST_SRC+=		PLIST.conversations
 
 .  if ${PKG_OPTIONS:Mpulseaudio}
 .include "../../audio/pulseaudio/buildlink3.mk"
+CONFIGURE_ARGS+=	--with-pulse=${BUILDLINK_PREFIX.pulseaudio}
 PLIST_SRC+=		PLIST.conversations
+.  else
+CONFIGURE_ARGS+=	--without-pulse
 .  endif
 .endif
 
 .if ${PKG_OPTIONS:Mzbar}
 .include "../../graphics/zbar/buildlink3.mk"
+CONFIGURE_ARGS+=	--with-zbar=${BUILDLINK_PREFIX.zbar}
 PLIST.zbar=		yes
 .else
 CONFIGURE_ARGS+=	--without-zbar
@@ -150,6 +163,7 @@ CONFIGURE_ARGS+=	--without-zbar
 .if ${OPSYS} == "Linux" && ${PKG_OPTIONS:Mbluez}
 # Do we need more for bluez?
 .include "../../wip/bluez-libs/buildlink3.mk"
+CONFIGURE_ARGS+=	--with-libbluetooth=${BUILDLINK_PREFIX.bluez-libs}
 PLIST.bluez=		yes
 .else
 CONFIGURE_ARGS+=	--without-libbluetooth