comparison configure.in @ 112411:6178cf733e6f

Merge from mainline.

112403:c81ff7082a9a

    dnl For the "Does Emacs use" message at the end.
    if test "$HAVE_XFT" != "yes"; then
       HAVE_XFT=no
    fi


    HAVE_FREETYPE=no
    ## We used to allow building with FreeType and without Xft.
    ## However, the ftx font backend driver is not in good shape.
    if test "${HAVE_XFT}" = "yes"; then
      dnl As we use Xft, we anyway use freetype.
      dnl There's no need for additional CFLAGS and LIBS.
      HAVE_FREETYPE=yes
      FONTCONFIG_CFLAGS=
      FONTCONFIG_LIBS=
    fi

    HAVE_LIBOTF=no
    if test "${HAVE_FREETYPE}" = "yes"; then
      AC_DEFINE(HAVE_FREETYPE, 1,
		[Define to 1 if using the freetype and fontconfig libraries.])

112411:6178cf733e6f

    dnl For the "Does Emacs use" message at the end.
    if test "$HAVE_XFT" != "yes"; then
       HAVE_XFT=no
    fi

    ## We used to allow building with FreeType and without Xft.
    ## However, the ftx font backend driver is not in good shape.
    HAVE_FREETYPE=$HAVE_XFT

    HAVE_LIBOTF=no
    if test "${HAVE_FREETYPE}" = "yes"; then
      AC_DEFINE(HAVE_FREETYPE, 1,
		[Define to 1 if using the freetype and fontconfig libraries.])