Mercurial > emacs
comparison configure.in @ 99245:03f5d6ae5684
Check fontconfig always.
author | Kenichi Handa <handa@m17n.org> |
---|---|
date | Thu, 30 Oct 2008 07:11:14 +0000 |
parents | 33f425648e13 |
children | 71576fddc0a7 |
comparison
equal
deleted
inserted
replaced
99244:4f618405b3d2 | 99245:03f5d6ae5684 |
---|---|
1823 fi | 1823 fi |
1824 CFLAGS=$late_CFLAGS | 1824 CFLAGS=$late_CFLAGS |
1825 fi | 1825 fi |
1826 | 1826 |
1827 ### Start of font-backend section. | 1827 ### Start of font-backend section. |
1828 PKG_CHECK_MODULES(FONTCONFIG, fontconfig >= 2.2.0, HAVE_FC=yes, HAVE_FC=no) | |
1829 test "${HAVE_FC}" = "no" && with_freetype=no | |
1828 | 1830 |
1829 ## Use -lXft if available, unless `--with-freetype=no' nor `--with-xft=no'. | 1831 ## Use -lXft if available, unless `--with-freetype=no' nor `--with-xft=no'. |
1830 HAVE_XFT=maybe | 1832 HAVE_XFT=maybe |
1831 if test "x${with_freetype}" = "xno" || test "x${with_x}" = "xno"; then | 1833 if test "x${with_freetype}" = "xno" || test "x${with_x}" = "xno"; then |
1832 with_xft="no"; | 1834 with_xft="no"; |
1866 ### Use -lfreetype if available, unless `--with-freetype=no'. | 1868 ### Use -lfreetype if available, unless `--with-freetype=no'. |
1867 if test "${HAVE_XFT}" = "yes"; then | 1869 if test "${HAVE_XFT}" = "yes"; then |
1868 dnl As we use Xft, we anyway use freetype. | 1870 dnl As we use Xft, we anyway use freetype. |
1869 dnl In this case, there's no need of additional CFLAGS and LIBS. | 1871 dnl In this case, there's no need of additional CFLAGS and LIBS. |
1870 HAVE_FREETYPE=yes | 1872 HAVE_FREETYPE=yes |
1873 FONTCONFIG_CFLAGS= | |
1874 FONTCONFIG_LIBS= | |
1871 elif test "x${with_freetype}" != "xno" && test "x${with_x}" != "xno"; then | 1875 elif test "x${with_freetype}" != "xno" && test "x${with_x}" != "xno"; then |
1872 | 1876 |
1873 PKG_CHECK_MODULES(FREETYPE, freetype2, HAVE_FREETYPE=yes, HAVE_FREETYPE=no) | 1877 PKG_CHECK_MODULES(FREETYPE, freetype2, HAVE_FREETYPE=yes, HAVE_FREETYPE=no) |
1874 if test "${HAVE_FREETYPE}" = "yes"; then | |
1875 PKG_CHECK_MODULES(FONTCONFIG, fontconfig, HAVE_FC=yes, HAVE_FC=no) | |
1876 if test "${HAVE_FC}" = "no"; then | |
1877 dnl Without fontconfig, we can't use freetype at the moment. | |
1878 HAVE_FREETYPE=no | |
1879 fi | |
1880 fi | |
1881 fi | 1878 fi |
1882 | 1879 |
1883 HAVE_LIBOTF=no | 1880 HAVE_LIBOTF=no |
1884 if test "${HAVE_FREETYPE}" = "yes"; then | 1881 if test "${HAVE_FREETYPE}" = "yes"; then |
1885 AC_DEFINE(HAVE_FREETYPE, 1, | 1882 AC_DEFINE(HAVE_FREETYPE, 1, |