CVS commit: pkgsrc/editors/emacs-snapshot

["Makoto Fujiwara" <mef%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   mef
Date:           Sat Jan 11 12:15:15 UTC 2020

Modified Files:
        pkgsrc/editors/emacs-snapshot: options.mk

Log Message:
(editors/emacs-snapshot) PR pkg/54848 Fix again, logic moved down outside of if x11 .. endif clause


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 pkgsrc/editors/emacs-snapshot/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/editors/emacs-snapshot/options.mk
diff -u pkgsrc/editors/emacs-snapshot/options.mk:1.14 pkgsrc/editors/emacs-snapshot/options.mk:1.15
--- pkgsrc/editors/emacs-snapshot/options.mk:1.14       Sat Jan 11 11:43:04 2020
+++ pkgsrc/editors/emacs-snapshot/options.mk    Sat Jan 11 12:15:15 2020
@@ -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"