Mercurial > hg > xemacs-beta

changeset 4498:f0c81cd2a959

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge.
author Mats Lidell <matsl@xemacs.org>
date Sun, 10 Aug 2008 23:24:15 +0200
parents f863b2ee146f (diff) c95c06ee1e9d (current diff)
children c86a3c1b7416
files lisp/mule/cyril-util.el src/ChangeLog
diffstat 6 files changed, 35 insertions(+), 193 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Sun Aug 10 12:15:56 2008 +0200
+++ b/ChangeLog	Sun Aug 10 23:24:15 2008 +0200
@@ -1,3 +1,10 @@
+2008-08-03  Mats Lidell  <matsl@xemacs.org>
+
+	* configure.ac: Fix typo xft_gauge to xft_gauges
+
+	* configure.ac (XE_COMPLEX_ARG): Use different defaults for
+	with-xft and without-xft.
+
 2008-07-06  Ville Skyttä  <scop@xemacs.org>
 
 	* configure.ac (xe_fst):
--- a/configure	Sun Aug 10 12:15:56 2008 +0200
+++ b/configure	Sun Aug 10 23:24:15 2008 +0200
@@ -1538,7 +1538,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
@@ -2888,12 +2889,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 +2971,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 +27333,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 +27529,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
 
 
@@ -39582,7 +39583,7 @@
   echo "    - Using Xft to render antialiased fonts in tab controls."
   echo "      WARNING: This feature will be replaced with a face."
 fi
-if test "$with_xft_gauge" = "yes"; then
+if test "$with_xft_gauges" = "yes"; then
   echo "    - Using Xft to render antialiased fonts in progress bars."
   echo "      WARNING: This feature will be replaced with a face."
   echo "      WARNING: This feature not yet implemented; setting ignored."
--- a/configure.ac	Sun Aug 10 12:15:56 2008 +0200
+++ b/configure.ac	Sun Aug 10 23:24:15 2008 +0200
@@ -690,9 +690,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 +3541,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 +4430,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"
+    with_xft_gauges="yes"
   else
-    with_xft_gauge="no"
+    with_xft_gauges="no"
   fi
 fi
 
@@ -4526,7 +4527,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
@@ -6078,7 +6079,7 @@
   echo "    - Using Xft to render antialiased fonts in tab controls."
   echo "      WARNING: This feature will be replaced with a face."
 fi
-if test "$with_xft_gauge" = "yes"; then
+if test "$with_xft_gauges" = "yes"; then
   echo "    - Using Xft to render antialiased fonts in progress bars."
   echo "      WARNING: This feature will be replaced with a face."
   echo "      WARNING: This feature not yet implemented; setting ignored."
--- a/lib-src/config.values.in	Sun Aug 10 12:15:56 2008 +0200
+++ b/lib-src/config.values.in	Sun Aug 10 23:24:15 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)
--- a/src/ChangeLog	Sun Aug 10 12:15:56 2008 +0200
+++ b/src/ChangeLog	Sun Aug 10 23:24:15 2008 +0200
@@ -10,6 +10,11 @@
 	* lisp.h: Remove Vcharset_arabic_iso8859_7.
 	See commentary in lisp/mule/iso-with-esc.el for motivation. 
 
+2008-08-03  Mats Lidell  <matsl@xemacs.org>
+
+	* config.h.in: Renamed USE_XFT_GAUGE to USE_XFT_GAUGES in sync
+	with configure.ac.
+
 2008-07-20  John Paul Wallington  <jpw@pobox.com>
 
 	* nt.c (Fmswindows_short_file_name, Fmswindows_long_file_name):
--- a/src/config.h.in	Sun Aug 10 12:15:56 2008 +0200
+++ b/src/config.h.in	Sun Aug 10 23:24:15 2008 +0200
@@ -225,7 +225,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