Mercurial > mplayer.hg
comparison configure @ 16451:9f8ddae26f17
Separate _freetype=no from the comment, this fixes the fontconfig bug without need of forcing "no"
author | iive |
---|---|
date | Sun, 11 Sep 2005 10:57:28 +0000 |
parents | d4355ddee12e |
children | efa4376257c7 |
comparison
equal
deleted
inserted
replaced
16450:40222952440f | 16451:9f8ddae26f17 |
---|---|
5078 | 5078 |
5079 echocheck "freetype >= 2.0.9" | 5079 echocheck "freetype >= 2.0.9" |
5080 | 5080 |
5081 # freetype depends on iconv | 5081 # freetype depends on iconv |
5082 if test "$_iconv" = no ; then | 5082 if test "$_iconv" = no ; then |
5083 _freetype="no (iconv support needed)" | 5083 _freetype=no |
5084 rez_comment="(iconv support needed)" | |
5084 fi | 5085 fi |
5085 | 5086 |
5086 if test "$_freetype" = auto ; then | 5087 if test "$_freetype" = auto ; then |
5087 if ( $_freetypeconfig --version ) >/dev/null 2>&1 ; then | 5088 if ( $_freetypeconfig --version ) >/dev/null 2>&1 ; then |
5088 cat > $TMPC << EOF | 5089 cat > $TMPC << EOF |
5123 _inc_freetype=`$_freetypeconfig --cflags` | 5124 _inc_freetype=`$_freetypeconfig --cflags` |
5124 _ld_freetype=`$_freetypeconfig --libs` | 5125 _ld_freetype=`$_freetypeconfig --libs` |
5125 else | 5126 else |
5126 _def_freetype='#undef HAVE_FREETYPE' | 5127 _def_freetype='#undef HAVE_FREETYPE' |
5127 fi | 5128 fi |
5128 echores "$_freetype" | 5129 echores "$_freetype $rez_comment" |
5129 if test "$_freetype" != yes ; then | 5130 rez_comment="" |
5130 _freetype=no | |
5131 fi | |
5132 | 5131 |
5133 if test "$_freetype" = no ; then | 5132 if test "$_freetype" = no ; then |
5134 _fontconfig=no | 5133 _fontconfig=no |
5134 rez_comment="(freetype support needed)" | |
5135 fi | 5135 fi |
5136 echocheck "fontconfig" | 5136 echocheck "fontconfig" |
5137 if test "$_fontconfig" = auto ; then | 5137 if test "$_fontconfig" = auto ; then |
5138 if ( pkg-config --modversion fontconfig) > /dev/null 2>&1 ; then | 5138 if ( pkg-config --modversion fontconfig) > /dev/null 2>&1 ; then |
5139 cat > $TMPC << EOF | 5139 cat > $TMPC << EOF |
5161 _inc_fontconfig=`pkg-config --cflags fontconfig` | 5161 _inc_fontconfig=`pkg-config --cflags fontconfig` |
5162 _ld_fontconfig=`pkg-config --libs fontconfig` | 5162 _ld_fontconfig=`pkg-config --libs fontconfig` |
5163 else | 5163 else |
5164 _def_fontconfig='#undef HAVE_FONTCONFIG' | 5164 _def_fontconfig='#undef HAVE_FONTCONFIG' |
5165 fi | 5165 fi |
5166 echores "$_fontconfig" | 5166 echores "$_fontconfig $rez_comment" |
5167 rez_comment="" | |
5167 | 5168 |
5168 echocheck "fribidi with charsets" | 5169 echocheck "fribidi with charsets" |
5169 if test "$_fribidi" = yes ; then | 5170 if test "$_fribidi" = yes ; then |
5170 if ( $_fribidiconfig --version ) >/dev/null 2>&1 ; then | 5171 if ( $_fribidiconfig --version ) >/dev/null 2>&1 ; then |
5171 cat > $TMPC << EOF | 5172 cat > $TMPC << EOF |