comparison configure @ 20588:8a8c2c64087a

Rework binary codec directory handling. Don't use directories from other programs, just try a few default locations + proper fallback.
author diego
date Wed, 01 Nov 2006 20:31:18 +0000
parents 235b6df49b0d
children cf600a8c5e4d
comparison
equal deleted inserted replaced
20587:128b2dc39f57 20588:8a8c2c64087a
268 --enable-gif enable gif support [autodetect] 268 --enable-gif enable gif support [autodetect]
269 --enable-png enable png input/output support [autodetect] 269 --enable-png enable png input/output support [autodetect]
270 --enable-jpeg enable jpeg input/output support [autodetect] 270 --enable-jpeg enable jpeg input/output support [autodetect]
271 --enable-libcdio enable external libcdio support [autodetect] 271 --enable-libcdio enable external libcdio support [autodetect]
272 --enable-liblzo enable external liblzo support [autodetect] 272 --enable-liblzo enable external liblzo support [autodetect]
273 --disable-win32 disable Win32 DLL support [autodetect] 273 --disable-win32 disable Win32 DLL support [enabled]
274 --disable-qtx disable Quicktime codecs [autodetect] 274 --disable-qtx disable QuickTime codecs [enabled]
275 --disable-xanim disable XAnim DLL support [autodetect] 275 --disable-xanim disable XAnim codecs support [enabled]
276 --disable-real disable RealPlayer DLL support [autodetect] 276 --disable-real disable RealPlayer codecs support [enabled]
277 --disable-xvid disable XviD codec [autodetect] 277 --disable-xvid disable XviD codec [autodetect]
278 --disable-x264 disable H.264 encoder [autodetect] 278 --disable-x264 disable H.264 encoder [autodetect]
279 --disable-nut disable libnut demuxer [autodetect] 279 --disable-nut disable libnut demuxer [autodetect]
280 --disable-libavutil disable libavutil [autodetect] 280 --disable-libavutil disable libavutil [autodetect]
281 --disable-libavcodec disable libavcodec [autodetect] 281 --disable-libavcodec disable libavcodec [autodetect]
2222 test -z "$_bindir" && _bindir="$_prefix/bin" 2222 test -z "$_bindir" && _bindir="$_prefix/bin"
2223 test -z "$_datadir" && _datadir="$_prefix/share/mplayer" 2223 test -z "$_datadir" && _datadir="$_prefix/share/mplayer"
2224 test -z "$_mandir" && _mandir="$_prefix/man" 2224 test -z "$_mandir" && _mandir="$_prefix/man"
2225 test -z "$_confdir" && _confdir="$_prefix/etc/mplayer" 2225 test -z "$_confdir" && _confdir="$_prefix/etc/mplayer"
2226 test -z "$_libdir" && _libdir="$_prefix/lib" 2226 test -z "$_libdir" && _libdir="$_prefix/lib"
2227 test -z "$_codecsdir" && _codecsdir="$_libdir/codecs"
2228 2227
2229 if x86 ; then 2228 if x86 ; then
2230 # Checking assembler (_as) compatibility... 2229 # Checking assembler (_as) compatibility...
2231 # Added workaround for older as that reads from stdin by default - atmos 2230 # Added workaround for older as that reads from stdin by default - atmos
2232 as_version=`echo '' | $_as -version 2>&1 | sed -n 's/^.*assembler \(version \)*\([0-9.]*\).*$/\2/p'` 2231 as_version=`echo '' | $_as -version 2>&1 | sed -n 's/^.*assembler \(version \)*\([0-9.]*\).*$/\2/p'`
5968 _noafmodules="ladspa $_noafmodules" 5967 _noafmodules="ladspa $_noafmodules"
5969 fi 5968 fi
5970 echores "$_ladspa" 5969 echores "$_ladspa"
5971 5970
5972 5971
5973 5972 if test -z "$_codecsdir" ; then
5974 if x86 && not qnx; then 5973 for dir in "$_libdir/codecs" "$_libdir/win32" /usr/local/lib/codecs \
5975 5974 /usr/lib/codecs /usr/local/lib/win32 /usr/lib/win32 ; do
5976 if test "$_win32" = auto ; then 5975 if test -d "$dir" ; then
5977 if test -z "$_win32codecsdir" ; then 5976 _codecsdir="$dir"
5978 for I in "$_codecsdir" "$_libdir/codecs" "$_libdir/win32" /usr/local/lib/codecs /usr/lib/codecs /usr/local/lib/win32 /usr/lib/win32 ; do 5977 break;
5979 if test -d "$I" ; then 5978 fi;
5980 _win32codecsdir="$I" 5979 done
5981 break; 5980 fi
5982 fi; 5981 # Fall back on default directory.
5983 done 5982 if test -z "$_codecsdir" ; then
5984 fi 5983 _codecsdir="$_libdir/codecs"
5985 # Fall back on default directory. 5984 mingw32 && _codecsdir="codecs"
5986 if test -z "$_win32codecsdir" ; then 5985 fi
5987 _win32codecsdir="$_codecsdir" 5986
5988 mingw32 && _win32codecsdir="codecs"
5989 fi
5990 fi
5991 5987
5992 echocheck "Win32 codec DLL support" 5988 echocheck "Win32 codec DLL support"
5993 if test "$_win32" = auto ; then 5989 if test "$_win32" = auto ; then
5994 _win32=no 5990 _win32=no
5995 test -n "$_win32codecsdir" && _win32=yes 5991 if x86 && not qnx; then
5992 test -z "$_win32codecsdir" && _win32codecsdir=$_codecsdir
5993 _win32=yes
5994 fi
5996 fi 5995 fi
5997 if test "$_win32" = yes ; then 5996 if test "$_win32" = yes ; then
5998 _def_win32='#define USE_WIN32DLL 1' 5997 _def_win32='#define USE_WIN32DLL 1'
5999 _res_comment="using $_win32codecsdir" 5998 _res_comment="using $_win32codecsdir"
6000 else
6001 _def_win32='#undef USE_WIN32DLL'
6002 _nocodecmodules="win32 $_nocodecmodules"
6003 fi
6004 echores "$_win32"
6005
6006 if test "$_win32" != no ; then
6007 _def_win32_loader='#undef WIN32_LOADER'
6008 echocheck "Win32 loader support"
6009 _ld_win32='loader/libloader.a loader/dshow/libDS_Filter.a loader/dmo/libDMO_Filter.a' 5999 _ld_win32='loader/libloader.a loader/dshow/libDS_Filter.a loader/dmo/libDMO_Filter.a'
6010 _dep_win32='loader/libloader.a loader/dshow/libDS_Filter.a loader/dmo/libDMO_Filter.a' 6000 _dep_win32='loader/libloader.a loader/dshow/libDS_Filter.a loader/dmo/libDMO_Filter.a'
6011 _codecmodules="win32 $_codecmodules" 6001 openbsd && x86 && _ld_win32="$_ld_win32 -li386"
6012 if openbsd ; then
6013 x86 && _ld_win32="$_ld_win32 -li386"
6014 fi
6015 if not win32 ; then 6002 if not win32 ; then
6016 _def_win32_loader='#define WIN32_LOADER 1' 6003 _def_win32_loader='#define WIN32_LOADER 1'
6017 else 6004 else
6018 _ld_win32libs="$_ld_win32libs -ladvapi32 -lole32" 6005 _ld_win32libs="$_ld_win32libs -ladvapi32 -lole32"
6019 _res_comment="using native windows" 6006 _res_comment="using native windows"
6020 fi 6007 fi
6021 echores "$_win32" 6008 _codecmodules="win32 $_codecmodules"
6022 fi 6009 else
6023 6010 _def_win32='#undef USE_WIN32DLL'
6024 fi #if x86 && not qnx 6011 _def_win32_loader='#undef WIN32_LOADER'
6025 6012 _nocodecmodules="win32 $_nocodecmodules"
6013 fi
6014 echores "$_win32"
6026 6015
6027 6016
6028 echocheck "XAnim DLL" 6017 echocheck "XAnim DLL"
6029 if test "$_xanim" = auto ; then 6018 if test "$_xanim" = auto ; then
6030 _xanim=no 6019 _xanim=no
6031 _res_comment="dynamic loader support needed" 6020 _res_comment="dynamic loader support needed"
6032 if test "$_dl" = yes ; then 6021 if test "$_dl" = yes ; then
6033 _res_comment="no suitable directory found - see DOCS/HTML/$_doc_lang/codecs.html" 6022 test -z "$_xanimcodecsdir" && _xanimcodecsdir=$_codecsdir
6034 if test -z "$_xanimcodecsdir" ; then 6023 _xanim=yes
6035 for I in "$_codecsdir" "$_libdir/codecs" /usr/local/lib/xanim/mods /usr/lib/xanim/mods /usr/lib/xanim $XANIM_MOD_DIR ; do
6036 if test -d "$I" ; then
6037 _xanimcodecsdir="$I"
6038 break;
6039 fi;
6040 done
6041 fi
6042 # Fall back on default directory.
6043 if test -z "$_xanimcodecsdir" ; then
6044 _xanimcodecsdir="$_codecsdir"
6045 fi
6046 test "$_xanimcodecsdir" && _xanim=yes
6047 fi 6024 fi
6048 fi 6025 fi
6049 if test "$_xanim" = yes ; then 6026 if test "$_xanim" = yes ; then
6050 _def_xanim='#define USE_XANIM 1' 6027 _def_xanim='#define USE_XANIM 1'
6051 _def_xanim_path="#define XACODEC_PATH \"$_xanimcodecsdir\"" 6028 _def_xanim_path="#define XACODEC_PATH \"$_xanimcodecsdir\""
6056 _def_xanim_path='#undef XACODEC_PATH' 6033 _def_xanim_path='#undef XACODEC_PATH'
6057 _nocodecmodules="xanim $_nocodecmodules" 6034 _nocodecmodules="xanim $_nocodecmodules"
6058 fi 6035 fi
6059 echores "$_xanim" 6036 echores "$_xanim"
6060 6037
6038
6061 echocheck "RealPlayer DLL" 6039 echocheck "RealPlayer DLL"
6062 if test "$_real" = auto ; then 6040 if test "$_real" = auto ; then
6063 _real=no 6041 _real=no
6064 _res_comment="dynamic loader support needed" 6042 _res_comment="dynamic loader support needed"
6065 if test "$_dl" = yes || test "$_win32" = yes ; then 6043 if test "$_dl" = yes || test "$_win32" = yes &&
6066 # if test "$_dl" = yes ; then 6044 (linux || freebsd || netbsd || win32 || darwin) ; then
6067 _res_comment="tested only on Linux/FreeBSD/NetBSD/Cygwin/MinGW/Darwin" 6045 test -z "$_realcodecsdir" && _realcodecsdir="$_codecsdir"
6068 if linux || freebsd || netbsd || win32 || darwin ; then 6046 _real=yes
6069 _res_comment="no suitable directory found - see DOCS/HTML/$_doc_lang/codecs.html"
6070 if test -z "$_realcodecsdir" ; then
6071 for I in "$_codecsdir" "$_libdir/codecs" "$_libdir/real" /usr/lib/real \
6072 /usr/lib/RealPlayer{9,8,}/Codecs /usr/local/RealPlayer{9,8,}/Codecs \
6073 /usr/local/lib/RealPlayer{9,8,}/Codecs /opt/RealPlayer{9,8,}/{Real/,}Codecs \
6074 {~,}/Applications/RealOne\ Player.app/Contents/MacOS/Library/Codecs \
6075 "$_win32codecsdir"; do
6076 if test -d "$I" ; then
6077 _realcodecsdir="$I"
6078 break
6079 fi
6080 done
6081 fi
6082 # Fall back on default directory.
6083 if test -z "$_realcodecsdir" ; then
6084 _realcodecsdir="$_codecsdir"
6085 mingw32 && _realcodecsdir="codecs"
6086 fi
6087 test "$_realcodecsdir" && _real=yes
6088 fi
6089 fi 6047 fi
6090 fi 6048 fi
6091 if test "$_real" = yes ; then 6049 if test "$_real" = yes ; then
6092 _def_real='#define USE_REALCODECS 1' 6050 _def_real='#define USE_REALCODECS 1'
6093 _def_real_path="#define REALCODEC_PATH \"$_realcodecsdir\"" 6051 _def_real_path="#define REALCODEC_PATH \"$_realcodecsdir\""