[Emacs-diffs] Changes to emacs/configure.in

[Jan Djärv]

Index: emacs/configure.in
diff -c emacs/configure.in:1.384 emacs/configure.in:1.385
*** emacs/configure.in:1.384    Wed Mar 16 22:21:31 2005
--- emacs/configure.in  Sun Mar 20 22:28:54 2005
***************
*** 109,118 ****
  [  --with-gif              use -lungif for displaying GIF images])
  AC_ARG_WITH(png,
  [  --with-png              use -lpng for displaying PNG images])
  AC_ARG_WITH(gtk,
  [  --with-gtk              use GTK (same as --with-x-toolkit=gtk)])
  AC_ARG_WITH(pkg-config-prog,
! [  --with-pkg-config-prog  Path to pkg-config to use for finding GTK])
  AC_ARG_WITH(toolkit-scroll-bars,
  [  --without-toolkit-scroll-bars
                            don't use Motif or Xaw3d scroll bars])
--- 109,120 ----
  [  --with-gif              use -lungif for displaying GIF images])
  AC_ARG_WITH(png,
  [  --with-png              use -lpng for displaying PNG images])
+ AC_ARG_WITH(xft,
+ [  --with-xft              use -lXft for anti aliased fonts])
  AC_ARG_WITH(gtk,
  [  --with-gtk              use GTK (same as --with-x-toolkit=gtk)])
  AC_ARG_WITH(pkg-config-prog,
! [  --with-pkg-config-prog  Path to pkg-config to use for finding GTK and Xft])
  AC_ARG_WITH(toolkit-scroll-bars,
  [  --without-toolkit-scroll-bars
                            don't use Motif or Xaw3d scroll bars])
***************
*** 2214,2219 ****
--- 2216,2257 ----
    CFLAGS=$late_CFLAGS
  fi
  
+ 
+ ### Use -lXft if available, unless `--with-xft=no'.
+ HAVE_XFT=maybe
+ if test "${HAVE_X11}" = "yes"; then
+   if test "${with_xft}" != "no"; then
+ 
+     dnl Check if --with-pkg-config-prog has been given.
+     if test "X${with_pkg_config_prog}" != X; then
+       PKG_CONFIG="${with_pkg_config_prog}"
+     fi
+ 
+     PKG_CHECK_MODULES(XFT, xft >= 0.13.0, , HAVE_XFT=no)
+     if test "$HAVE_XFT" != no; then
+       OLD_CFLAGS="$CPPFLAGS"
+       OLD_CFLAGS="$CFLAGS"
+       OLD_LIBS="$LIBS"
+       CPPFLAGS="$CPPFLAGS $XFT_CFLAGS"
+       CFLAGS="$CFLAGS $XFT_CFLAGS"
+       LIBS="$XFT_LIBS $LIBS"
+       AC_CHECK_HEADER(X11/Xft/Xft.h,
+         AC_CHECK_LIB(Xft, XftFontOpen, HAVE_XFT=yes, , $XFT_LIBS))
+ 
+       if test "${HAVE_XFT}" = "yes"; then
+         AC_DEFINE(HAVE_XFT, 1, [Define to 1 if you have the Xft library.])
+       AC_SUBST(XFT_LIBS)
+         C_SWITCH_X_SITE="$C_SWITCH_X_SITE $XFT_CFLAGS"
+       else
+         CFLAGS="$OLD_CPPFLAGS"
+         CFLAGS="$OLD_CFLAGS"
+         LIBS="$OLD_LIBS"
+       fi
+     fi
+   fi
+ fi
+ 
+ 
  ### Use -lXpm if available, unless `--with-xpm=no'.
  HAVE_XPM=no
  if test "${HAVE_X11}" = "yes"; then
***************
*** 2238,2244 ****
    fi
  
    if test "${HAVE_XPM}" = "yes"; then
!     AC_DEFINE(HAVE_XPM, 1, [Define to 1 if you have the Xpm libary (-lXpm).])
    fi
  fi
  
--- 2276,2282 ----
    fi
  
    if test "${HAVE_XPM}" = "yes"; then
!     AC_DEFINE(HAVE_XPM, 1, [Define to 1 if you have the Xpm library (-lXpm).])
    fi
  fi