Mercurial > mplayer.hg
comparison configure @ 23105:e06073016699
Move misplaced res_comment to where it actually takes effect.
| author | diego |
|---|---|
| date | Thu, 26 Apr 2007 12:09:20 +0000 |
| parents | 5cf9cb315986 |
| children | f47defd03fa8 |
comparison
equal
deleted
inserted
replaced
| 23104:5cf9cb315986 | 23105:e06073016699 |
|---|---|
| 6184 | 6184 |
| 6185 echocheck "FFmpeg libavcodec" | 6185 echocheck "FFmpeg libavcodec" |
| 6186 if test "$_libavcodec_a" = auto ; then | 6186 if test "$_libavcodec_a" = auto ; then |
| 6187 # Note: static linking is preferred to dynamic linking | 6187 # Note: static linking is preferred to dynamic linking |
| 6188 _libavcodec=no | 6188 _libavcodec=no |
| 6189 _res_comment="static" | |
| 6190 if test -d libavcodec && test -f libavcodec/utils.c ; then | 6189 if test -d libavcodec && test -f libavcodec/utils.c ; then |
| 6191 _res_comment="old ffmpeg version, use CVS !" | 6190 _res_comment="old ffmpeg version, use CVS !" |
| 6192 if grep avcodec_find_encoder_by_name libavcodec/utils.c > /dev/null 2>&1 ; then | 6191 if grep avcodec_find_encoder_by_name libavcodec/utils.c > /dev/null 2>&1 ; then |
| 6193 # check if libavutil is a required | 6192 # check if libavutil is a required |
| 6194 cat > $TMPC << EOF | 6193 cat > $TMPC << EOF |
| 6205 _libavutil_required="yes" | 6204 _libavutil_required="yes" |
| 6206 fi | 6205 fi |
| 6207 _res_comment="libavutil availability does not fit libavcodec version" | 6206 _res_comment="libavutil availability does not fit libavcodec version" |
| 6208 if test "$_libavutil_required" = "$_libavutil_a"; then | 6207 if test "$_libavutil_required" = "$_libavutil_a"; then |
| 6209 _libavcodec_a="yes" | 6208 _libavcodec_a="yes" |
| 6210 _res_comment="" | 6209 _res_comment="static" |
| 6211 fi | 6210 fi |
| 6212 fi | 6211 fi |
| 6213 fi | 6212 fi |
| 6214 elif test "$_libavcodec_so" = auto ; then | 6213 elif test "$_libavcodec_so" = auto ; then |
| 6215 _libavcodec_so=no | 6214 _libavcodec_so=no |