diff options
| author | tnn <tnn> | 2008-05-17 23:26:06 +0000 |
|---|---|---|
| committer | tnn <tnn> | 2008-05-17 23:26:06 +0000 |
| commit | 8de5eb7bf925e5d03a2be04ae7aacd812bc72a9f (patch) | |
| tree | 6689e750d8fdd93f44472d5165318776fe4ad0e6 /chat | |
| parent | 271ef7f823bb9447d6bb3a2f3cb144f44d697050 (diff) | |
| download | pkgsrc-8de5eb7bf925e5d03a2be04ae7aacd812bc72a9f.tar.gz | |
Aggressively disable options in Makefile.common and selectively
enable them in options.mk, through overrides.
Diffstat (limited to 'chat')
| -rw-r--r-- | chat/libpurple/Makefile.common | 9 | ||||
| -rw-r--r-- | chat/libpurple/options.mk | 17 |
2 files changed, 12 insertions, 14 deletions
diff --git a/chat/libpurple/Makefile.common b/chat/libpurple/Makefile.common index e2a091d35db..4975b3ffd69 100644 --- a/chat/libpurple/Makefile.common +++ b/chat/libpurple/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.15 2008/05/17 22:56:17 tnn Exp $ +# $NetBSD: Makefile.common,v 1.16 2008/05/17 23:26:06 tnn Exp $ # # used by chat/finch/Makefile # used by chat/libpurple/Makefile @@ -27,3 +27,10 @@ CONFIGURE_ARGS+= --disable-consoleui CONFIGURE_ARGS+= --disable-meanwhile CONFIGURE_ARGS+= --disable-gstreamer CONFIGURE_ARGS+= --disable-avahi +CONFIGURE_ARGS+= --disable-perl +CONFIGURE_ARGS+= --disable-tcl +CONFIGURE_ARGS+= --disable-gnutls +CONFIGURE_ARGS+= --disable-nss +CONFIGURE_ARGS+= --disable-dbus +CONFIGURE_ARGS+= --disable-cyrus-sasl +CONFIGURE_ARGS+= --disable-debug diff --git a/chat/libpurple/options.mk b/chat/libpurple/options.mk index fb0456f2dac..f7e22322ce1 100644 --- a/chat/libpurple/options.mk +++ b/chat/libpurple/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.7 2008/04/12 22:42:58 jlam Exp $ +# $NetBSD: options.mk,v 1.8 2008/05/17 23:26:06 tnn Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.libpurple PKG_SUPPORTED_OPTIONS+= gnutls perl tcl debug dbus sasl @@ -9,13 +9,13 @@ PKG_SUGGESTED_OPTIONS+= gnutls PLIST_VARS+= dbus .if !empty(PKG_OPTIONS:Mgnutls) -CONFIGURE_ARGS+= --disable-nss +CONFIGURE_ARGS+= --enable-gnutls CONFIGURE_ARGS+= --with-gnutls-includes=${BUILDLINK_PREFIX.gnutls}/include CONFIGURE_ARGS+= --with-gnutls-libs=${BUILDLINK_PREFIX.gnutls}/lib . include "../../security/gnutls/buildlink3.mk" .else -CONFIGURE_ARGS+= --disable-gnutls +CONFIGURE_ARGS+= --enable-nss CONFIGURE_ARGS+= --with-nspr-includes=${BUILDLINK_PREFIX.nspr}/include/nspr CONFIGURE_ARGS+= --with-nspr-libs=${BUILDLINK_PREFIX.nspr}/lib/nspr CONFIGURE_ARGS+= --with-nss-includes=${BUILDLINK_PREFIX.nss}/include/nss/nss @@ -25,17 +25,14 @@ CONFIGURE_ARGS+= --with-nss-libs=${BUILDLINK_PREFIX.nss}/lib/nss .endif .if !empty(PKG_OPTIONS:Mperl) +CONFIGURE_ARGS+= --enable-perl USE_TOOLS+= perl:run . include "../../lang/perl5/buildlink3.mk" -.else -CONFIGURE_ARGS+= --disable-perl .endif .if !empty(PKG_OPTIONS:Mtcl) CONFIGURE_ARGS+= --with-tclconfig=${BUILDLINK_PREFIX.tcl}/lib . include "../../lang/tcl/buildlink3.mk" -.else -CONFIGURE_ARGS+= --disable-tcl .endif .if !empty(PKG_OPTIONS:Mdbus) @@ -50,19 +47,13 @@ REPLACE_PYTHON+= libpurple/purple-url-handler . include "../../sysutils/dbus/buildlink3.mk" . include "../../sysutils/dbus-glib/buildlink3.mk" . include "../../lang/python/application.mk" -.else -CONFIGURE_ARGS+= --disable-dbus .endif .if !empty(PKG_OPTIONS:Mdebug) CONFIGURE_ARGS+= --enable-debug -.else -CONFIGURE_ARGS+= --disable-debug .endif .if !empty(PKG_OPTIONS:Msasl) CONFIGURE_ARGS+= --enable-cyrus-sasl . include "../../security/cyrus-sasl/buildlink3.mk" -.else -CONFIGURE_ARGS+= --disable-cyrus-sasl .endif |