diff options
| -rw-r--r-- | sysutils/gnome-vfs/Makefile | 5 | ||||
| -rw-r--r-- | sysutils/gnome-vfs/options.mk | 11 |
2 files changed, 10 insertions, 6 deletions
diff --git a/sysutils/gnome-vfs/Makefile b/sysutils/gnome-vfs/Makefile index 8ba1a716ca9..d554e603dda 100644 --- a/sysutils/gnome-vfs/Makefile +++ b/sysutils/gnome-vfs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.73 2009/03/19 11:32:45 drochner Exp $ +# $NetBSD: Makefile,v 1.74 2009/04/10 22:27:16 asau Exp $ PKGCONFIG_OVERRIDE= gnome-vfs-2.0.pc.in PKGCONFIG_OVERRIDE+= gnome-vfs-module-2.0.pc.in @@ -24,8 +24,6 @@ MAKE_JOBS_SAFE= no .include "Makefile.common" .include "options.mk" -CONFIGURE_ARGS+= --enable-fam - CONFLICTS+= gnome-vfs2-[0-9]* .include "../../devel/GConf/schemas.mk" @@ -33,5 +31,4 @@ CONFLICTS+= gnome-vfs2-[0-9]* .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" -.include "../../mk/fam.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/gnome-vfs/options.mk b/sysutils/gnome-vfs/options.mk index 274c05f75bb..e8c835c7d13 100644 --- a/sysutils/gnome-vfs/options.mk +++ b/sysutils/gnome-vfs/options.mk @@ -1,9 +1,9 @@ -# $NetBSD: options.mk,v 1.1 2008/12/01 14:41:52 wiz Exp $ +# $NetBSD: options.mk,v 1.2 2009/04/10 22:27:16 asau Exp $ # PKG_OPTIONS_VAR= PKG_OPTIONS.gnome-vfs PKG_SUPPORTED_OPTIONS= gssapi hal inet6 -PKG_SUGGESTED_OPTIONS= hal +PKG_SUGGESTED_OPTIONS= fam hal .include "../../mk/bsd.prefs.mk" @@ -14,6 +14,13 @@ PKG_SUGGESTED_OPTIONS+= gssapi .include "../../mk/bsd.options.mk" +.if !empty(PKG_OPTIONS:Mfam) +.include "../../mk/fam.buildlink3.mk" +CONFIGURE_ARGS+= --enable-fam +.else +CONFIGURE_ARGS+= --disable-fam +.endif + .if !empty(PKG_OPTIONS:Mgssapi) .include "../../mk/krb5.buildlink3.mk" CONFIGURE_ENV+= KRB5_CONFIG=${SH_KRB5_CONFIG} |