# HG changeset patch
# User diego
# Date 1151671265 0
# Node ID 1629108cd5b0d64534b79172a585902dfa9df409
# Parent  06e4c7737aa7c55546df6fb3cd2c6bd66d06925f
Move conditional FreeType support compilation to the build system.

diff -r 06e4c7737aa7 -r 1629108cd5b0 configure
--- a/configure	Fri Jun 30 12:40:05 2006 +0000
+++ b/configure	Fri Jun 30 12:41:05 2006 +0000
@@ -7481,6 +7481,7 @@
 DIRECTFB_LIB = $_ld_directfb
 CDPARANOIA_INC = $_inc_cdparanoia
 CDPARANOIA_LIB = $_ld_cdparanoia
+FREETYPE = $_freetype
 FREETYPE_INC = $_inc_freetype
 FREETYPE_LIB = $_ld_freetype
 FONTCONFIG_INC = $_inc_fontconfig
diff -r 06e4c7737aa7 -r 1629108cd5b0 libvo/Makefile
--- a/libvo/Makefile	Fri Jun 30 12:40:05 2006 +0000
+++ b/libvo/Makefile	Fri Jun 30 12:41:05 2006 +0000
@@ -6,7 +6,6 @@
 SRCS=aclib.c \
      aspect.c \
      font_load.c \
-     font_load_ft.c \
      geometry.c \
      osd.c \
      spuenc.c \
@@ -25,6 +24,10 @@
 OBJS_TEMP=$(basename $(SRCS))
 OBJS=$(OBJS_TEMP:%=%.o)
 
+ifeq ($(FREETYPE),yes)
+SRCS += font_load_ft.c
+endif
+
 ifeq ($(VIDIX),yes)
 SRCS += vosub_vidix.c
 endif
diff -r 06e4c7737aa7 -r 1629108cd5b0 libvo/font_load_ft.c
--- a/libvo/font_load_ft.c	Fri Jun 30 12:40:05 2006 +0000
+++ b/libvo/font_load_ft.c	Fri Jun 30 12:41:05 2006 +0000
@@ -11,8 +11,6 @@
 
 #include "config.h"
 
-#ifdef HAVE_FREETYPE
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <math.h>
@@ -1170,5 +1168,3 @@
     vo_font=read_font_desc_ft(font_name, width, height);
 #endif
 }
-
-#endif /* HAVE_FREETYPE */