--- a/ChangeLog	Sun Aug 03 22:00:52 2008 +0200
+++ b/ChangeLog	Sun Aug 03 23:21:31 2008 +0200
@@ -1,5 +1,7 @@
 2008-08-03  Mats Lidell  <matsl@xemacs.org>
 
+	* configure.ac: Fix typo xft_gauge to xft_gauges
+
 	* configure.ac (XE_COMPLEX_ARG): Use different defaults for
 	with-xft and without-xft.
 

--- a/configure	Sun Aug 03 22:00:52 2008 +0200
+++ b/configure	Sun Aug 03 23:21:31 2008 +0200
@@ -27333,11 +27333,11 @@
     with_xft_tabs="no"
   fi
 fi
-if test "$with_xft_gauge" != "no" ; then
+if test "$with_xft_gauges" != "no" ; then
   if test "$with_xft_emacs" = "yes" -a "$enable_widgets" != "no" ; then
-    with_xft_gauge="yes"
-  else
-    with_xft_gauge="no"
+    with_xft_gauges="yes"
+  else
+    with_xft_gauges="no"
   fi
 fi
 
@@ -27529,8 +27529,8 @@
 #define USE_XFT_TABS 1
 _ACEOF
 
-test "$with_xft_gauge" = "yes"  && cat >>confdefs.h <<\_ACEOF
-#define USE_XFT_GAUGE 1
+test "$with_xft_gauges" = "yes"  && cat >>confdefs.h <<\_ACEOF
+#define USE_XFT_GAUGES 1
 _ACEOF
 
 
@@ -39583,7 +39583,7 @@
   echo "    - Using Xft to render antialiased fonts in tab controls."
   echo "      WARNING: This feature will be replaced with a face."
 fi
-if test "$with_xft_gauge" = "yes"; then
+if test "$with_xft_gauges" = "yes"; then
   echo "    - Using Xft to render antialiased fonts in progress bars."
   echo "      WARNING: This feature will be replaced with a face."
   echo "      WARNING: This feature not yet implemented; setting ignored."

--- a/configure.ac	Sun Aug 03 22:00:52 2008 +0200
+++ b/configure.ac	Sun Aug 03 23:21:31 2008 +0200
@@ -3541,7 +3541,7 @@
       AC_DEFINE(HAVE_FONTCONFIG)
       AC_DEFINE(USE_XFT)
       dnl Due to interactions with other libraries, must postpone AC_DEFINE
-      dnl of USE_XFT_MENUBARS, USE_XFT_TABS, and USE_XFT_GAUGE.
+      dnl of USE_XFT_MENUBARS, USE_XFT_TABS, and USE_XFT_GAUGES.
       unset xft_includes_found
     fi
   fi
@@ -4430,11 +4430,11 @@
   fi
 fi
 dnl this is not in xft reloaded #3
-if test "$with_xft_gauge" != "no" ; then
+if test "$with_xft_gauges" != "no" ; then
   if test "$with_xft_emacs" = "yes" -a "$enable_widgets" != "no" ; then
-    with_xft_gauge="yes"
+    with_xft_gauges="yes"
   else
-    with_xft_gauge="no"
+    with_xft_gauges="no"
   fi
 fi
 
@@ -4527,7 +4527,7 @@
 
 test "$with_xft_menubars" = "yes"  && AC_DEFINE(USE_XFT_MENUBARS)
 test "$with_xft_tabs" = "yes"  && AC_DEFINE(USE_XFT_TABS)
-test "$with_xft_gauge" = "yes"  && AC_DEFINE(USE_XFT_GAUGE)
+test "$with_xft_gauges" = "yes"  && AC_DEFINE(USE_XFT_GAUGES)
 
 dnl ----------------------
 dnl Mule-dependent options
@@ -6079,7 +6079,7 @@
   echo "    - Using Xft to render antialiased fonts in tab controls."
   echo "      WARNING: This feature will be replaced with a face."
 fi
-if test "$with_xft_gauge" = "yes"; then
+if test "$with_xft_gauges" = "yes"; then
   echo "    - Using Xft to render antialiased fonts in progress bars."
   echo "      WARNING: This feature will be replaced with a face."
   echo "      WARNING: This feature not yet implemented; setting ignored."

--- a/src/ChangeLog	Sun Aug 03 22:00:52 2008 +0200
+++ b/src/ChangeLog	Sun Aug 03 23:21:31 2008 +0200
@@ -1,3 +1,8 @@
+2008-08-03  Mats Lidell  <matsl@xemacs.org>
+
+	* config.h.in: Renamed USE_XFT_GAUGE to USE_XFT_GAUGES in sync
+	with configure.ac.
+
 2008-07-20  John Paul Wallington  <jpw@pobox.com>
 
 	* nt.c (Fmswindows_short_file_name, Fmswindows_long_file_name):

--- a/src/config.h.in	Sun Aug 03 22:00:52 2008 +0200
+++ b/src/config.h.in	Sun Aug 03 23:21:31 2008 +0200
@@ -225,7 +225,7 @@
 /* Per-widget stuff will go away? */
 #undef USE_XFT_MENUBARS
 #undef USE_XFT_TABS
-#undef USE_XFT_GAUGE
+#undef USE_XFT_GAUGES
 
 /* Defines for building X applications */
 #ifdef HAVE_X_WINDOWS