changeset 3098:ceb34344c827

[xemacs-hg @ 2005-11-26 18:49:06 by stephent] Change Xft default to OFF. <87d5kn2qkw.fsf_-_@tleepslib.sk.tsukuba.ac.jp>
author stephent
date Sat, 26 Nov 2005 18:49:10 +0000
parents 859a2346db99
children 4049c38b9831
files ChangeLog configure configure.ac
diffstat 3 files changed, 21 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Sat Nov 26 18:25:03 2005 +0000
+++ b/ChangeLog	Sat Nov 26 18:49:10 2005 +0000
@@ -1,3 +1,8 @@
+2005-11-27  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* configure.ac (XE_COMPLEX_ARG[xft]): Default everything off;
+	change doc.
+
 2005-11-27  Stephen J. Turnbull  <stephen@xemacs.org>
 
 	* configure.ac (XE_COMPLEX_ARG[xft]): Remove merge detritus and
--- a/configure	Sat Nov 26 18:25:03 2005 +0000
+++ b/configure	Sat Nov 26 18:49:10 2005 +0000
@@ -996,8 +996,8 @@
                           Xft are `emacs' (buffers), `menubars', `tabs', and
                           `gauges'. Prefix component with `no' to disable its
                           use of Xft. Requires X11, Xft, Xrender, freetype,
-                          and fontconfig support. Default is
-                          `emacs,menubars,tabs,gauges'.
+                          and fontconfig support. Default is `noemacs,
+                          nomenubars, notabs, nogauges'.
   --with-gtk              Support GTK on the X Window System. (EXPERIMENTAL)
   --with-gnome            Support GNOME on the X Window System. (EXPERIMENTAL)
   --with-msw              Support MS Windows as a window system (only under
@@ -2264,17 +2264,17 @@
 fi;
 
 _xft_notfirst=""
-with_xft_emacs=yes
-enable_xft_emacs=yes
-with_xft_menubars=yes
-enable_xft_menubars=yes
-with_xft_tabs=yes
-enable_xft_tabs=yes
-with_xft_gauges=yes
-enable_xft_gauges=yes
+with_xft_emacs=no
+enable_xft_emacs=no
+with_xft_menubars=no
+enable_xft_menubars=no
+with_xft_tabs=no
+enable_xft_tabs=no
+with_xft_gauges=no
+enable_xft_gauges=no
 
 _xft_types="emacs menubars tabs gauges"
-_xft_default="emacs,menubars,tabs,gauges"
+_xft_default="noemacs,nomenubars,notabs,nogauges"
 
 
 
--- a/configure.ac	Sat Nov 26 18:25:03 2005 +0000
+++ b/configure.ac	Sat Nov 26 18:49:10 2005 +0000
@@ -637,12 +637,12 @@
 		[Xft],
 		[`emacs' (buffers), `menubars', `tabs', and `gauges'],
 		[X11, Xft, Xrender, freetype, and fontconfig],
-		[`emacs,menubars,tabs,gauges'])],
+		[`noemacs, nomenubars, notabs, nogauges'])],
 	[],[],
-	[XE_COMPLEX_OPTION([emacs],[yes]),
-	XE_COMPLEX_OPTION([menubars],[yes]),
-	XE_COMPLEX_OPTION([tabs],[yes]),
-	XE_COMPLEX_OPTION([gauges],[yes])])
+	[XE_COMPLEX_OPTION([emacs],[no]),
+	XE_COMPLEX_OPTION([menubars],[no]),
+	XE_COMPLEX_OPTION([tabs],[no]),
+	XE_COMPLEX_OPTION([gauges],[no])])
 XE_MERGED_ARG([gtk],
 	AC_HELP_STRING([--with-gtk],[Support GTK on the X Window System. (EXPERIMENTAL)]),
 	[true], [with_gtk=no])