Rename font-related preprocessor directives.

Switch them from a HAVE_ to a CONFIG_ prefix.


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

6 files changed, 17 insertions, 17 deletions

diff --git a/libvo/font_load.h b/libvo/font_load.h
index 44832d57f7..df3000efb5 100644
--- a/libvo/font_load.h
+++ b/libvo/font_load.h
@@ -1,7 +1,7 @@
 #ifndef MPLAYER_FONT_LOAD_H
 #define MPLAYER_FONT_LOAD_H
 
-#ifdef HAVE_FREETYPE
+#ifdef CONFIG_FREETYPE
 #include <ft2build.h>
 #include FT_FREETYPE_H
 #endif
@@ -10,14 +10,14 @@ typedef struct {
     unsigned char *bmp;
     unsigned char *pal;
     int w,h,c;
-#ifdef HAVE_FREETYPE
+#ifdef CONFIG_FREETYPE
     int charwidth,charheight,pen,baseline,padding;
     int current_count, current_alloc;
 #endif
 } raw_file;
 
 typedef struct font_desc {
-#ifdef HAVE_FREETYPE
+#ifdef CONFIG_FREETYPE
     int dynamic;
 #endif
     char *name;
@@ -34,7 +34,7 @@ typedef struct font_desc {
     short width[65536];
     int freetype;
 
-#ifdef HAVE_FREETYPE
+#ifdef CONFIG_FREETYPE
     int face_cnt;
     
     FT_Face faces[16];
@@ -64,7 +64,7 @@ typedef struct font_desc {
 extern font_desc_t* vo_font;
 extern font_desc_t* sub_font;
 
-#ifdef HAVE_FREETYPE
+#ifdef CONFIG_FREETYPE
 
 extern char *subtitle_font_encoding;
 extern float text_font_scale_factor;
diff --git a/libvo/font_load_ft.c b/libvo/font_load_ft.c
index 63368f3f77..f5926ca277 100644
--- a/libvo/font_load_ft.c
+++ b/libvo/font_load_ft.c
@@ -16,7 +16,7 @@
 #include <math.h>
 #include <string.h>
 
-#ifdef HAVE_ICONV
+#ifdef CONFIG_ICONV
 #include <iconv.h>
 #endif
 
@@ -24,7 +24,7 @@
 #include FT_FREETYPE_H
 #include FT_GLYPH_H
 
-#ifdef HAVE_FONTCONFIG
+#ifdef CONFIG_FONTCONFIG
 #include <fontconfig/fontconfig.h>
 #endif
 
@@ -716,7 +716,7 @@ static int generate_tables(font_desc_t *desc, double thickness, double radius)
     return 0;
 }
 
-#ifdef HAVE_ICONV
+#ifdef CONFIG_ICONV
 /* decode from 'encoding' to unicode */
 static FT_ULong decode_char(iconv_t *cd, char c) {
     FT_ULong o;
@@ -1009,7 +1009,7 @@ font_desc_t* read_font_desc_ft(const char *fname, int movie_width, int movie_hei
     }
     desc->face_cnt++;
 
-#ifdef HAVE_ICONV
+#ifdef CONFIG_ICONV
     if (unicode) {
 	charset_size = prepare_charset_unicode(face, my_charset, my_charcodes);
     } else {
@@ -1124,7 +1124,7 @@ int done_freetype(void)
 
 void load_font_ft(int width, int height, font_desc_t** fontp, const char *font_name, float font_scale_factor)
 {
-#ifdef HAVE_FONTCONFIG
+#ifdef CONFIG_FONTCONFIG
     FcPattern *fc_pattern;
     FcPattern *fc_pattern2;
     FcChar8 *s;
@@ -1139,7 +1139,7 @@ void load_font_ft(int width, int height, font_desc_t** fontp, const char *font_n
 
     if (vo_font) free_font_desc(vo_font);
 
-#ifdef HAVE_FONTCONFIG
+#ifdef CONFIG_FONTCONFIG
     if (font_fontconfig > 0)
     {
 	if (!font_name)
diff --git a/libvo/sub.c b/libvo/sub.c
index b87f15c9bc..dffc5f79ab 100644
--- a/libvo/sub.c
+++ b/libvo/sub.c
@@ -1065,11 +1065,11 @@ void free_osd_list(void){
 int vo_update_osd(int dxs,int dys){
     mp_osd_obj_t* obj=vo_osd_list;
     int chg=0;
-#ifdef HAVE_FREETYPE    
+#ifdef CONFIG_FREETYPE
     static int defer_counter = 0, prev_dxs = 0, prev_dys = 0;
 #endif
 
-#ifdef HAVE_FREETYPE    
+#ifdef CONFIG_FREETYPE
     // here is the right place to get screen dimensions
     if (((dxs != vo_image_width)
 	   && (subtitle_autoscale == 2 || subtitle_autoscale == 3))
@@ -1198,7 +1198,7 @@ void vo_init_osd(void){
 #if CONFIG_TV_TELETEXT
     new_osd_obj(OSDTYPE_TELETEXT);
 #endif
-#ifdef HAVE_FREETYPE
+#ifdef CONFIG_FREETYPE
     force_load_font = 1;
 #endif
 }
diff --git a/libvo/vo_aa.c b/libvo/vo_aa.c
index 77c545bbb6..f79dfd913a 100644
--- a/libvo/vo_aa.c
+++ b/libvo/vo_aa.c
@@ -247,7 +247,7 @@ config(uint32_t width, uint32_t height, uint32_t d_width,
       vo_font->pic_b[0]=malloc(sizeof(raw_file));
       memset(vo_font->pic_b[0],0,sizeof(raw_file));
 
-#ifdef HAVE_FREETYPE
+#ifdef CONFIG_FREETYPE
       vo_font->dynamic = 0;
 #endif
 
diff --git a/libvo/vo_dxr3.c b/libvo/vo_dxr3.c
index 820123aec9..82b3d3c779 100644
--- a/libvo/vo_dxr3.c
+++ b/libvo/vo_dxr3.c
@@ -429,7 +429,7 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_
 	ioctl(fd_control, EM8300_IOCTL_SET_ASPECTRATIO, &ioval);
 
 #ifdef SPU_SUPPORT
-#ifdef HAVE_FREETYPE
+#ifdef CONFIG_FREETYPE
 	if (ioval == EM8300_ASPECTRATIO_16_9) {
 		s_width *= d_height*1.78/s_height*(d_width*1.0/d_height)/2.35;
 	} else {
diff --git a/libvo/vo_gl.c b/libvo/vo_gl.c
index f52d7b60d3..b26e3c1855 100644
--- a/libvo/vo_gl.c
+++ b/libvo/vo_gl.c
@@ -149,7 +149,7 @@ static void resize(int x,int y){
   glLoadIdentity();
 
   if (!scaled_osd) {
-#ifdef HAVE_FREETYPE
+#ifdef CONFIG_FREETYPE
   // adjust font size to display size
   force_load_font = 1;
 #endif