Mercurial > emacs

comparison configure.in @ 107617:c5f9e4613394

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from mainline.
author Eli Zaretskii <eliz@gnu.org>
date Sat, 16 Jan 2010 06:57:09 -0500
parents 1d1d5d9bd884
children d189e0755f30
comparison
equal deleted inserted replaced
107616:fa5ad3eee9f5 107617:c5f9e4613394
2 dnl To rebuild the `configure' script from this, execute the command 2 dnl To rebuild the `configure' script from this, execute the command
3 dnl autoconf 3 dnl autoconf
4 dnl in the directory containing this script. 4 dnl in the directory containing this script.
5 dnl 5 dnl
6 dnl Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2003, 6 dnl Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2003,
7 dnl 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. 7 dnl 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
8 dnl 8 dnl
9 dnl This file is part of GNU Emacs. 9 dnl This file is part of GNU Emacs.
10 dnl 10 dnl
11 dnl GNU Emacs is free software: you can redistribute it and/or modify 11 dnl GNU Emacs is free software: you can redistribute it and/or modify
12 dnl it under the terms of the GNU General Public License as published by 12 dnl it under the terms of the GNU General Public License as published by
1982 with_xft="no"; 1982 with_xft="no";
1983 fi 1983 fi
1984 if test "x${with_xft}" != "xno"; then 1984 if test "x${with_xft}" != "xno"; then
1985 1985
1986 PKG_CHECK_MODULES(XFT, xft >= 0.13.0, , HAVE_XFT=no) 1986 PKG_CHECK_MODULES(XFT, xft >= 0.13.0, , HAVE_XFT=no)
1987 if test "$HAVE_XFT" != no; then 1987 ## Because xftfont.c uses XRenderQueryExtension, we also
1988 ## need to link to -lXrender.
1989 HAVE_XRENDER=no
1990 AC_CHECK_LIB(Xrender, XRenderQueryExtension, HAVE_XRENDER=yes)
1991 if test "$HAVE_XFT" != no && test "$HAVE_XRENDER" != no; then
1988 OLD_CPPFLAGS="$CPPFLAGS" 1992 OLD_CPPFLAGS="$CPPFLAGS"
1989 OLD_CFLAGS="$CFLAGS" 1993 OLD_CFLAGS="$CFLAGS"
1990 OLD_LIBS="$LIBS" 1994 OLD_LIBS="$LIBS"
1991 CPPFLAGS="$CPPFLAGS $XFT_CFLAGS" 1995 CPPFLAGS="$CPPFLAGS $XFT_CFLAGS"
1992 CFLAGS="$CFLAGS $XFT_CFLAGS" 1996 CFLAGS="$CFLAGS $XFT_CFLAGS"
1997 XFT_LIBS="-lXrender $XFT_LIBS"
1993 LIBS="$XFT_LIBS $LIBS" 1998 LIBS="$XFT_LIBS $LIBS"
1994 AC_CHECK_HEADER(X11/Xft/Xft.h, 1999 AC_CHECK_HEADER(X11/Xft/Xft.h,
1995 AC_CHECK_LIB(Xft, XftFontOpen, HAVE_XFT=yes, , $XFT_LIBS)) 2000 AC_CHECK_LIB(Xft, XftFontOpen, HAVE_XFT=yes, , $XFT_LIBS))
1996 2001
1997 if test "${HAVE_XFT}" = "yes"; then 2002 if test "${HAVE_XFT}" = "yes"; then
2710 fi 2715 fi
2711 2716
2712 2717
2713 AH_TOP([/* GNU Emacs site configuration template file. 2718 AH_TOP([/* GNU Emacs site configuration template file.
2714 Copyright (C) 1988, 1993, 1994, 1999, 2000, 2001, 2002, 2004, 2005, 2719 Copyright (C) 1988, 1993, 1994, 1999, 2000, 2001, 2002, 2004, 2005,
2715 2006, 2007, 2008, 2009 Free Software Foundation, Inc. 2720 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
2716 2721
2717 This file is part of GNU Emacs. 2722 This file is part of GNU Emacs.
2718 2723
2719 GNU Emacs is free software: you can redistribute it and/or modify 2724 GNU Emacs is free software: you can redistribute it and/or modify
2720 it under the terms of the GNU General Public License as published by 2725 it under the terms of the GNU General Public License as published by