From 3e9a5c9b0b327000cb484bef7018160896aa5171 Mon Sep 17 00:00:00 2001
From: diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Wed, 22 Nov 2006 09:36:33 +0000
Subject: Remove _ld_freetype and _ld_fontconfig, they are no longer necessary.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21164 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 configure | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'configure')

diff --git a/configure b/configure
index 23fc0593db..957d7903b1 100755
--- a/configure
+++ b/configure
@@ -5315,7 +5315,7 @@ fi
 if test "$_freetype" = yes ; then
     _def_freetype='#define HAVE_FREETYPE'
     _inc_extra="$_inc_extra `$_freetypeconfig --cflags`"
-    _ld_freetype=`$_freetypeconfig --libs`
+    _ld_extra="$_ld_extra `$_freetypeconfig --libs`"
 else
     _def_freetype='#undef HAVE_FREETYPE'
 fi
@@ -5344,13 +5344,13 @@ EOF
   _fontconfig=no
   for _ld_tmp in "" "-lexpat -lfreetype" "-lexpat -lfreetype -lz" ; do
     _ld_tmp="-lfontconfig $_ld_tmp"
-    cc_check $_ld_tmp && _fontconfig=yes && _ld_fontconfig="$_ld_tmp" && break
+    cc_check $_ld_tmp && _fontconfig=yes && _ld_extra="$_ld_extra $_ld_tmp" && break
   done
   if test "$_fontconfig" = no && $_pkg_config --exists fontconfig ; then
     _inc_tmp=`$_pkg_config --cflags fontconfig`
     _ld_tmp=`$_pkg_config --libs fontconfig`
     cc_check $_inc_tmp $_ld_tmp && _fontconfig=yes \
-      && _ld_fontconfig="$_ld_tmp" && _inc_extra="$_inc_extra $_inc_tmp"
+      && _ld_extra="$_ld_extra $_ld_tmp" && _inc_extra="$_inc_extra $_inc_tmp"
   fi
 fi
 if test "$_fontconfig" = yes ; then
@@ -7360,7 +7360,7 @@ EXTRA_LIB = $_ld_extra \
   $_ld_static \
   $_ld_lm $_ld_gif \
   $_ld_vorbis $_ld_theora $_xmms_lib \
-  $_ld_arch $_ld_freetype $_ld_fontconfig
+  $_ld_arch
 EXTRALIBS_MPLAYER = $_libs_mplayer $_ld_x11 $_ld_sock $_ld_static $_ld_gtk $_ld_glib
 EXTRALIBS_MENCODER = $_libs_mencoder
 
-- 
cgit v1.2.3