Hi, My first hg patch coming up. Please inspect carefully. Maybe not a wise thing to start with changing configure behavior. After running make configure I got unexpected changes in lib-src/config.values.in. Am I doing something wrong here? Details below. There seemed to be a typo concerning with-xft-gauge and with-xft-gauges that results in gauges beeing selected unconditionally if with_xft_emacs=yes. I guess xft-gauges isn't used at the moment so it may be left as it is for some reason. Stephen? # HG changeset patch # User Mats Lidell <matsl(a)xemacs.org&gt; # Date 1217196051 -7200 # Node ID 2e80c89e982f64e78281062454bfd06de74df56f # Parent 6b0000935adc3f79cb189350d6014d4b4aff734e Changes the default for with-xft so that with-xft=yes results in a default that has xft activated. Also fixes a typo. Both with-xft-gauge and with-xft-gauges was present. diff -r 6b0000935adc -r 2e80c89e982f ChangeLog --- a/ChangeLog Sat Jul 26 13:50:27 2008 +0300 +++ b/ChangeLog Mon Jul 28 00:00:51 2008 +0200 ＠＠ -1,3 +1,8 ＠＠ +2008-07-27 Mats Lidell <matsl(a)xemacs.org&gt; + + * configure.ac (XE_COMPLEX_ARG): Use different defaults for with-xft + and without-xft. + 2008-07-06 Ville Skytt~ <scop(a)xemacs.org&gt; * configure.ac (xe_fst): diff -r 6b0000935adc -r 2e80c89e982f configure --- a/configure Sat Jul 26 13:50:27 2008 +0300 +++ b/configure Mon Jul 28 00:00:51 2008 +0200 ＠＠ -1426,10 +1426,6 ＠＠ --enable-FEATURE[=ARG] alias for --with-FEATURE --without-FEATURE do not use FEATURE (same as --with-FEATURE=no) --disable-FEATURE alias for --without-FEATURE - -Compilation options -------------------- - --with-compiler C compiler to use --with-xemacs-compiler compiler to use to compile just the xemacs executable and C modules. If you want to compile ＠＠ -1538,7 +1534,8 ＠＠ `gauges'. Prefix component with `no' to disable its use of Xft. Requires X11, Xft, Xrender, freetype, and fontconfig support. Default is `noemacs, - nomenubars, notabs, nogauges'. + nomenubars, notabs, nogauges'. The default when + selected is `emacs, nomenubars, notabs, nogauges'. --with-gtk Support GTK on the X Window System. (EXPERIMENTAL) --with-gnome Support GNOME on the X Window System. (EXPERIMENTAL) --with-msw Support MS Windows as a window system (only under ＠＠ -2266,7 +2263,6 ＠＠ MAKE_SUBDIR="$MAKE_SUBDIR lib-src" && if test "$verbose" = "yes"; then echo " Appending \"lib-src\" to \$MAKE_SUBDIR"; fi INSTALL_ARCH_DEP_SUBDIR="$INSTALL_ARCH_DEP_SUBDIR lib-src" && if test "$verbose" = "yes"; then echo " Appending \"lib-src\" to \$INSTALL_ARCH_DEP_SUBDIR"; fi with_dragndrop_default="no" - # If --with-compiler or --without-compiler were given then copy the value to the # equivalent enable_compiler variable. if test "${with_compiler+set}" = set; then ＠＠ -2888,12 +2884,12 ＠＠ fi; _xft_notfirst="" -_xft_emacs_default=no +_xft_emacs_default=yes _xft_menubars_default=no _xft_tabs_default=no _xft_gauges_default=no _xft_types="emacs menubars tabs gauges" -_xft_default="noemacs,nomenubars,notabs,nogauges" +_xft_default="emacs,nomenubars,notabs,nogauges" # If --with-xft or --without-xft were given then copy the value to the # equivalent enable_xft variable. ＠＠ -2970,7 +2966,7 ＠＠ eval "enable_xft_$y=\$_xft_${y}_default" unset _xft_${y}_default done - +with_xft_emacs=no fi; # If --with-gtk or --without-gtk were given then copy the value to the # equivalent enable_gtk variable. ＠＠ -27332,11 +27328,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 ＠＠ -27528,8 +27524,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 diff -r 6b0000935adc -r 2e80c89e982f configure.ac --- a/configure.ac Sat Jul 26 13:50:27 2008 +0300 +++ b/configure.ac Mon Jul 28 00:00:51 2008 +0200 ＠＠ -540,23 +540,7 ＠＠ dnl Note that AS_HELP_STRING compresses whitespace, wraps, and indents the dnl string to fit the --help display; there's no need to preformat. dnl -dnl I think these will be caught by autoconf internal checks, -dnl only --with-* are unchecked -dnl --external-widget --enable-external-widget -dnl --native-sound-lib=LIB --with-native-sound-lib -dnl --mail-locking=TYPE --with-mail-locking -dnl --rel-alloc --with-rel-alloc -dnl --use-number-lib --enable-bignum -dnl --debug --enable-debug -dnl --error-checking --enable-error-checking -dnl --memory-usage-stats --enable-memory-usage-stats -dnl --quick-build --enable-quick-build -dnl --use-union-type --enable-union-type -dnl --pdump --enable-pdump -dnl --use-kkcc --enable-kkcc -dnl -dnl parse flags -XE_HELP_SUBSECTION([Compilation options]) +dnl I think these will be caught by autoconf inFTE_HELP_SUBSECTION([Compilation options]) XE_MERGED_ARG([compiler], AS_HELP_STRING([--with-compiler],[C compiler to use]), [], []) ＠＠ -690,9 +674,10 ＠＠ [Xft], [`emacs' (buffers), `menubars', `tabs', and `gauges'], [X11, Xft, Xrender, freetype, and fontconfig], - [`noemacs, nomenubars, notabs, nogauges'])], - [],[], - [XE_COMPLEX_OPTION([emacs],[no]), + [`noemacs, nomenubars, notabs, nogauges'. + The default when selected is `emacs, nomenubars, notabs, nogauges'])], + [],[with_xft_emacs=no], + [XE_COMPLEX_OPTION([emacs],[yes]), XE_COMPLEX_OPTION([menubars],[no]), XE_COMPLEX_OPTION([tabs],[no]), XE_COMPLEX_OPTION([gauges],[no])]) ＠＠ -3540,7 +3525,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 ＠＠ -4429,11 +4414,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" - else - with_xft_gauge="no" + with_xft_gauges="yes" + else + with_xft_gauges="no" fi fi ＠＠ -4526,7 +4511,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 diff -r 6b0000935adc -r 2e80c89e982f lib-src/config.values.in --- a/lib-src/config.values.in Sat Jul 26 13:50:27 2008 +0300 +++ b/lib-src/config.values.in Mon Jul 28 00:00:51 2008 +0200 ＠＠ -15,178 +15,6 ＠＠ ;;; Variables defined in configure by AC_SUBST follow: ;;; (These are used in Makefiles) -ALLOCA "＠ALLOCA＠" -ARCHLIBDIR "＠ARCHLIBDIR＠" -ARCHLIBDIR_USER_DEFINED "＠ARCHLIBDIR_USER_DEFINED＠" -CC "＠CC＠" -CFLAGS "＠CFLAGS＠" -CPP "＠CPP＠" -CPPFLAGS "＠CPPFLAGS＠" -DEFS "＠DEFS＠" -DOCDIR "＠DOCDIR＠" -DOCDIR_USER_DEFINED "＠DOCDIR_USER_DEFINED＠" -EARLY_PACKAGE_DIRECTORIES "＠EARLY_PACKAGE_DIRECTORIES＠" -EARLY_PACKAGE_DIRECTORIES_USER_DEFINED "＠EARLY_PACKAGE_DIRECTORIES_USER_DEFINED＠" -ECHO_C "＠ECHO_C＠" -ECHO_N "＠ECHO_N＠" -ECHO_T "＠ECHO_T＠" -EGREP "＠EGREP＠" -ETCDIR "＠ETCDIR＠" -ETCDIR_USER_DEFINED "＠ETCDIR_USER_DEFINED＠" -EXEC_PREFIX "＠EXEC_PREFIX＠" -EXEC_PREFIX_USER_DEFINED "＠EXEC_PREFIX_USER_DEFINED＠" -EXEEXT "＠EXEEXT＠" -GTK_CONFIG "＠GTK_CONFIG＠" -INFODIR "＠INFODIR＠" -INFODIR_USER_DEFINED "＠INFODIR_USER_DEFINED＠" -INFOPATH "＠INFOPATH＠" -INFOPATH_USER_DEFINED "＠INFOPATH_USER_DEFINED＠" -INSTALL "＠INSTALL＠" -INSTALLPATH "＠INSTALLPATH＠" -INSTALL_ARCH_DEP_SUBDIR "＠INSTALL_ARCH_DEP_SUBDIR＠" -INSTALL_DATA "＠INSTALL_DATA＠" -INSTALL_PROGRAM "＠INSTALL_PROGRAM＠" -INSTALL_SCRIPT "＠INSTALL_SCRIPT＠" -LAST_PACKAGE_DIRECTORIES "＠LAST_PACKAGE_DIRECTORIES＠" -LAST_PACKAGE_DIRECTORIES_USER_DEFINED "＠LAST_PACKAGE_DIRECTORIES_USER_DEFINED＠" -LATE_PACKAGE_DIRECTORIES "＠LATE_PACKAGE_DIRECTORIES＠" -LATE_PACKAGE_DIRECTORIES_USER_DEFINED "＠LATE_PACKAGE_DIRECTORIES_USER_DEFINED＠" -LDFLAGS "＠LDFLAGS＠" -LIBOBJS "＠LIBOBJS＠" -LIBS "＠LIBS＠" -LIBSTDCPP "＠LIBSTDCPP＠" -LISPDIR "＠LISPDIR＠" -LISPDIR_USER_DEFINED "＠LISPDIR_USER_DEFINED＠" -LN_S "＠LN_S＠" -LTLIBOBJS "＠LTLIBOBJS＠" -MAKE_DOCFILE "＠MAKE_DOCFILE＠" -MAKE_SUBDIR "＠MAKE_SUBDIR＠" -MODARCHDIR "＠MODARCHDIR＠" -MODCFLAGS "＠MODCFLAGS＠" -MODULEDIR "＠MODULEDIR＠" -MODULEDIR_USER_DEFINED "＠MODULEDIR_USER_DEFINED＠" -MOD_CC "＠MOD_CC＠" -MOD_INSTALL_PROGRAM "＠MOD_INSTALL_PROGRAM＠" -OBJECT_TO_BUILD "＠OBJECT_TO_BUILD＠" -OBJEXT "＠OBJEXT＠" -PACKAGE_BUGREPORT "＠PACKAGE_BUGREPORT＠" -PACKAGE_NAME "＠PACKAGE_NAME＠" -PACKAGE_PATH "＠PACKAGE_PATH＠" -PACKAGE_PATH_USER_DEFINED "＠PACKAGE_PATH_USER_DEFINED＠" -PACKAGE_STRING "＠PACKAGE_STRING＠" -PACKAGE_TARNAME "＠PACKAGE_TARNAME＠" -PACKAGE_VERSION "＠PACKAGE_VERSION＠" -PATH_SEPARATOR "＠PATH_SEPARATOR＠" -PREFIX "＠PREFIX＠" -PREFIX_USER_DEFINED "＠PREFIX_USER_DEFINED＠" -PROGNAME "＠PROGNAME＠" -RANLIB "＠RANLIB＠" -RECURSIVE_MAKE_ARGS "＠RECURSIVE_MAKE_ARGS＠" -SET_MAKE "＠SET_MAKE＠" -SHELL "＠SHELL＠" -SITELISPDIR "＠SITELISPDIR＠" -SITELISPDIR_USER_DEFINED "＠SITELISPDIR_USER_DEFINED＠" -SITEMODULEDIR "＠SITEMODULEDIR＠" -SITEMODULEDIR_USER_DEFINED "＠SITEMODULEDIR_USER_DEFINED＠" -SRC_SUBDIR_DEPS "＠SRC_SUBDIR_DEPS＠" -SUBDIR_MAKEFILES "＠SUBDIR_MAKEFILES＠" -XEMACS_CC "＠XEMACS_CC＠" -XE_CFLAGS "＠XE_CFLAGS＠" -X_CFLAGS "＠X_CFLAGS＠" -X_EXTRA_LIBS "＠X_EXTRA_LIBS＠" -X_LIBS "＠X_LIBS＠" -X_PRE_LIBS "＠X_PRE_LIBS＠" -YACC "＠YACC＠" -abs_builddir "＠abs_builddir＠" -abs_srcdir "＠abs_srcdir＠" -abs_top_builddir "＠abs_top_builddir＠" -abs_top_srcdir "＠abs_top_srcdir＠" -ac_ct_CC "＠ac_ct_CC＠" -ac_ct_RANLIB "＠ac_ct_RANLIB＠" -archlibdir "＠archlibdir＠" -bindir "＠bindir＠" -bitmapdir "＠bitmapdir＠" -blddir "＠blddir＠" -build "＠build＠" -build_alias "＠build_alias＠" -build_cpu "＠build_cpu＠" -build_os "＠build_os＠" -build_vendor "＠build_vendor＠" -builddir "＠builddir＠" -c_switch_all "＠c_switch_all＠" -c_switch_general "＠c_switch_general＠" -c_switch_window_system "＠c_switch_window_system＠" -canna_libs "＠canna_libs＠" -configuration "＠configuration＠" -configure_input "＠configure_input＠" -datadir "＠datadir＠" -datarootdir "＠datarootdir＠" -dll_cflags "＠dll_cflags＠" -dll_ld "＠dll_ld＠" -dll_ldflags "＠dll_ldflags＠" -dll_ldo "＠dll_ldo＠" -dll_post "＠dll_post＠" -dnd_objs "＠dnd_objs＠" -docdir "＠docdir＠" -dynodump_arch "＠dynodump_arch＠" -early_packages "＠early_packages＠" -etcdir "＠etcdir＠" -exec_prefix "＠exec_prefix＠" -extra_includes "＠extra_includes＠" -extra_objs "＠extra_objs＠" -have_esd_config "＠have_esd_config＠" -host_alias "＠host_alias＠" -includedir "＠includedir＠" -infodir "＠infodir＠" -infopath "＠infopath＠" -install_pp "＠install_pp＠" -inststaticdir "＠inststaticdir＠" -instvardir "＠instvardir＠" -internal_makefile_list "＠internal_makefile_list＠" -last_packages "＠last_packages＠" -late_packages "＠late_packages＠" -ld "＠ld＠" -ld_dynamic_link_flags "＠ld_dynamic_link_flags＠" -ld_libs_all "＠ld_libs_all＠" -ld_libs_general "＠ld_libs_general＠" -ld_libs_window_system "＠ld_libs_window_system＠" -ld_switch_all "＠ld_switch_all＠" -ld_switch_general "＠ld_switch_general＠" -ld_switch_shared "＠ld_switch_shared＠" -ld_switch_window_system "＠ld_switch_window_system＠" -ldap_libs "＠ldap_libs＠" -lib_gcc "＠lib_gcc＠" -libdir "＠libdir＠" -libexecdir "＠libexecdir＠" -libs_xauth "＠libs_xauth＠" -lispdir "＠lispdir＠" -localstatedir "＠localstatedir＠" -lwlib_objs "＠lwlib_objs＠" -machfile "＠machfile＠" -mandir "＠mandir＠" -moduledir "＠moduledir＠" -native_sound_lib "＠native_sound_lib＠" -oldincludedir "＠oldincludedir＠" -opsysfile "＠opsysfile＠" -package_path "＠package_path＠" -postgresql_libs "＠postgresql_libs＠" -prefix "＠prefix＠" -program_transform_name "＠program_transform_name＠" -sbindir "＠sbindir＠" -sharedstatedir "＠sharedstatedir＠" -sitelispdir "＠sitelispdir＠" -sitemoduledir "＠sitemoduledir＠" -sound_cflags "＠sound_cflags＠" -srcdir "＠srcdir＠" -start_files "＠start_files＠" -start_flags "＠start_flags＠" -statedir "＠statedir＠" -sysconfdir "＠sysconfdir＠" -target_alias "＠target_alias＠" -top_builddir "＠top_builddir＠" -top_srcdir "＠top_srcdir＠" -version "＠version＠" -with_modules "＠with_modules＠" ;;; Variables defined in configure by AC_DEFINE and AC_DEFINE_UNQUOTED follow: ;;; (These are used in C code) diff -r 6b0000935adc -r 2e80c89e982f src/ChangeLog --- a/src/ChangeLog Sat Jul 26 13:50:27 2008 +0300 +++ b/src/ChangeLog Mon Jul 28 00:00:51 2008 +0200 ＠＠ -1,3 +1,7 ＠＠ +2008-07-27 Mats Lidell <matsl(a)xemacs.org&gt; + + * config.h.in: Renamed USE_XFT_GAUGES. + 2008-07-20 John Paul Wallington <jpw(a)pobox.com&gt; * nt.c (Fmswindows_short_file_name, Fmswindows_long_file_name): diff -r 6b0000935adc -r 2e80c89e982f src/config.h.in --- a/src/config.h.in Sat Jul 26 13:50:27 2008 +0300 +++ b/src/config.h.in Mon Jul 28 00:00:51 2008 +0200 ＠＠ -20,8 +20,7 ＠＠ Boston, MA 02111-1307, USA. */ /* Significantly divergent from FSF. */ - -/* No code in XEmacs #includes config.h twice, but some of the code +XEmacs #includes config.h twice, but some of the code intended to work with other packages as well (like gmalloc.c) think they can include it as many times as they like. */ #ifndef _SRC_CONFIG_H_ ＠＠ -225,7 +224,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 Done 00:03:05 -- %% Mats _______________________________________________ XEmacs-Patches mailing list XEmacs-Patches(a)xemacs.org http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches