Re: ftx font driver [Re: Low redisplay performance (23 regression)]

[Chong Yidong <cyd@stupidchicken.com>]

Stefan Monnier <monnier@iro.umontreal.ca> writes:

> I think it's perfectly OK to say "if you have X and freetype, either
> install xft, or live without anti-aliasing".  IIUC that means I'd get
> rid of the ftx backend.

How bout the following?  (It should be fairly safe.)

*** trunk/configure.in.~1.591.~	2009-04-19 21:34:45.000000000 -0400
--- trunk/configure.in	2009-04-23 23:43:54.000000000 -0400
***************
*** 133,139 ****
  OPTION_DEFAULT_ON([png],[don't compile with PNG image support])
  OPTION_DEFAULT_ON([rsvg],[don't compile with SVG image support])
  
- OPTION_DEFAULT_ON([freetype],[don't use Freetype for local font support])
  OPTION_DEFAULT_ON([xft],[don't use XFT for anti aliased fonts])
  OPTION_DEFAULT_ON([libotf],[don't use libotf for OpenType font support])
  OPTION_DEFAULT_ON([m17n-flt],[don't use m17n-flt for text shaping])
--- 133,138 ----
***************
*** 1270,1276 ****
  if test "${HAVE_NS}" = yes; then
    window_system=nextstep
    with_xft=no
-   with_freetype=no
    # set up packaging dirs
    exec_prefix=${ns_appbindir}
    libexecdir=${ns_appbindir}/libexec
--- 1269,1274 ----
***************
*** 1844,1854 ****
  ### Start of font-backend (under X11) section.
  if test "${HAVE_X11}" = "yes"; then
     PKG_CHECK_MODULES(FONTCONFIG, fontconfig >= 2.2.0, HAVE_FC=yes, HAVE_FC=no)
-    test "${HAVE_FC}" = "no" && with_freetype=no
  
! ## Use -lXft if available, unless `--with-freetype=no' nor `--with-xft=no'.
     HAVE_XFT=maybe
!     if test "x${with_freetype}" = "xno" || test "x${with_x}" = "xno"; then
        with_xft="no";
      fi
      if test "x${with_xft}" != "xno"; then
--- 1842,1851 ----
  ### Start of font-backend (under X11) section.
  if test "${HAVE_X11}" = "yes"; then
     PKG_CHECK_MODULES(FONTCONFIG, fontconfig >= 2.2.0, HAVE_FC=yes, HAVE_FC=no)
  
!    ## Use -lXft if available, unless `--with-xft=no'.
     HAVE_XFT=maybe
!     if test "${HAVE_FC}" = "no" || test "x${with_x}" = "xno"; then
        with_xft="no";
      fi
      if test "x${with_xft}" != "xno"; then
***************
*** 1890,1898 ****
        HAVE_FREETYPE=yes
        FONTCONFIG_CFLAGS=
        FONTCONFIG_LIBS=
-     elif test "x${with_freetype}" != "xno" && test "x${with_x}" != "xno"; then
- 
-       PKG_CHECK_MODULES(FREETYPE, freetype2, HAVE_FREETYPE=yes, HAVE_FREETYPE=no)
      fi
  
      HAVE_LIBOTF=no
--- 1887,1892 ----