APPROVE COMMIT 21.5
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/ChangeLog,v
retrieving revision 1.485
diff -u -r1.485 ChangeLog
--- ChangeLog	23 Dec 2005 11:33:38 -0000	1.485
+++ ChangeLog	23 Dec 2005 15:01:21 -0000
@@ -0,0 +1,5 @@
+2005-12-23  Stephen J. Turnbull  <stephen(a)xemacs.org>
+
+	* configure.ac (Xft): Fix typo preventing report of Xft buffers.
+	Remove now-irrelevant comments.
+
Index: configure.ac
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/configure.ac,v
retrieving revision 1.30
diff -u -r1.30 configure.ac
--- configure.ac	23 Dec 2005 11:33:39 -0000	1.30
+++ configure.ac	23 Dec 2005 15:01:23 -0000
@@ -4423,9 +4423,7 @@
 test "$enable_dialogs"    = "motif"  &&
AC_DEFINE(LWLIB_DIALOGS_MOTIF)
 test "$enable_widgets"    = "motif"  &&
AC_DEFINE(LWLIB_WIDGETS_MOTIF)
 
-dnl this is not in xft reloaded #3
 test "$with_xft_menubars" = "yes"  &&
AC_DEFINE(USE_XFT_MENUBARS)
-dnl these are new in sjt-xft
 test "$with_xft_tabs" = "yes"  && AC_DEFINE(USE_XFT_TABS)
 test "$with_xft_gauge" = "yes"  && AC_DEFINE(USE_XFT_GAUGE)
 
@@ -5906,7 +5904,7 @@
   if test "$with_wmcommand" != no; then
     echo "    - Handling WM_COMMAND properly."
   fi
-  if test "$with_xft" = "yes"; then 
+  if test "$with_xft_emacs" = "yes"; then
     echo "    - Compiling in support for Xft antialiased fonts
(EXPERIMENTAL)."
   fi
 fi
@@ -5934,7 +5932,6 @@
           echo "             Re-run configure with
--enable-menubars='lucid'." ;;
     msw ) echo "  Using MS-Windows menubars." ;;
 esac
-dnl this is not in xft reloaded #3
 if test "$with_xft_menubars" = "yes"; then
   echo "    - Using Xft to render antialiased fonts in menubars."
   echo "      WARNING: This feature will be replaced with a face."
@@ -5964,12 +5961,10 @@
   athena ) echo "  Using Athena native widgets."     ;;
      msw ) echo "  Using MS-Windows native widgets." ;;
 esac
-dnl this is not in xft reloaded #3
 if test "$with_xft_tabs" = "yes"; then
   echo "    - Using Xft to render antialiased fonts in tab controls."
   echo "      WARNING: This feature will be replaced with a face."
 fi
-dnl this is not in xft reloaded #3
 if test "$with_xft_gauge" = "yes"; then
   echo "    - Using Xft to render antialiased fonts in progress bars."
   echo "      WARNING: This feature will be replaced with a face."
-- 
School of Systems and Information Engineering 
http://turnbull.sk.tsukuba.ac.jp
University of Tsukuba                    Tennodai 1-1-1 Tsukuba 305-8573 JAPAN
               Ask not how you can "do" free software business;
              ask what your business can "do for" free software.