diff options
| author | tron <tron@pkgsrc.org> | 2019-02-04 10:38:53 +0000 |
|---|---|---|
| committer | tron <tron@pkgsrc.org> | 2019-02-04 10:38:53 +0000 |
| commit | 3e2ab86680363c467296ff9224cc48d7e33b60c9 (patch) | |
| tree | 762ac0d257e090ecd2c4728fba30d701e15c5637 /editors | |
| parent | e5f98abe026457c45ac38a5a8344192ed2411cd5 (diff) | |
| download | pkgsrc-3e2ab86680363c467296ff9224cc48d7e33b60c9.tar.gz | |
editors/emacs26: Fix building with GTK+ 2 toolkit
Previously the "gtk" and "gtk2" options weren't checked properly and the
package was built using the GTK+ 3 toolkit instead.
Diffstat (limited to 'editors')
| -rw-r--r-- | editors/emacs26/options.mk | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/editors/emacs26/options.mk b/editors/emacs26/options.mk index bbae619844d..1b5fdde6e11 100644 --- a/editors/emacs26/options.mk +++ b/editors/emacs26/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.3 2018/07/15 15:21:28 mef Exp $ +# $NetBSD: options.mk,v 1.4 2019/02/04 10:38:53 tron Exp $ ### Set options PKG_OPTIONS_VAR= PKG_OPTIONS.emacs @@ -17,8 +17,8 @@ PKG_SUGGESTED_OPTIONS.Darwin= nextstep # gtk in next line implies gtk2, xaw = athena = lucid PKG_OPTIONS_GROUP.toolkit= gtk gtk2 gtk3 motif xaw lucid # gtk2 and gtk has the same effect -# gtk is default in the logic below (even not included in SUGGESTED_= -# gconf, gtk and xft2 will be ignored for nextstep even shown as selected. +# gtk3 is default in the logic below (even not included in SUGGESTED_= +# gconf, gtk* and xft2 will be ignored for nextstep even shown as selected. PKG_SUGGESTED_OPTIONS= dbus gconf gnutls gtk3 svg xaw3d xft2 xml x11 @@ -113,7 +113,9 @@ CONFIGURE_ARGS+= --without-xft --without-libotf --without-m17n-flt ### ### Toolkit selection ### -. if (empty(PKG_OPTIONS:Mxaw) && empty(PKG_OPTIONS:Mlucid) && empty(PKG_OPTIONS:Mmotif)) +. if (empty(PKG_OPTIONS:Mxaw) && empty(PKG_OPTIONS:Mlucid) && \ + empty(PKG_OPTIONS:Mgtk) && empty(PKG_OPTIONS:Mgtk2) && \ + empty(PKG_OPTIONS:Mmotif)) # defaults to gtk3 USE_TOOLS+= pkg-config .include "../../x11/gtk3/buildlink3.mk" |