summaryrefslogtreecommitdiff
path: root/editors
diff options
context:
space:
mode:
authormef <mef@pkgsrc.org>2020-01-11 12:15:15 +0000
committermef <mef@pkgsrc.org>2020-01-11 12:15:15 +0000
commitacad0c58f8565f95fe0ee186e92ec8c0f14f3f75 (patch)
treee817d8d01401dd2836949ad7c0e7583068e097a8 /editors
parent3ec97da72a8c2f4672e1172efbcff33c8323013d (diff)
downloadpkgsrc-acad0c58f8565f95fe0ee186e92ec8c0f14f3f75.tar.gz
(editors/emacs-snapshot) PR pkg/54848 Fix again, logic moved down outside of if x11 .. endif clause
Diffstat (limited to 'editors')
-rw-r--r--editors/emacs-snapshot/options.mk18
1 files changed, 9 insertions, 9 deletions
diff --git a/editors/emacs-snapshot/options.mk b/editors/emacs-snapshot/options.mk
index acfcb549482..80738ca05fb 100644
--- a/editors/emacs-snapshot/options.mk
+++ b/editors/emacs-snapshot/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.14 2020/01/11 11:43:04 mef Exp $
+# $NetBSD: options.mk,v 1.15 2020/01/11 12:15:15 mef Exp $
### Set options
PKG_OPTIONS_VAR= PKG_OPTIONS.emacs
@@ -183,6 +183,14 @@ post-install:
.else # no window system
#.if empty(PKG_OPTIONS:Mx11)
+CONFIGURE_ARGS+= --without-x
+CONFIGURE_ARGS+= --without-xpm
+CONFIGURE_ARGS+= --without-jpeg
+CONFIGURE_ARGS+= --without-tiff
+CONFIGURE_ARGS+= --without-gif
+CONFIGURE_ARGS+= --without-png
+.endif
+
###
### Support jansson (JSON library)
###
@@ -192,14 +200,6 @@ post-install:
CONFIGURE_ARGS+= --without-json
. endif
-CONFIGURE_ARGS+= --without-x
-CONFIGURE_ARGS+= --without-xpm
-CONFIGURE_ARGS+= --without-jpeg
-CONFIGURE_ARGS+= --without-tiff
-CONFIGURE_ARGS+= --without-gif
-CONFIGURE_ARGS+= --without-png
-.endif
-
# Local Variables:
# mode: outline-minor
# outline-regexp: "\\(.[ \t]*\\(if\\|endif\\|else\\|elif\\|include.*options\\|PKG_SUGGES\\)\\)\\|### .\\|# Local"