comparison configure.ac @ 4916:a6c778975d7d

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.
author Ben Wing <ben@xemacs.org>
date Mon, 01 Feb 2010 22:00:29 -0600
parents bde90bc762f2
children cbe181529c34
comparison
equal deleted inserted replaced
4909:87175eb65ff4 4916:a6c778975d7d
3161 AC_CHECK_FUNCS(FcConfigGetRescanInterval) 3161 AC_CHECK_FUNCS(FcConfigGetRescanInterval)
3162 AC_CHECK_FUNCS(FcConfigSetRescanInterval) 3162 AC_CHECK_FUNCS(FcConfigSetRescanInterval)
3163 dnl #### detect fontconfig properly!!!! 3163 dnl #### detect fontconfig properly!!!!
3164 with_fontconfig=yes 3164 with_fontconfig=yes
3165 AC_DEFINE(HAVE_FONTCONFIG) 3165 AC_DEFINE(HAVE_FONTCONFIG)
3166 AC_DEFINE(USE_XFT) 3166 AC_DEFINE(HAVE_XFT)
3167 dnl Due to interactions with other libraries, must postpone AC_DEFINE 3167 dnl Due to interactions with other libraries, must postpone AC_DEFINE
3168 dnl of USE_XFT_MENUBARS, USE_XFT_TABS, and USE_XFT_GAUGES. 3168 dnl of HAVE_XFT_MENUBARS, HAVE_XFT_TABS, and HAVE_XFT_GAUGES.
3169 unset xft_includes_found 3169 unset xft_includes_found
3170 fi 3170 fi
3171 fi 3171 fi
3172 3172
3173 fi dnl $with_x11 = yes 3173 fi dnl $with_x11 = yes
4120 test "$with_menubars" = "motif" && AC_DEFINE(LWLIB_MENUBARS_MOTIF) 4120 test "$with_menubars" = "motif" && AC_DEFINE(LWLIB_MENUBARS_MOTIF)
4121 test "$with_scrollbars" = "motif" && AC_DEFINE(LWLIB_SCROLLBARS_MOTIF) 4121 test "$with_scrollbars" = "motif" && AC_DEFINE(LWLIB_SCROLLBARS_MOTIF)
4122 test "$with_dialogs" = "motif" && AC_DEFINE(LWLIB_DIALOGS_MOTIF) 4122 test "$with_dialogs" = "motif" && AC_DEFINE(LWLIB_DIALOGS_MOTIF)
4123 test "$with_widgets" = "motif" && AC_DEFINE(LWLIB_WIDGETS_MOTIF) 4123 test "$with_widgets" = "motif" && AC_DEFINE(LWLIB_WIDGETS_MOTIF)
4124 4124
4125 test "$with_xft_menubars" = "yes" && AC_DEFINE(USE_XFT_MENUBARS) 4125 test "$with_xft_menubars" = "yes" && AC_DEFINE(HAVE_XFT_MENUBARS)
4126 test "$with_xft_tabs" = "yes" && AC_DEFINE(USE_XFT_TABS) 4126 test "$with_xft_tabs" = "yes" && AC_DEFINE(HAVE_XFT_TABS)
4127 test "$with_xft_gauges" = "yes" && AC_DEFINE(USE_XFT_GAUGES) 4127 test "$with_xft_gauges" = "yes" && AC_DEFINE(HAVE_XFT_GAUGES)
4128 4128
4129 dnl ---------------------- 4129 dnl ----------------------
4130 dnl Mule-dependent options 4130 dnl Mule-dependent options
4131 dnl ---------------------- 4131 dnl ----------------------
4132 4132