Move conditional FreeType support compilation to the build system.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18869 b3059339-0415-0410-9bf9-f77b7e298cf2

configure

@@ -7481,6 +7481,7 @@ DIRECTFB_INC = $_inc_directfb
 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

libvo/Makefile

@@ -6,7 +6,6 @@ LIBNAME = libvo.a
 SRCS=aclib.c \
      aspect.c \
      font_load.c \
-     font_load_ft.c \
      geometry.c \
      osd.c \
      spuenc.c \
@@ -25,6 +24,10 @@ endif
 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

libvo/font_load_ft.c

@@ -11,8 +11,6 @@
 
 #include "config.h"
 
-#ifdef HAVE_FREETYPE
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <math.h>
@@ -1170,5 +1168,3 @@ void load_font_ft(int width, int height)
     vo_font=read_font_desc_ft(font_name, width, height);
 #endif
 }
-
-#endif /* HAVE_FREETYPE */