carbon2-commit: Rename xft_gauge to xft_gauges.

changeset: 4529:f863b2ee146f38e65e5595bbfb8f9788c052ba3e user: Mats Lidell <matsl(a)xemacs.org&gt; date: Sun Aug 03 23:21:31 2008 +0200 files: ChangeLog configure configure.ac src/ChangeLog src/config.h.in description: Rename xft_gauge to xft_gauges. diff -r 772c80e0e18073f34cb1bb67cff333a852a07d37 -r f863b2ee146f38e65e5595bbfb8f9788c052ba3e ChangeLog --- a/ChangeLog Sun Aug 03 22:00:52 2008 +0200 +++ b/ChangeLog Sun Aug 03 23:21:31 2008 +0200 ＠＠ -1,4 +1,6 ＠＠ 2008-08-03 Mats Lidell <matsl(a)xemacs.o 2008-08-03 Mats Lidell <matsl(a)xemacs.org&gt; + + * configure.ac: Fix typo xft_gauge to xft_gauges * configure.ac (XE_COMPLEX_ARG): Use different defaults for with-xft and without-xft. diff -r 772c80e0e18073f34cb1bb67cff333a852a07d37 -r f863b2ee146f38e65e5595bbfb8f9788c052ba3e configure --- a/configure Sun Aug 03 22:00:52 2008 +0200 +++ b/configure Sun Aug 03 23:21:31 2008 +0200 ＠＠ -27333,11 +27333,11 ＠＠ if test "$with_xft_tabs" != "no" ; then 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" + with_xft_gauges="yes" else - with_xft_gauge="no" + with_xft_gauges="no" fi fi ＠＠ -27529,8 +27529,8 ＠＠ test "$with_xft_tabs" = "yes" && cat >> #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 ＠＠ 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 -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." diff -r 772c80e0e18073f34cb1bb67cff333a852a07d37 -r f863b2ee146f38e65e5595bbfb8f9788c052ba3e configure.ac --- 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 ＠＠ extern Bool XRegisterIMInstantiateCallba 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 ＠＠ if test "$with_xft_tabs" != "no" ; then 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 "$enable_widgets" = "motif" && 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 ＠＠ 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 -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." diff -r 772c80e0e18073f34cb1bb67cff333a852a07d37 -r f863b2ee146f38e65e5595bbfb8f9788c052ba3e src/ChangeLog --- 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-07-20 John Paul Wallington <jpw＠p +2008-08-03 Mats Lidell <matsl(a)xemacs.org&gt; + + * config.h.in: Renamed USE_XFT_GAUGE to USE_XFT_GAUGES in sync + with configure.ac. + 2008-07-20 John Paul Wallington <jpw(a)pobox.com&gt; * nt.c (Fmswindows_short_file_name, Fmswindows_long_file_name): diff -r 772c80e0e18073f34cb1bb67cff333a852a07d37 -r f863b2ee146f38e65e5595bbfb8f9788c052ba3e src/config.h.in --- 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 ＠＠ things are arranged in config.h.in. In /* 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 _______________________________________________ XEmacs-Patches mailing list XEmacs-Patches(a)xemacs.org http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches