changeset: 4528:772c80e0e18073f34cb1bb67cff333a852a07d37 parent: 4518:6b0000935adc3f79cb189350d6014d4b4aff734e user: Mats Lidell <matsl(a)xemacs.org&gt; date: Sun Aug 03 22:00:52 2008 +0200 files: ChangeLog configure configure.ac lib-src/config.values.in description: with-xft defaults to xft being used with a default setting. If with-xft is not set it is equal to calling configure with-xft=no diff -r 6b0000935adc3f79cb189350d6014d4b4aff734e -r 772c80e0e18073f34cb1bb67cff333a852a07d37 ChangeLog --- a/ChangeLog Sat Jul 26 13:50:27 2008 +0300 +++ b/ChangeLog Sun Aug 03 22:00:52 2008 +0200 ＠＠ -1,3 +1,8 ＠＠ 2008-07-06 Ville Skyttä <scop(a)xemacs.o +2008-08-03 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 6b0000935adc3f79cb189350d6014d4b4aff734e -r 772c80e0e18073f34cb1bb67cff333a852a07d37 configure --- a/configure Sat Jul 26 13:50:27 2008 +0300 +++ b/configure Sun Aug 03 22:00:52 2008 +0200 ＠＠ -1538,7 +1538,8 ＠＠ Window-system options `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 ＠＠ -2888,12 +2889,12 ＠＠ fi; 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 +2971,7 ＠＠ for y in $_xft_types; do 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. diff -r 6b0000935adc3f79cb189350d6014d4b4aff734e -r 772c80e0e18073f34cb1bb67cff333a852a07d37 configure.ac --- a/configure.ac Sat Jul 26 13:50:27 2008 +0300 +++ b/configure.ac Sun Aug 03 22:00:52 2008 +0200 ＠＠ -690,9 +690,10 ＠＠ XE_COMPLEX_ARG([xft], [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])]) diff -r 6b0000935adc3f79cb189350d6014d4b4aff734e -r 772c80e0e18073f34cb1bb67cff333a852a07d37 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 Sun Aug 03 22:00:52 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) _______________________________________________ XEmacs-Patches mailing list XEmacs-Patches(a)xemacs.org http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches