split USE_XFT into HAVE_XFT/USE_XFT -------------------- ChangeLog entries follow: -------------------- ChangeLog addition: 2010-02-01 Ben Wing <ben@xemacs.org> * configure: * configure.ac (TAB): USE_XFT* -> HAVE_XFT*. lwlib/ChangeLog addition: 2010-02-01 Ben Wing <ben@xemacs.org> * lwlib-colors.c: * lwlib-colors.h: * lwlib-fonts.c: * lwlib-fonts.h: * xlwmenu.c: * xlwmenu.c (xlwMenuResources): * xlwmenu.c (x_xft_text_width): * xlwmenu.c (label_button_draw): * xlwmenu.c (push_button_size): * xlwmenu.c (push_button_draw): * xlwmenu.c (make_drawing_gcs): * xlwmenu.c (extract_font_extents): * xlwmenu.c (default_font_of_font_list): * xlwmenu.c (XlwMenuInitialize): * xlwmenu.c (XlwMenuDestroy): * xlwmenu.c (XlwMenuSetValues): * xlwmenuP.h: * xlwmenuP.h (_XlwMenu_part): * xlwtabs.c: * xlwtabs.c (TabsInit): * xlwtabs.c (TabsDestroy): * xlwtabs.c (TabsSetValues): * xlwtabs.c (DrawTab): * xlwtabs.c (TabWidth): * xlwtabs.c (TabsAllocFgGC): * xlwtabs.c (TabsAllocGreyGC): * xlwtabsP.h: USE_XFT* -> HAVE_XFT*. src/ChangeLog addition: 2010-02-01 Ben Wing <ben@xemacs.org> * Makefile.in.in: * compiler.h: * config.h.in: * console-x-impl.h: * console-x-impl.h (struct x_frame): * console-x-impl.h (FRAME_X_TOTALLY_VISIBLE_P): * console-x.h: * console-xlike-inc.h: * emacs.c (main_1): * faces.c (complex_vars_of_faces): * font-mgr.h: * frame-x.c (x_delete_frame): * frame-x.c (x_update_frame_external_traits): * glyphs-x.c (update_widget_face): * inline.c: * objects-x-impl.h: * objects-x-impl.h (struct x_color_instance_data): * objects-x-impl.h (struct x_font_instance_data): * objects-x.c: * objects-x.c (x_initialize_color_instance): * objects-x.c (x_initialize_font_instance): * objects-x.c (x_print_font_instance): * objects-x.c (x_finalize_font_instance): * objects-x.c (x_font_instance_truename): * objects-x.c (vars_of_objects_x): * objects-x.h: USE_XFT* -> HAVE_XFT*. But in objects-xlike-inc.c and redisplay-xlike-inc.c, continue to use USE_XFT, and define it appropriately in console-xlike-inc.h when both HAVE_XFT and THIS_IS_X -- even if HAVE_XFT, we don't want to enable XFT code when included in a *-gtk.c file.

/* XPM */
static char * dict[] = {
"28 28 6 1",
"X	c Gray75 s backgroundToolBarColor",
"o	c Gray60",
"O	c Gray90",
"+	c Gray40",
"@	c Gray60",
"#	c white",
"XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
"XXXXXXoooooooooooooooooXXXXX",
"XXXXXoXoOOOOOOOOOOOOO+oXXXXX",
"XXXXXooooooooooooooooOoXXXXX",
"XXXXoXo++o@@@@@@o+++oOoXXXXX",
"XXXXXoo++o@@@@@@@o++oOoXXXXX",
"XXXXXoo++o@@@@@@@@o+oOoXXXXX",
"XXXXoXo++o@ooooooo@ooOoXXXXX",
"XXXXXoo++o@o#####o@@oOoXXXXX",
"XXXXXoo++o@ooooooo@@oOoXXXXX",
"XXXXoXo++o@@@@@@@@@@oO###XXX",
"XXXXXoo++o@ooooooo@@###++XXX",
"XXXXXoo++o@@@@@@@@####+XXXXX",
"XXXX#Xo++o@@@@@@####++oXXXXX",
"XXX###o++o@@@@####++oOoXXXXX",
"XX####o++o@@@####+@@oOoXXXXX",
"XX+####++o@####++@@ooOoXXXXX",
"XXX+####+o####+@@@o+oOoXXXXX",
"XXXX+########+@@@o++oooXXXXX",
"XXXXo+######+@@@o+++oXXXXXXX",
"XXXXXo+####+oooooooooXXXXXXX",
"XXXXXXX+##+XXXXXXXXXXXXXXXXX",
"XXXXXXXX++XXXXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXXXXXXXXXXXXXX"};