[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/configure.in,v
From: |
Kenichi Handa |
Subject: |
[Emacs-diffs] Changes to emacs/configure.in,v |
Date: |
Thu, 30 Oct 2008 07:11:15 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Kenichi Handa <handa> 08/10/30 07:11:14
Index: configure.in
===================================================================
RCS file: /cvsroot/emacs/emacs/configure.in,v
retrieving revision 1.573
retrieving revision 1.574
diff -u -b -r1.573 -r1.574
--- configure.in 30 Oct 2008 02:27:30 -0000 1.573
+++ configure.in 30 Oct 2008 07:11:14 -0000 1.574
@@ -1825,6 +1825,8 @@
fi
### Start of font-backend section.
+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
@@ -1868,16 +1870,11 @@
dnl As we use Xft, we anyway use freetype.
dnl In this case, there's no need of additional CFLAGS and LIBS.
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)
- if test "${HAVE_FREETYPE}" = "yes"; then
- PKG_CHECK_MODULES(FONTCONFIG, fontconfig, HAVE_FC=yes, HAVE_FC=no)
- if test "${HAVE_FC}" = "no"; then
- dnl Without fontconfig, we can't use freetype at the moment.
- HAVE_FREETYPE=no
- fi
- fi
fi
HAVE_LIBOTF=no
- [Emacs-diffs] Changes to emacs/configure.in,v, Adrian Robert, 2008/10/03
- [Emacs-diffs] Changes to emacs/configure.in,v, Glenn Morris, 2008/10/04
- [Emacs-diffs] Changes to emacs/configure.in,v, Andreas Schwab, 2008/10/12
- [Emacs-diffs] Changes to emacs/configure.in,v, Dan Nicolaescu, 2008/10/18
- [Emacs-diffs] Changes to emacs/configure.in,v, Dan Nicolaescu, 2008/10/23
- [Emacs-diffs] Changes to emacs/configure.in,v, Dan Nicolaescu, 2008/10/23
- [Emacs-diffs] Changes to emacs/configure.in,v, Glenn Morris, 2008/10/24
- [Emacs-diffs] Changes to emacs/configure.in,v, Glenn Morris, 2008/10/24
- [Emacs-diffs] Changes to emacs/configure.in,v, Dan Nicolaescu, 2008/10/29
- [Emacs-diffs] Changes to emacs/configure.in,v,
Kenichi Handa <=