From f658493daeb1b2629b7c561d1f432612219c72d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?=
 <flameeyes@gmail.com>
Date: Fri, 29 Sep 2006 18:36:52 +0000
Subject: Add an optional dependency over fontconfig, so that if present it is
 used to identify which font to load for OSD and subtitles. This allows to use
 truetype fonts by specifying their friendly name and just that. Also prefer
 FreeType2 loaded fonts to bitmap fonts.

CVS patchset: 8321
CVS date: 2006/09/29 18:36:52
---
 configure.ac | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index 00a8139aa..3ff1df316 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1288,13 +1288,33 @@ if test "x$with_freetype" != "xno"; then
    PKG_CHECK_MODULES([FT2], [freetype2], [have_freetype=yes], [have_freetype=no])
    if test "x$with_freetype" = "xyes" && test "x$have_freetype" = "xno"; then
       AC_MSG_ERROR([FreeType2 support requested but FreeType2 library not found])
-   elif test "x$have_freetype" = "yes"; then
+   elif test "x$have_freetype" = "xyes"; then
       AC_DEFINE([HAVE_FT2], [1], [Define this if you have freetype2 library])
    fi
 fi
 AC_SUBST([FT2_CFLAGS])
 AC_SUBST([FT2_LIBS])
 
+dnl ---------------------------------------------
+dnl fontconfig
+dnl ---------------------------------------------
+AC_ARG_WITH([fontconfig],
+	AS_HELP_STRING([--without-fontconfig], [Do not build with fontconfig library]))
+
+if test "x$with_fontconfig" = "xyes" && test "x$have_fontconfig" = "xno"; then
+   AC_MSG_ERROR([fontconfig support requested, but FreeType2 not found.])
+elif test "x$with_fontconfig" != "xno" && test "x$have_fontconfig" != "xno"; then
+   PKG_CHECK_MODULES([FONTCONFIG], [fontconfig], [have_fontconfig=yes], [have_fontconfig=no])
+   if test "x$with_fontconfig" = "xyes" && test "x$have_fontconfig" = "xno"; then
+      AC_MSG_ERROR([fontconfig support requested but fontconfig library not found])
+   elif test "x$have_fontconfig" = "xyes"; then
+      AC_DEFINE([HAVE_FONTCONFIG], [1], [Define this if you have fontconfig library])
+   fi
+fi
+AC_SUBST([FONTCONFIG_CFLAGS])
+AC_SUBST([FONTCONFIG_LIBS])
+
+
 dnl ---------------------------------------------
 dnl OSS style audio interface
 dnl ---------------------------------------------
-- 
cgit v1.2.3