Mercurial > mplayer.hg
comparison configure @ 20548:1571b79fd95e
Implement proper codecs directory fallback.
author | diego |
---|---|
date | Tue, 31 Oct 2006 15:16:12 +0000 |
parents | 6612c7dde2cd |
children | 82733372759f |
comparison
equal
deleted
inserted
replaced
20547:0d6d2342a705 | 20548:1571b79fd95e |
---|---|
2082 --language=*) | 2082 --language=*) |
2083 _language=`echo $ac_option | cut -d '=' -f 2` | 2083 _language=`echo $ac_option | cut -d '=' -f 2` |
2084 ;; | 2084 ;; |
2085 | 2085 |
2086 --codecsdir=*) | 2086 --codecsdir=*) |
2087 _win32codecsdir=`echo $ac_option | cut -d '=' -f 2` | 2087 _codecsdir=`echo $ac_option | cut -d '=' -f 2` |
2088 _xanimcodecsdir=`echo $ac_option | cut -d '=' -f 2` | |
2089 _realcodecsdir=`echo $ac_option | cut -d '=' -f 2` | |
2090 ;; | 2088 ;; |
2091 --win32codecsdir=*) | 2089 --win32codecsdir=*) |
2092 _win32codecsdir=`echo $ac_option | cut -d '=' -f 2` | 2090 _win32codecsdir=`echo $ac_option | cut -d '=' -f 2` |
2093 ;; | 2091 ;; |
2094 --xanimcodecsdir=*) | 2092 --xanimcodecsdir=*) |
2220 test -z "$_bindir" && _bindir="$_prefix/bin" | 2218 test -z "$_bindir" && _bindir="$_prefix/bin" |
2221 test -z "$_datadir" && _datadir="$_prefix/share/mplayer" | 2219 test -z "$_datadir" && _datadir="$_prefix/share/mplayer" |
2222 test -z "$_mandir" && _mandir="$_prefix/man" | 2220 test -z "$_mandir" && _mandir="$_prefix/man" |
2223 test -z "$_confdir" && _confdir="$_prefix/etc/mplayer" | 2221 test -z "$_confdir" && _confdir="$_prefix/etc/mplayer" |
2224 test -z "$_libdir" && _libdir="$_prefix/lib" | 2222 test -z "$_libdir" && _libdir="$_prefix/lib" |
2223 test -z "$_codecsdir" && _codecsdir="$_libdir/codecs" | |
2225 | 2224 |
2226 if x86 ; then | 2225 if x86 ; then |
2227 # Checking assembler (_as) compatibility... | 2226 # Checking assembler (_as) compatibility... |
2228 # Added workaround for older as that reads from stdin by default - atmos | 2227 # Added workaround for older as that reads from stdin by default - atmos |
2229 as_version=`echo '' | $_as -version 2>&1 | sed -n 's/^.*assembler \(version \)*\([0-9.]*\).*$/\2/p'` | 2228 as_version=`echo '' | $_as -version 2>&1 | sed -n 's/^.*assembler \(version \)*\([0-9.]*\).*$/\2/p'` |
5965 | 5964 |
5966 if x86 && not qnx; then | 5965 if x86 && not qnx; then |
5967 | 5966 |
5968 if test "$_win32" = auto ; then | 5967 if test "$_win32" = auto ; then |
5969 if test -z "$_win32codecsdir" ; then | 5968 if test -z "$_win32codecsdir" ; then |
5970 for I in "$_libdir/codecs" "$_libdir/win32" /usr/local/lib/codecs /usr/lib/codecs /usr/local/lib/win32 /usr/lib/win32 ; do | 5969 for I in "$_codecsdir" "$_libdir/codecs" "$_libdir/win32" /usr/local/lib/codecs /usr/lib/codecs /usr/local/lib/win32 /usr/lib/win32 ; do |
5971 if test -d "$I" ; then | 5970 if test -d "$I" ; then |
5972 _win32codecsdir="$I" | 5971 _win32codecsdir="$I" |
5973 break; | 5972 break; |
5974 fi; | 5973 fi; |
5975 done | 5974 done |
5975 _win32codecsdir="$_codecsdir" | |
5976 # Fall back on a subfolder of the current dir on Windows | 5976 # Fall back on a subfolder of the current dir on Windows |
5977 mingw32 && _win32codecsdir="codecs" | 5977 mingw32 && _win32codecsdir="codecs" |
5978 fi | 5978 fi |
5979 fi | 5979 fi |
5980 | 5980 |
6019 _xanim=no | 6019 _xanim=no |
6020 _res_comment="dynamic loader support needed" | 6020 _res_comment="dynamic loader support needed" |
6021 if test "$_dl" = yes ; then | 6021 if test "$_dl" = yes ; then |
6022 _res_comment="no suitable directory found - see DOCS/HTML/$_doc_lang/codecs.html" | 6022 _res_comment="no suitable directory found - see DOCS/HTML/$_doc_lang/codecs.html" |
6023 if test -z "$_xanimcodecsdir" ; then | 6023 if test -z "$_xanimcodecsdir" ; then |
6024 for I in "$_libdir/codecs" /usr/local/lib/xanim/mods /usr/lib/xanim/mods /usr/lib/xanim $XANIM_MOD_DIR ; do | 6024 for I in "$_codecsdir" "$_libdir/codecs" /usr/local/lib/xanim/mods /usr/lib/xanim/mods /usr/lib/xanim $XANIM_MOD_DIR ; do |
6025 if test -d "$I" ; then | 6025 if test -d "$I" ; then |
6026 _xanimcodecsdir="$I" | 6026 _xanimcodecsdir="$I" |
6027 break; | 6027 break; |
6028 fi; | 6028 fi; |
6029 done | 6029 done |
6030 _xanimcodecsdir="$_codecsdir" | |
6030 fi | 6031 fi |
6031 test "$_xanimcodecsdir" && _xanim=yes | 6032 test "$_xanimcodecsdir" && _xanim=yes |
6032 fi | 6033 fi |
6033 fi | 6034 fi |
6034 if test "$_xanim" = yes ; then | 6035 if test "$_xanim" = yes ; then |
6051 # if test "$_dl" = yes ; then | 6052 # if test "$_dl" = yes ; then |
6052 _res_comment="tested only on Linux/FreeBSD/NetBSD/Cygwin/MinGW/Darwin" | 6053 _res_comment="tested only on Linux/FreeBSD/NetBSD/Cygwin/MinGW/Darwin" |
6053 if linux || freebsd || netbsd || win32 || darwin ; then | 6054 if linux || freebsd || netbsd || win32 || darwin ; then |
6054 _res_comment="no suitable directory found - see DOCS/HTML/$_doc_lang/codecs.html" | 6055 _res_comment="no suitable directory found - see DOCS/HTML/$_doc_lang/codecs.html" |
6055 if test -z "$_realcodecsdir" ; then | 6056 if test -z "$_realcodecsdir" ; then |
6056 for I in "$_libdir/codecs" "$_libdir/real" /usr/lib/real \ | 6057 for I in "$_codecsdir" "$_libdir/codecs" "$_libdir/real" /usr/lib/real \ |
6057 /usr/lib/RealPlayer{9,8,}/Codecs /usr/local/RealPlayer{9,8,}/Codecs \ | 6058 /usr/lib/RealPlayer{9,8,}/Codecs /usr/local/RealPlayer{9,8,}/Codecs \ |
6058 /usr/local/lib/RealPlayer{9,8,}/Codecs /opt/RealPlayer{9,8,}/{Real/,}Codecs \ | 6059 /usr/local/lib/RealPlayer{9,8,}/Codecs /opt/RealPlayer{9,8,}/{Real/,}Codecs \ |
6059 {~,}/Applications/RealOne\ Player.app/Contents/MacOS/Library/Codecs \ | 6060 {~,}/Applications/RealOne\ Player.app/Contents/MacOS/Library/Codecs \ |
6060 "$_win32codecsdir"; do | 6061 "$_win32codecsdir"; do |
6061 if test -d "$I" ; then | 6062 if test -d "$I" ; then |
6062 _realcodecsdir="$I" | 6063 _realcodecsdir="$I" |
6063 break | 6064 break |
6064 fi | 6065 fi |
6066 _realcodecsdir="$_codecsdir" | |
6065 # Fall back on a subfolder of the current dir on Windows | 6067 # Fall back on a subfolder of the current dir on Windows |
6066 mingw32 && _realcodecsdir="codecs" | 6068 mingw32 && _realcodecsdir="codecs" |
6067 done | 6069 done |
6068 fi | 6070 fi |
6069 test "$_realcodecsdir" && _real=yes | 6071 test "$_realcodecsdir" && _real=yes |