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.

/* reginfo.h -- XEmacs version numbers and accompanying documentation.

Copyright (C) 2000 Andy Piper. */

#define XEMACS_INFO_XEMACS_ORG_REGISTRY_NAME "XEmacs"
#define XEMACS_INFO_XEMACS_REGISTRY_NAME "XEmacs"
/* Keys */
#define XEMACS_INFO_XEMACS_ROOT_KEY "emacs_dir"
#define XEMACS_INFO_XEMACS_ROOT_TYPE "install_type"
#define XEMACS_INFO_XEMACS_PACKAGE_KEY "EMACSPACKAGEPATH"
#define XEMACS_INFO_XEMACS_EARLY_PACKAGES_KEY "EMACSEARLYPACKAGES"
#define XEMACS_INFO_XEMACS_LATE_PACKAGES_KEY "EMACSLATEPACKAGES"
#define XEMACS_INFO_XEMACS_LAST_PACKAGES_KEY "EMACSLASTPACKAGES"
#define XEMACS_INFO_XEMACS_VERSION_KEY "version"

#define XEMACS_DEFAULT_ROOT "\\Program Files\\XEmacs"
#define XEMACS_CYGWIN_DEFAULT_ROOT "\\usr\\local"

#define XEMACS_SETUP_DIR \
  ((char*)(install_type == IDC_INSTALL_NATIVE ? "\\setup\\" : "/lib/xemacs/setup/"))
#define XEMACS_RESOURCE_DIR \
  ((char*)(install_type == IDC_INSTALL_NATIVE ? "\\" : "/lib/xemacs/"))
#define XEMACS_PACKAGE_DIR \
  ((char*)(install_type == IDC_INSTALL_NATIVE ? "\\xemacs-packages\\" \
				    : "/lib/xemacs/xemacs-packages/"))
#define XEMACS_NATIVE_ARCH_NAME "i586-pc-win32"
#define XEMACS_CYGWIN_ARCH_NAME "i686-pc-cygwin"

/*
 * Installation hierarchy is:
 * C:\Program Files\XEmacs
 *			\xemacs-packages
 *				\etc
 *				\info
 *				\lib-src
 *				\lisp
 *				\man
 *				\pkginfo
 * 			\site-packages
 *			\mule-packages
 *			\XEmacs-21.4
 *				\i586-pc-win32
 *				\etc
 *				\info
 *				\lisp
 * Or:
 * /usr/local/lib
 *		/xemacs/xemacs-packages
 * 		/xemacs/site-packages
 *		/xemacs/mule-packages
 *		/xemacs-21.4
 *				/i686-pc-cygwin
 *				/etc
 *				/info
 *				/lisp
 * /usr/local/bin/i686-pc-cygwin
 */