Introduce three control variable for this package; EMACS_USE_{POP,X,X_TOOLKIT}.

The first one defaults to `yes' and latter two aren't defined by default (so,
the configure script will configure automagically).

2 files changed, 35 insertions, 4 deletions

diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile
index 873280dad07..4077558658a 100644
--- a/editors/emacs/Makefile
+++ b/editors/emacs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2000/03/10 15:45:33 minoura Exp $
+# $NetBSD: Makefile,v 1.36 2000/03/26 07:59:30 enami Exp $
 # FreeBSD Id: Makefile,v 1.30 1997/12/14 02:03:53 asami Exp
 
 DISTNAME=	emacs-20.6
@@ -10,14 +10,25 @@ HOMEPAGE=	http://www.gnu.org/software/emacs/emacs.html
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-CONFIGURE_ARGS+=--with-pop --with-x --with-x-toolkit=lucid
+EMACS_USE_POP?=	yes
+.if (defined(EMACS_USE_POP) && \
+    (${EMACS_USE_POP} == yes || ${EMACS_USE_POP} == YES))
+CONFIGURE_ARGS+=--with-pop
+.endif
+.if defined(EMACS_USE_X)
+CONFIGURE_ARGS+=--with-x=${EMACS_USE_X}
+.endif
+.if defined(EMACS_USE_X_TOOLKIT)
+CONFIGURE_ARGS+=--with-x-toolkit=${EMACS_USE_X_TOOLKIT}
+.endif
 .if (defined(USE_INET6) && ${USE_INET6} == NO)
 CONFIGURE_ARGS+=--without-ipv6
 .else
 CONFIGURE_ARGS+=--with-ipv6
 .endif
 MAKE_ENV+=	INSTALL_STRIP=${STRIPFLAG}
-INFO_FILES=	emacs vip viper forms gnus mh-e cl sc dired-x ediff ccmode message widget reftex forms
+INFO_FILES=	emacs vip viper forms gnus mh-e cl sc dired-x ediff \
+		    ccmode message widget reftex forms
 
 INSTALL_PROGRAM=${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE}
 
diff --git a/mk/mk.conf.example b/mk/mk.conf.example
index 344ce0b3bb0..aa612bdfe44 100644
--- a/mk/mk.conf.example
+++ b/mk/mk.conf.example
@@ -1,4 +1,4 @@
-# $NetBSD: mk.conf.example,v 1.127 2000/03/18 19:55:24 wiz Exp $
+# $NetBSD: mk.conf.example,v 1.128 2000/03/26 07:59:30 enami Exp $
 #
 
 # Sample /etc/mk.conf file, which can be used to set specific values
@@ -262,6 +262,26 @@
 # Possible: US, FI, FR, GER, DV
 # Default: FI
 
+#EMACS_USE_POP
+# Used by emacs package to determine whether pop support is enabled or not.
+# Possible: yes, no
+# Default: yes
+
+#EMACS_USE_X
+# Used by emacs package to determine whether X support is enabled or not.
+# If defined, the value is directly passed as argument of --with-x.
+# If not defined, the configure script will configure automatically.
+# Possible: yes, no, not defined
+# Default: not defined
+
+#EMACS_USE_X_TOOLKIT
+# Used by emacs package to determine what kind of toolkit support is enabled.
+# If defined, the value is directly passed as argument of --with-x-toolkit.
+# If not defined or defined to yes, the configure script will pick up an
+# appropriate one.  E.g, if X11R5 or later is found, lucid will be used.
+# Possible: yes, no, not defined, athena, lucid, motif
+# Default: not defined
+
 #GLX_CHIPSET=
 # Used to select chipset to build "Mesa-glx" package for.  Either
 # Matrox MGA 200/400 or Riva TNT/TNT 2 can be supported.