Mercurial > mplayer.hg

comparison configure @ 27393:4876c89bafdd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename font-related preprocessor directives. Switch them from a HAVE_ to a CONFIG_ prefix.
author diego
date Thu, 07 Aug 2008 10:36:07 +0000
parents 1d2faa1020fb
children 51438cb89305
comparison
equal deleted inserted replaced
27392:f28981b3f233 27393:4876c89bafdd
3171 cc_check $_ld_lm $_ld_tmp && _ld_extra="$_ld_extra $_ld_tmp" && \ 3171 cc_check $_ld_lm $_ld_tmp && _ld_extra="$_ld_extra $_ld_tmp" && \
3172 _iconv=yes && break 3172 _iconv=yes && break
3173 done 3173 done
3174 fi 3174 fi
3175 if test "$_iconv" = yes ; then 3175 if test "$_iconv" = yes ; then
3176 _def_iconv='#define HAVE_ICONV 1' 3176 _def_iconv='#define CONFIG_ICONV 1'
3177 else 3177 else
3178 _def_iconv='#undef HAVE_ICONV' 3178 _def_iconv='#undef CONFIG_ICONV'
3179 fi 3179 fi
3180 echores "$_iconv" 3180 echores "$_iconv"
3181 3181
3182 3182
3183 echocheck "soundcard.h" 3183 echocheck "soundcard.h"
5645 else 5645 else
5646 _freetype=no 5646 _freetype=no
5647 fi 5647 fi
5648 fi 5648 fi
5649 if test "$_freetype" = yes ; then 5649 if test "$_freetype" = yes ; then
5650 _def_freetype='#define HAVE_FREETYPE' 5650 _def_freetype='#define CONFIG_FREETYPE'
5651 _inc_extra="$_inc_extra `$_freetypeconfig --cflags`" 5651 _inc_extra="$_inc_extra `$_freetypeconfig --cflags`"
5652 _ld_extra="$_ld_extra `$_freetypeconfig --libs`" 5652 _ld_extra="$_ld_extra `$_freetypeconfig --libs`"
5653 else 5653 else
5654 _def_freetype='#undef HAVE_FREETYPE' 5654 _def_freetype='#undef CONFIG_FREETYPE'
5655 fi 5655 fi
5656 echores "$_freetype" 5656 echores "$_freetype"
5657 5657
5658 if test "$_freetype" = no ; then 5658 if test "$_freetype" = no ; then
5659 _fontconfig=no 5659 _fontconfig=no
5685 cc_check $_inc_tmp $_ld_tmp && _fontconfig=yes \ 5685 cc_check $_inc_tmp $_ld_tmp && _fontconfig=yes \
5686 && _ld_extra="$_ld_extra $_ld_tmp" && _inc_extra="$_inc_extra $_inc_tmp" 5686 && _ld_extra="$_ld_extra $_ld_tmp" && _inc_extra="$_inc_extra $_inc_tmp"
5687 fi 5687 fi
5688 fi 5688 fi
5689 if test "$_fontconfig" = yes ; then 5689 if test "$_fontconfig" = yes ; then
5690 _def_fontconfig='#define HAVE_FONTCONFIG' 5690 _def_fontconfig='#define CONFIG_FONTCONFIG'
5691 else 5691 else
5692 _def_fontconfig='#undef HAVE_FONTCONFIG' 5692 _def_fontconfig='#undef CONFIG_FONTCONFIG'
5693 fi 5693 fi
5694 echores "$_fontconfig" 5694 echores "$_fontconfig"
5695 5695
5696 5696
5697 echocheck "SSA/ASS support" 5697 echocheck "SSA/ASS support"
5745 else 5745 else
5746 _fribidi=no 5746 _fribidi=no
5747 fi 5747 fi
5748 fi 5748 fi
5749 if test "$_fribidi" = yes ; then 5749 if test "$_fribidi" = yes ; then
5750 _def_fribidi='#define HAVE_FRIBIDI' 5750 _def_fribidi='#define CONFIG_FRIBIDI'
5751 _inc_extra="$_inc_extra `$_fribidiconfig --cflags`" 5751 _inc_extra="$_inc_extra `$_fribidiconfig --cflags`"
5752 _ld_extra="$_ld_extra `$_fribidiconfig --libs`" 5752 _ld_extra="$_ld_extra `$_fribidiconfig --libs`"
5753 else 5753 else
5754 _def_fribidi='#undef HAVE_FRIBIDI' 5754 _def_fribidi='#undef CONFIG_FRIBIDI'
5755 fi 5755 fi
5756 echores "$_fribidi" 5756 echores "$_fribidi"
5757 5757
5758 5758
5759 echocheck "ENCA" 5759 echocheck "ENCA"
5770 EOF 5770 EOF
5771 _enca=no 5771 _enca=no
5772 cc_check -lenca $_ld_lm && _enca=yes 5772 cc_check -lenca $_ld_lm && _enca=yes
5773 fi 5773 fi
5774 if test "$_enca" = yes ; then 5774 if test "$_enca" = yes ; then
5775 _def_enca='#define HAVE_ENCA 1' 5775 _def_enca='#define CONFIG_ENCA 1'
5776 _ld_extra="$_ld_extra -lenca" 5776 _ld_extra="$_ld_extra -lenca"
5777 else 5777 else
5778 _def_enca='#undef HAVE_ENCA' 5778 _def_enca='#undef CONFIG_ENCA'
5779 fi 5779 fi
5780 echores "$_enca" 5780 echores "$_enca"
5781 5781
5782 5782
5783 echocheck "zlib" 5783 echocheck "zlib"