diff options
| author | adrianp <adrianp> | 2009-05-06 21:54:54 +0000 |
|---|---|---|
| committer | adrianp <adrianp> | 2009-05-06 21:54:54 +0000 |
| commit | 362ea9a194b96d99695c348fe9a8487edf132cbe (patch) | |
| tree | a8d5f19053da04d61bb5fbc56e2e5ba19097cda4 | |
| parent | abd225d3d7e1cc3c99956c62882696f66991f0c4 (diff) | |
| download | pkgsrc-362ea9a194b96d99695c348fe9a8487edf132cbe.tar.gz | |
Allow glib to be disabled
It's still enabled by default so no PKGREVISION bump
| -rw-r--r-- | net/libnids/Makefile | 3 | ||||
| -rw-r--r-- | net/libnids/options.mk | 17 |
2 files changed, 16 insertions, 4 deletions
diff --git a/net/libnids/Makefile b/net/libnids/Makefile index f210c84f3b5..e265c2b1e8b 100644 --- a/net/libnids/Makefile +++ b/net/libnids/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2009/02/24 00:44:26 cube Exp $ +# $NetBSD: Makefile,v 1.24 2009/05/06 21:54:54 adrianp Exp $ # DISTNAME= libnids-1.23 @@ -28,5 +28,4 @@ INSTALL_MAKE_FLAGS+= install_prefix=${DESTDIR} .include "options.mk" .include "../../net/libpcap/buildlink3.mk" -.include "../../devel/glib2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/libnids/options.mk b/net/libnids/options.mk index 747cfc34bdc..1515dcdfeb2 100644 --- a/net/libnids/options.mk +++ b/net/libnids/options.mk @@ -1,9 +1,13 @@ -# $NetBSD: options.mk,v 1.6 2009/02/24 00:44:26 cube Exp $ +# $NetBSD: options.mk,v 1.7 2009/05/06 21:54:54 adrianp Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.libnids + PKG_OPTIONS_REQUIRED_GROUPS= libnet PKG_OPTIONS_GROUP.libnet= libnet10 libnet11 -PKG_SUGGESTED_OPTIONS= libnet10 + +PKG_SUPPORTED_OPTIONS= glib + +PKG_SUGGESTED_OPTIONS= libnet10 glib .include "../../mk/bsd.options.mk" @@ -24,3 +28,12 @@ SUBST_SED.conf= -e "s|libnet-config|libnet10-config|g" BUILDLINK_DEPMETHOD.libnet11+= build SUBST_SED.conf= -e "s|libnet-config|libnet11-config|g" .endif + +### +### glib support +### +.if !empty(PKG_OPTIONS:Mglib) +.include "../../devel/glib2/buildlink3.mk" +.else +CONFIGURE_ARGS+= --disable-libglib +.endif |