From d2ec730a39cc5c6e7b2d88b923f92c0aa3599f5f Mon Sep 17 00:00:00 2001
From: Steve Price <steve@FreeBSD.org>
Date: Mon, 16 Feb 1998 14:38:26 +0000
Subject: Revert previous change.  Now faces will be autodetected as before
 except when PACKAGE_BUILDING is defined where it will be disabled by default.

Suggested by:	asami and eivind
---
 editors/xemacs21/Makefile | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'editors/xemacs21/Makefile')

diff --git a/editors/xemacs21/Makefile b/editors/xemacs21/Makefile
index 82019c69f7c4..d2e6cb02b23a 100644
--- a/editors/xemacs21/Makefile
+++ b/editors/xemacs21/Makefile
@@ -3,7 +3,7 @@
 # Date created:		26 August 1997
 # Whom:			Michael Elbel (me)
 #
-# $Id: Makefile,v 1.7 1998/01/01 21:06:35 gj Exp $
+# $Id: Makefile,v 1.8 1998/02/15 15:43:42 steve Exp $
 #
 
 DISTNAME=	xemacs-20.3
@@ -34,8 +34,7 @@ CONFIGURE_ARGS=	i386--freebsd --prefix=${PREFIX} \
 		--site-includes=${PREFIX}/include \
 		--site-libraries=${PREFIX}/lib \
 		--sitelispdir="${PREFIX}/lib/xemacs/site-lisp ${PREFIX}/share/emacs/site-lisp" \
-		--with-xface=no \
-		${WITH_MULE} ${WITH_DIALOGS}
+		${WITH_XFACE} ${WITH_MULE} ${WITH_DIALOGS}
 MAN1=		ctags.1 etags.1 gnuattach.1 gnuclient.1 gnudoit.1 \
 		gnuserv.1 xemacs.1
 ALL_TARGET=	all dist
@@ -62,6 +61,11 @@ PLIST=		${PKGDIR}/PLIST.mule
 WITH_DIALOGS=	--with-dialogs=athena
 .endif
 
+# Drop faces if building package, autodetect otherwise
+.if defined(PACKAGE_BUILDING)
+WITH_XFACE?=	--with-xface=no
+.endif
+
 post-install:
 .for file in b2m ctags etags gnuclient ${DISTNAME}
 	strip ${PREFIX}/bin/${file}
-- 
cgit v1.2.3