[MPlayer-cvslog] r29183 - trunk/configure
diego
subversion at mplayerhq.hu
Wed Apr 15 22:00:27 CEST 2009
Author: diego
Date: Wed Apr 15 22:00:26 2009
New Revision: 29183
Log:
Replace all `` by $(), it is more readable and easier to nest.
Modified:
trunk/configure
Modified: trunk/configure
==============================================================================
--- trunk/configure Wed Apr 15 19:08:41 2009 (r29182)
+++ trunk/configure Wed Apr 15 22:00:26 2009 (r29183)
@@ -108,7 +108,7 @@ die () {
# OS test booleans functions
issystem() {
- test "`echo $system_name | tr A-Z a-z`" = "`echo $1 | tr A-Z a-z`"
+ test "$(echo $system_name | tr A-Z a-z)" = "$(echo $1 | tr A-Z a-z)"
}
aix() { issystem "AIX"; }
amigaos() { issystem "AmigaOS"; }
@@ -192,14 +192,14 @@ echores() {
#############################################################################
# Check how echo works in this /bin/sh
-case `echo -n` in
+case $(echo -n) in
-n) _echo_n= _echo_c='\c' ;; # SysV echo
*) _echo_n='-n ' _echo_c= ;; # BSD echo
esac
-msg_lang_all=`echo help/help_mp-??.h help/help_mp-??_??.h | sed -e "s:help/help_mp-\(..\).h:\1:g" -e "s:help/help_mp-\(.....\).h:\1:g"`
-man_lang_all=`echo DOCS/man/??/mplayer.1 DOCS/man/??_??/mplayer.1 | sed -e "s:DOCS/man/\(..\)/mplayer.1:\1:g" -e "s:DOCS/man/\(.._..\)/mplayer.1:\1:g"`
-doc_lang_all=`echo DOCS/xml/??/ DOCS/xml/??_??/ | sed -e "s:DOCS/xml/\(..\)/:\1:g" -e "s:DOCS/xml/\(.._..\)/:\1:g"`
+msg_lang_all=$(echo help/help_mp-??.h help/help_mp-??_??.h | sed -e "s:help/help_mp-\(..\).h:\1:g" -e "s:help/help_mp-\(.....\).h:\1:g")
+man_lang_all=$(echo DOCS/man/??/mplayer.1 DOCS/man/??_??/mplayer.1 | sed -e "s:DOCS/man/\(..\)/mplayer.1:\1:g" -e "s:DOCS/man/\(.._..\)/mplayer.1:\1:g")
+doc_lang_all=$(echo DOCS/xml/??/ DOCS/xml/??_??/ | sed -e "s:DOCS/xml/\(..\)/:\1:g" -e "s:DOCS/xml/\(.._..\)/:\1:g")
show_help(){
cat << EOF
@@ -526,19 +526,19 @@ _libavutil_so=auto
_libavcodec_a=auto
_libamr_nb=auto
_libamr_wb=auto
-_libavdecoders_all=`sed -n 's/^[^#]*DEC.*(.*, *\(.*\)).*/\1_decoder/p' libavcodec/allcodecs.c | tr '[a-z]' '[A-Z]'`
-_libavdecoders=` echo $_libavdecoders_all | sed -e 's/ LIB[A-Z0-9_]*_DECODER//g' -e s/MPEG4AAC_DECODER//`
-_libavencoders_all=`sed -n 's/^[^#]*ENC.*(.*, *\(.*\)).*/\1_encoder/p' libavcodec/allcodecs.c | tr '[a-z]' '[A-Z]'`
-_libavencoders=` echo $_libavencoders_all | sed 's/ LIB[A-Z0-9_]*_ENCODER//g'`
-_libavparsers_all=`sed -n 's/^[^#]*PARSER.*(.*, *\(.*\)).*/\1_parser/p' libavcodec/allcodecs.c | tr '[a-z]' '[A-Z]'`
+_libavdecoders_all=$(sed -n 's/^[^#]*DEC.*(.*, *\(.*\)).*/\1_decoder/p' libavcodec/allcodecs.c | tr '[a-z]' '[A-Z]')
+_libavdecoders=$(echo $_libavdecoders_all | sed -e 's/ LIB[A-Z0-9_]*_DECODER//g' -e s/MPEG4AAC_DECODER//)
+_libavencoders_all=$(sed -n 's/^[^#]*ENC.*(.*, *\(.*\)).*/\1_encoder/p' libavcodec/allcodecs.c | tr '[a-z]' '[A-Z]')
+_libavencoders=$(echo $_libavencoders_all | sed 's/ LIB[A-Z0-9_]*_ENCODER//g')
+_libavparsers_all=$(sed -n 's/^[^#]*PARSER.*(.*, *\(.*\)).*/\1_parser/p' libavcodec/allcodecs.c | tr '[a-z]' '[A-Z]')
_libavparsers=$_libavparsers_all
-_libavbsfs_all=`sed -n 's/^[^#]*BSF.*(.*, *\(.*\)).*/\1_bsf/p' libavcodec/allcodecs.c | tr '[a-z]' '[A-Z]'`
+_libavbsfs_all=$(sed -n 's/^[^#]*BSF.*(.*, *\(.*\)).*/\1_bsf/p' libavcodec/allcodecs.c | tr '[a-z]' '[A-Z]')
_libavbsfs=$_libavbsfs_all
-_libavdemuxers_all=`sed -n 's/^[^#]*DEMUX.*(.*, *\(.*\)).*/\1_demuxer/p' libavformat/allformats.c | tr '[a-z]' '[A-Z]'`
-_libavdemuxers=`echo $_libavdemuxers_all | sed -e 's/ LIB[A-Z0-9_]*_DEMUXER//g' -e s/REDIR_DEMUXER// -e s/RTSP_DEMUXER// -e s/SDP_DEMUXER// -e s/AVISYNTH_DEMUXER// `
-_libavmuxers_all=`sed -n 's/^[^#]*_MUX.*(.*, *\(.*\)).*/\1_muxer/p' libavformat/allformats.c | tr '[a-z]' '[A-Z]'`
-_libavmuxers=`echo $_libavmuxers_all | sed -e 's/ LIB[A-Z0-9_]*_MUXER//g' -e s/RTP_MUXER// `
-_libavprotocols_all=`sed -n 's/^[^#]*PROTOCOL.*(.*, *\(.*\)).*/\1_protocol/p' libavformat/allformats.c | tr '[a-z]' '[A-Z]'`
+_libavdemuxers_all=$(sed -n 's/^[^#]*DEMUX.*(.*, *\(.*\)).*/\1_demuxer/p' libavformat/allformats.c | tr '[a-z]' '[A-Z]')
+_libavdemuxers=$(echo $_libavdemuxers_all | sed -e 's/ LIB[A-Z0-9_]*_DEMUXER//g' -e s/REDIR_DEMUXER// -e s/RTSP_DEMUXER// -e s/SDP_DEMUXER// -e s/AVISYNTH_DEMUXER//)
+_libavmuxers_all=$(sed -n 's/^[^#]*_MUX.*(.*, *\(.*\)).*/\1_muxer/p' libavformat/allformats.c | tr '[a-z]' '[A-Z]')
+_libavmuxers=$(echo $_libavmuxers_all | sed -e 's/ LIB[A-Z0-9_]*_MUXER//g' -e s/RTP_MUXER//)
+_libavprotocols_all=$(sed -n 's/^[^#]*PROTOCOL.*(.*, *\(.*\)).*/\1_protocol/p' libavformat/allformats.c | tr '[a-z]' '[A-Z]')
_libavcodec_so=auto
_libavformat_a=auto
_libavformat_so=auto
@@ -738,113 +738,113 @@ for ac_option do
show_help
;;
--prefix=*)
- _prefix=`echo $ac_option | cut -d '=' -f 2`
+ _prefix=$(echo $ac_option | cut -d '=' -f 2)
;;
--bindir=*)
- _bindir=`echo $ac_option | cut -d '=' -f 2`
+ _bindir=$(echo $ac_option | cut -d '=' -f 2)
;;
--datadir=*)
- _datadir=`echo $ac_option | cut -d '=' -f 2`
+ _datadir=$(echo $ac_option | cut -d '=' -f 2)
;;
--mandir=*)
- _mandir=`echo $ac_option | cut -d '=' -f 2`
+ _mandir=$(echo $ac_option | cut -d '=' -f 2)
;;
--confdir=*)
- _confdir=`echo $ac_option | cut -d '=' -f 2`
+ _confdir=$(echo $ac_option | cut -d '=' -f 2)
;;
--libdir=*)
- _libdir=`echo $ac_option | cut -d '=' -f 2`
+ _libdir=$(echo $ac_option | cut -d '=' -f 2)
;;
--codecsdir=*)
- _codecsdir=`echo $ac_option | cut -d '=' -f 2`
+ _codecsdir=$(echo $ac_option | cut -d '=' -f 2)
;;
--win32codecsdir=*)
- _win32codecsdir=`echo $ac_option | cut -d '=' -f 2`
+ _win32codecsdir=$(echo $ac_option | cut -d '=' -f 2)
;;
--xanimcodecsdir=*)
- _xanimcodecsdir=`echo $ac_option | cut -d '=' -f 2`
+ _xanimcodecsdir=$(echo $ac_option | cut -d '=' -f 2)
;;
--realcodecsdir=*)
- _realcodecsdir=`echo $ac_option | cut -d '=' -f 2`
+ _realcodecsdir=$(echo $ac_option | cut -d '=' -f 2)
;;
--with-install=*)
- _install=`echo $ac_option | cut -d '=' -f 2 `
+ _install=$(echo $ac_option | cut -d '=' -f 2 )
;;
--with-xvmclib=*)
- _xvmclib=`echo $ac_option | cut -d '=' -f 2`
+ _xvmclib=$(echo $ac_option | cut -d '=' -f 2)
;;
--with-sdl-config=*)
- _sdlconfig=`echo $ac_option | cut -d '=' -f 2`
+ _sdlconfig=$(echo $ac_option | cut -d '=' -f 2)
;;
--with-freetype-config=*)
- _freetypeconfig=`echo $ac_option | cut -d '=' -f 2`
+ _freetypeconfig=$(echo $ac_option | cut -d '=' -f 2)
;;
--with-fribidi-config=*)
- _fribidiconfig=`echo $ac_option | cut -d '=' -f 2`
+ _fribidiconfig=$(echo $ac_option | cut -d '=' -f 2)
;;
--with-gtk-config=*)
- _gtkconfig=`echo $ac_option | cut -d '=' -f 2`
+ _gtkconfig=$(echo $ac_option | cut -d '=' -f 2)
;;
--with-glib-config=*)
- _glibconfig=`echo $ac_option | cut -d '=' -f 2`
+ _glibconfig=$(echo $ac_option | cut -d '=' -f 2)
;;
--with-dvdnav-config=*)
- _dvdnavconfig=`echo $ac_option | cut -d '=' -f 2`
+ _dvdnavconfig=$(echo $ac_option | cut -d '=' -f 2)
;;
--with-dvdread-config=*)
- _dvdreadconfig=`echo $ac_option | cut -d '=' -f 2`
+ _dvdreadconfig=$(echo $ac_option | cut -d '=' -f 2)
;;
--extra-cflags=*)
- extra_cflags=`echo $ac_option | cut -d '=' -f 2-`
+ extra_cflags=$(echo $ac_option | cut -d '=' -f 2-)
;;
--extra-ldflags=*)
- extra_ldflags=`echo $ac_option | cut -d '=' -f 2-`
+ extra_ldflags=$(echo $ac_option | cut -d '=' -f 2-)
;;
--extra-libs=*)
- extra_libs=`echo $ac_option | cut -d '=' -f 2`
+ extra_libs=$(echo $ac_option | cut -d '=' -f 2)
;;
--extra-libs-mplayer=*)
- libs_mplayer=`echo $ac_option | cut -d '=' -f 2`
+ libs_mplayer=$(echo $ac_option | cut -d '=' -f 2)
;;
--extra-libs-mencoder=*)
- libs_mencoder=`echo $ac_option | cut -d '=' -f 2`
+ libs_mencoder=$(echo $ac_option | cut -d '=' -f 2)
;;
--target=*)
- _target=`echo $ac_option | cut -d '=' -f 2`
+ _target=$(echo $ac_option | cut -d '=' -f 2)
;;
--cc=*)
- _cc=`echo $ac_option | cut -d '=' -f 2`
+ _cc=$(echo $ac_option | cut -d '=' -f 2)
;;
--host-cc=*)
- _host_cc=`echo $ac_option | cut -d '=' -f 2`
+ _host_cc=$(echo $ac_option | cut -d '=' -f 2)
;;
--as=*)
- _as=`echo $ac_option | cut -d '=' -f 2`
+ _as=$(echo $ac_option | cut -d '=' -f 2)
;;
--nm=*)
- _nm=`echo $ac_option | cut -d '=' -f 2`
+ _nm=$(echo $ac_option | cut -d '=' -f 2)
;;
--yasm=*)
- _yasm=`echo $ac_option | cut -d '=' -f 2`
+ _yasm=$(echo $ac_option | cut -d '=' -f 2)
;;
--ar=*)
- _ar=`echo $ac_option | cut -d '=' -f 2`
+ _ar=$(echo $ac_option | cut -d '=' -f 2)
;;
--ranlib=*)
- _ranlib=`echo $ac_option | cut -d '=' -f 2`
+ _ranlib=$(echo $ac_option | cut -d '=' -f 2)
;;
--windres=*)
- _windres=`echo $ac_option | cut -d '=' -f 2`
+ _windres=$(echo $ac_option | cut -d '=' -f 2)
;;
--charset=*)
- _charset=`echo $ac_option | cut -d '=' -f 2`
+ _charset=$(echo $ac_option | cut -d '=' -f 2)
;;
--language=*)
- _language=`echo $ac_option | cut -d '=' -f 2`
+ _language=$(echo $ac_option | cut -d '=' -f 2)
;;
--enable-static)
@@ -863,7 +863,7 @@ for ac_option do
_debug='-g'
;;
--enable-debug=*)
- _debug=`echo $_echo_n '-g'$_echo_c; echo $ac_option | cut -d '=' -f 2`
+ _debug=$(echo $_echo_n '-g'$_echo_c; echo $ac_option | cut -d '=' -f 2)
;;
--disable-debug)
_debug=
@@ -1089,7 +1089,7 @@ for ac_option do
--enable-vidix) _vidix=yes ;;
--disable-vidix) _vidix=no ;;
--with-vidix-drivers=*)
- _vidix_drivers=`echo $ac_option | cut -d '=' -f 2`
+ _vidix_drivers=$(echo $ac_option | cut -d '=' -f 2)
;;
--disable-vidix-pcidb) _vidix_pcidb=no ;;
--enable-dhahelper) _dhahelper=yes ;;
@@ -1124,16 +1124,16 @@ for ac_option do
--disable-libamr_nb) _libamr_nb=no ;;
--enable-libamr_wb) _libamr_wb=yes ;;
--disable-libamr_wb) _libamr_wb=no ;;
- --enable-decoder=*) _libavdecoders="$_libavdecoders `echo $ac_option | cut -d '=' -f 2`" ;;
- --disable-decoder=*) _libavdecoders=`echo $_libavdecoders | sed "s/\`echo $ac_option | cut -d '=' -f 2\`//g"` ;;
- --enable-encoder=*) _libavencoders="$_libavencoders `echo $ac_option | cut -d '=' -f 2`" ;;
- --disable-encoder=*) _libavencoders=`echo $_libavencoders | sed "s/\`echo $ac_option | cut -d '=' -f 2\`//g"` ;;
- --enable-parser=*) _libavparsers="$_libavparsers `echo $ac_option | cut -d '=' -f 2`" ;;
- --disable-parser=*) _libavparsers=`echo $_libavparsers | sed "s/\`echo $ac_option | cut -d '=' -f 2\`//g"` ;;
- --enable-demuxer=*) _libavdemuxers="$_libavdemuxers `echo $ac_option | cut -d '=' -f 2`" ;;
- --disable-demuxer=*) _libavdemuxers=`echo $_libavdemuxers | sed "s/\`echo $ac_option | cut -d '=' -f 2\`//g"` ;;
- --enable-muxer=*) _libavmuxers="$_libavmuxers `echo $ac_option | cut -d '=' -f 2`" ;;
- --disable-muxer=*) _libavmuxers=`echo $_libavmuxers | sed "s/\`echo $ac_option | cut -d '=' -f 2\`//g"` ;;
+ --enable-decoder=*) _libavdecoders="$_libavdecoders $(echo $ac_option | cut -d '=' -f 2)" ;;
+ --disable-decoder=*) _libavdecoders=$(echo $_libavdecoders | sed "s/$(echo $ac_option | cut -d '=' -f 2)//g") ;;
+ --enable-encoder=*) _libavencoders="$_libavencoders $(echo $ac_option | cut -d '=' -f 2)" ;;
+ --disable-encoder=*) _libavencoders=$(echo $_libavencoders | sed "s/$(echo $ac_option | cut -d '=' -f 2)//g") ;;
+ --enable-parser=*) _libavparsers="$_libavparsers $(echo $ac_option | cut -d '=' -f 2)" ;;
+ --disable-parser=*) _libavparsers=$(echo $_libavparsers | sed "s/$(echo $ac_option | cut -d '=' -f 2)//g") ;;
+ --enable-demuxer=*) _libavdemuxers="$_libavdemuxers $(echo $ac_option | cut -d '=' -f 2)" ;;
+ --disable-demuxer=*) _libavdemuxers=$(echo $_libavdemuxers | sed "s/$(echo $ac_option | cut -d '=' -f 2)//g") ;;
+ --enable-muxer=*) _libavmuxers="$_libavmuxers $(echo $ac_option | cut -d '=' -f 2)" ;;
+ --disable-muxer=*) _libavmuxers=$(echo $_libavmuxers | sed "s/$(echo $ac_option | cut -d '=' -f 2)//g") ;;
--enable-libavformat_a) _libavformat_a=yes ;;
--disable-libavformat_a) _libavformat_a=no ;;
--enable-libavformat_so) _libavformat_so=yes ;;
@@ -1315,7 +1315,7 @@ test -z "$_libdir" && _libdir="$_prefix/
# Determine our OS name and CPU architecture
if test -z "$_target" ; then
# OS name
- system_name=`uname -s 2>&1`
+ system_name=$(uname -s 2>&1)
case "$system_name" in
Linux|FreeBSD|NetBSD|OpenBSD|DragonFly|BSD/OS|Darwin|SunOS|QNX|GNU|BeOS|MorphOS|AIX|AmigaOS)
;;
@@ -1344,7 +1344,7 @@ if test -z "$_target" ; then
# host's CPU/instruction set
- host_arch=`uname -p 2>&1`
+ host_arch=$(uname -p 2>&1)
case "$host_arch" in
i386|sparc|ppc|alpha|arm|mips|vax)
;;
@@ -1358,7 +1358,7 @@ if test -z "$_target" ; then
# recognize.
# x86/x86pc is used by QNX
- case "`uname -m 2>&1`" in
+ case "$(uname -m 2>&1)" in
i[3-9]86*|x86|x86pc|k5|k6|k6_2|k6_3|k6-2|k6-3|pentium*|athlon*|i586_i686|i586-i686|BePC) host_arch=i386 ;;
ia64) host_arch=ia64 ;;
x86_64|amd64)
@@ -1386,8 +1386,8 @@ if test -z "$_target" ; then
;;
esac
else # if test -z "$_target"
- system_name=`echo $_target | cut -d '-' -f 2`
- case "`echo $system_name | tr A-Z a-z`" in
+ system_name=$(echo $_target | cut -d '-' -f 2)
+ case "$(echo $system_name | tr A-Z a-z)" in
linux) system_name=Linux ;;
freebsd) system_name=FreeBSD ;;
gnu/kfreebsd) system_name=FreeBSD ;;
@@ -1402,9 +1402,9 @@ else # if test -z "$_target"
mingw32msvc) system_name=MINGW32 ;;
esac
# We need to convert underscores so that values like k6-2 and pentium-mmx can be passed
- host_arch=`echo $_target | cut -d '-' -f 1`
- if test `echo $host_arch` != "x86_64" ; then
- host_arch=`echo $host_arch | tr '_' '-'`
+ host_arch=$(echo $_target | cut -d '-' -f 1)
+ if test $(echo $host_arch) != "x86_64" ; then
+ host_arch=$(echo $host_arch | tr '_' '-')
fi
fi
@@ -1501,12 +1501,12 @@ echo >> "$TMPLOG"
# Check how to call 'head' and 'tail'. Newer versions spit out warnings
# if used as 'head -1' instead of 'head -n 1', but older versions don't
# know about '-n'.
-if test "`(echo line1 ; echo line2) | head -1 2>/dev/null`" = "line1" ; then
+if test "$((echo line1 ; echo line2) | head -1 2>/dev/null)" = "line1" ; then
_head() { head -$1 2>/dev/null ; }
else
_head() { head -n $1 2>/dev/null ; }
fi
-if test "`(echo line1 ; echo line2) | tail -1 2>/dev/null`" = "line2" ; then
+if test "$((echo line1 ; echo line2) | tail -1 2>/dev/null)" = "line2" ; then
_tail() { tail -$1 2>/dev/null ; }
else
_tail() { tail -n $1 2>/dev/null ; }
@@ -1514,13 +1514,13 @@ fi
# Checking CC version...
# Intel C++ Compilers (no autoselect, use CC=/some/binary ./configure)
-if test "`basename $_cc`" = "icc" || test "`basename $_cc`" = "ecc"; then
+if test "$(basename $_cc)" = "icc" || test "$(basename $_cc)" = "ecc"; then
echocheck "$_cc version"
cc_vendor=intel
- cc_name=`$_cc -V 2>&1 | _head 1 | cut -d ',' -f 1`
- cc_version=`$_cc -V 2>&1 | _head 1 | cut -d ',' -f 2 | cut -d ' ' -f 3`
- _cc_major=`echo $cc_version | cut -d '.' -f 1`
- _cc_minor=`echo $cc_version | cut -d '.' -f 2`
+ cc_name=$($_cc -V 2>&1 | _head 1 | cut -d ',' -f 1)
+ cc_version=$($_cc -V 2>&1 | _head 1 | cut -d ',' -f 2 | cut -d ' ' -f 3)
+ _cc_major=$(echo $cc_version | cut -d '.' -f 1)
+ _cc_minor=$(echo $cc_version | cut -d '.' -f 2)
# TODO verify older icc/ecc compatibility
case $cc_version in
'')
@@ -1538,20 +1538,20 @@ if test "`basename $_cc`" = "icc" || tes
echores "$cc_version"
else
for _cc in "$_cc" cc gcc ; do
- cc_name_tmp=`$_cc -v 2>&1 | _tail 1 | cut -d ' ' -f 1`
+ cc_name_tmp=$($_cc -v 2>&1 | _tail 1 | cut -d ' ' -f 1)
if test "$cc_name_tmp" = "gcc"; then
cc_name=$cc_name_tmp
echocheck "$_cc version"
cc_vendor=gnu
- cc_version=`$_cc -dumpversion 2>&1`
+ cc_version=$($_cc -dumpversion 2>&1)
case $cc_version in
2.96*)
cc_fail=yes
;;
*)
- _cc_major=`echo $cc_version | cut -d '.' -f 1`
- _cc_minor=`echo $cc_version | cut -d '.' -f 2`
- _cc_mini=`echo $cc_version | cut -d '.' -f 3`
+ _cc_major=$(echo $cc_version | cut -d '.' -f 1)
+ _cc_minor=$(echo $cc_version | cut -d '.' -f 2)
+ _cc_mini=$(echo $cc_version | cut -d '.' -f 3)
;;
esac
echores "$cc_version"
@@ -1586,12 +1586,12 @@ fi
# now that we know what compiler should be used for compilation, try to find
# out which assembler is used by the $_cc compiler
if test "$_as" = auto ; then
- _as=`$_cc -print-prog-name=as`
+ _as=$($_cc -print-prog-name=as)
test -z "$_as" && _as=as
fi
if test "$_nm" = auto ; then
- _nm=`$_cc -print-prog-name=nm`
+ _nm=$($_cc -print-prog-name=nm)
test -z "$_nm" && _nm=nm
fi
@@ -1624,16 +1624,16 @@ fi
if x86 ; then
# gather more CPU information
- pname=`$_cpuinfo | grep 'model name' | cut -d ':' -f 2 | _head 1`
- pvendor=`$_cpuinfo | grep 'vendor_id' | cut -d ':' -f 2 | cut -d ' ' -f 2 | _head 1`
- pfamily=`$_cpuinfo | grep 'cpu family' | cut -d ':' -f 2 | cut -d ' ' -f 2 | _head 1`
- pmodel=`$_cpuinfo | grep -v 'model name' | grep 'model' | cut -d ':' -f 2 | cut -d ' ' -f 2 | _head 1`
- pstepping=`$_cpuinfo | grep 'stepping' | cut -d ':' -f 2 | cut -d ' ' -f 2 | _head 1`
+ pname=$($_cpuinfo | grep 'model name' | cut -d ':' -f 2 | _head 1)
+ pvendor=$($_cpuinfo | grep 'vendor_id' | cut -d ':' -f 2 | cut -d ' ' -f 2 | _head 1)
+ pfamily=$($_cpuinfo | grep 'cpu family' | cut -d ':' -f 2 | cut -d ' ' -f 2 | _head 1)
+ pmodel=$($_cpuinfo | grep -v 'model name' | grep 'model' | cut -d ':' -f 2 | cut -d ' ' -f 2 | _head 1)
+ pstepping=$($_cpuinfo | grep 'stepping' | cut -d ':' -f 2 | cut -d ' ' -f 2 | _head 1)
- exts=`$_cpuinfo | egrep 'features|flags' | cut -d ':' -f 2 | _head 1`
+ exts=$($_cpuinfo | egrep 'features|flags' | cut -d ':' -f 2 | _head 1)
- pparam=`echo $exts | sed -e s/k6_mtrr/mtrr/ -e s/cyrix_arr/mtrr/ -e s/centaur_mcr/mtrr/ \
- -e s/xmm/sse/ -e s/kni/sse/`
+ pparam=$(echo $exts | sed -e s/k6_mtrr/mtrr/ -e s/cyrix_arr/mtrr/ -e s/centaur_mcr/mtrr/ \
+ -e s/xmm/sse/ -e s/kni/sse/)
for ext in $pparam ; do
eval test \"\$_$ext\" = auto 2>/dev/null && eval _$ext=kernel_check
@@ -2047,8 +2047,8 @@ EOF
def_fast_64bit='#define HAVE_FAST_64BIT 1'
elif sunos ; then
echocheck "CPU type"
- karch=`uname -m`
- case "`echo $karch`" in
+ karch=$(uname -m)
+ case "$(echo $karch)" in
sun4) proc=v7 ;;
sun4c) proc=v7 ;;
sun4d) proc=v8 ;;
@@ -2097,15 +2097,15 @@ EOF
echocheck "CPU type"
case $system_name in
Linux)
- proc=`$_cpuinfo | grep 'cpu' | cut -d ':' -f 2 | cut -d ',' -f 1 | cut -b 2- | _head 1`
- if test -n "`$_cpuinfo | grep altivec`"; then
+ proc=$($_cpuinfo | grep 'cpu' | cut -d ':' -f 2 | cut -d ',' -f 1 | cut -b 2- | _head 1)
+ if test -n "$($_cpuinfo | grep altivec)"; then
test $_altivec = auto && _altivec=yes
fi
;;
Darwin)
- proc=`$_cpuinfo | grep "Processor type" | cut -f 3 -d ' ' | sed 's/ppc//'`
- if [ `sysctl -n hw.vectorunit` -eq 1 -o \
- "`sysctl -n hw.optional.altivec 2> /dev/null`" = "1" ]; then
+ proc=$($_cpuinfo | grep "Processor type" | cut -f 3 -d ' ' | sed 's/ppc//')
+ if [ $(sysctl -n hw.vectorunit) -eq 1 -o \
+ "$(sysctl -n hw.optional.altivec 2> /dev/null)" = "1" ]; then
test $_altivec = auto && _altivec=yes
fi
;;
@@ -2115,14 +2115,14 @@ EOF
2*|3.0*|3.1*|3.2*|3.3*)
;;
*)
- if [ `sysctl -n machdep.altivec` -eq 1 ]; then
+ if [ $(sysctl -n machdep.altivec) -eq 1 ]; then
test $_altivec = auto && _altivec=yes
fi
;;
esac
;;
AIX)
- proc=`$_cpuinfo | grep 'type' | cut -f 2 -d ' ' | sed 's/PowerPC_//'`
+ proc=$($_cpuinfo | grep 'type' | cut -f 2 -d ' ' | sed 's/PowerPC_//')
;;
esac
if test "$_altivec" = yes; then
@@ -2188,7 +2188,7 @@ EOF
fi
if test -n "$_mcpu"; then
- _optimizing=`echo $_mcpu | cut -c 8-`
+ _optimizing=$(echo $_mcpu | cut -c 8-)
echores "$_optimizing"
else
echores "none"
@@ -2212,7 +2212,7 @@ int main(void) {
}
EOF
$_cc -o "$TMPEXE" "$TMPC"
- case `"$TMPEXE"` in
+ case $("$TMPEXE") in
0-0) proc="ev4"; _mvi="0";;
1-0) proc="ev5"; _mvi="0";;
@@ -2244,8 +2244,8 @@ EOF
if irix ; then
echocheck "CPU type"
- proc=`hinv -c processor | grep CPU | cut -d " " -f3`
- case "`echo $proc`" in
+ proc=$(hinv -c processor | grep CPU | cut -d " " -f3)
+ case "$(echo $proc)" in
R3000) _march='-mips1' _mcpu='-mtune=r2000' ;;
R4000) _march='-mips3' _mcpu='-mtune=r4000' ;;
R4400) _march='-mips3' _mcpu='-mtune=r4400' ;;
@@ -2449,7 +2449,7 @@ fi
if x86_32 ; then
# Checking assembler (_as) compatibility...
# Added workaround for older as that reads from stdin by default - atmos
- as_version=`echo '' | $_as -version 2>&1 | sed -n 's/^.*assembler \(version \)*\([0-9.]*\).*$/\2/p'`
+ as_version=$(echo '' | $_as -version 2>&1 | sed -n 's/^.*assembler \(version \)*\([0-9.]*\).*$/\2/p')
echocheck "assembler ($_as $as_version)"
_pref_as_version='2.9.1'
@@ -2708,7 +2708,7 @@ test "$_mvi" = yes && _cpuexts="MV
# Checking kernel version...
if x86_32 && linux ; then
_k_verc_problem=no
- kernel_version=`uname -r 2>&1`
+ kernel_version=$(uname -r 2>&1)
echocheck "$system_name kernel version"
case "$kernel_version" in
'') kernel_version="?.??"; _k_verc_fail=yes;;
@@ -2779,7 +2779,7 @@ echores "$_langinfo"
echocheck "language"
test -z "$_language" && _language=$LINGUAS
-_language=`echo $_language | tr , " "`
+_language=$(echo $_language | tr , " ")
if $(echo $_language | grep -q all) ; then
doc_lang=en ; doc_langs=$doc_lang_all
man_lang=en ; man_langs=$man_lang_all
@@ -2801,7 +2801,7 @@ else
break
else
echo ${_echo_n} "$lang not found, ${_echo_c}"
- _language=`echo $_language | sed "s/$lang *//"`
+ _language=$(echo $_language | sed "s/$lang *//")
fi
done
fi
@@ -2910,10 +2910,10 @@ EOF
eval _$func=no
cc_check -D_ISOC99_SOURCE $_ld_lm && eval _$func=yes
if eval test "x\$_$func" = "xyes"; then
- eval def_$func="\"#define HAVE_`echo $func | tr '[a-z]' '[A-Z]'` 1\""
+ eval def_$func="\"#define HAVE_$(echo $func | tr '[a-z]' '[A-Z]') 1\""
echores yes
else
- eval def_$func="\"#define HAVE_`echo $func | tr '[a-z]' '[A-Z]'` 0\""
+ eval def_$func="\"#define HAVE_$(echo $func | tr '[a-z]' '[A-Z]') 0\""
echores no
fi
done
@@ -3361,8 +3361,8 @@ echores "$_w32threads"
echocheck "rpath"
netbsd &&_rpath=yes
if test "$_rpath" = yes ; then
- for I in `echo $extra_ldflags | sed 's/-L//g'` ; do
- tmp="$tmp ` echo $I | sed 's/.*/ -L& -Wl,-R&/'`"
+ for I in $(echo $extra_ldflags | sed 's/-L//g') ; do
+ tmp="$tmp $(echo $I | sed 's/.*/ -L& -Wl,-R&/')"
done
extra_ldflags=$tmp
fi
@@ -3800,7 +3800,7 @@ if darwin; then
echocheck "Mac OS X APIs"
if test "$_macosx" = auto ; then
- productName=`/usr/bin/sw_vers -productName`
+ productName=$(/usr/bin/sw_vers -productName)
if test "$productName" = "Mac OS X" ||
test "$productName" = "Mac OS X Server" ; then
_macosx=yes
@@ -3955,7 +3955,7 @@ fi #if linux
echocheck "pkg-config"
_pkg_config=pkg-config
-if `$_pkg_config --version > /dev/null 2>&1`; then
+if $($_pkg_config --version > /dev/null 2>&1); then
if test "$_ld_static"; then
_pkg_config="$_pkg_config --static"
fi
@@ -4133,15 +4133,15 @@ dfb_ver = DIRECTFB_MAJOR_VERSION.DIRECTF
;
EOF
if $_cc -E $TMPC $extra_cflags > "$TMPEXE"; then
- _directfb_version=`sed -n 's/^dfb_ver[^0-9]*\(.*\)/\1/p' "$TMPEXE" | tr -d '()'`
- _dfb_major=`echo $_directfb_version | cut -d . -f 1`
- _dfb_minor=`echo $_directfb_version | cut -d . -f 2`
- _dfb_micro=`echo $_directfb_version | cut -d . -f 3`
- _dfb_version=`dfb_version $_dfb_major $_dfb_minor $_dfb_micro`
- if test "$_dfb_version" -ge `dfb_version 0 9 13`; then
+ _directfb_version=$(sed -n 's/^dfb_ver[^0-9]*\(.*\)/\1/p' "$TMPEXE" | tr -d '()')
+ _dfb_major=$(echo $_directfb_version | cut -d . -f 1)
+ _dfb_minor=$(echo $_directfb_version | cut -d . -f 2)
+ _dfb_micro=$(echo $_directfb_version | cut -d . -f 3)
+ _dfb_version=$(dfb_version $_dfb_major $_dfb_minor $_dfb_micro)
+ if test "$_dfb_version" -ge $(dfb_version 0 9 13); then
def_directfb_version="#define DIRECTFBVERSION $_dfb_version"
_res_comment="$_directfb_version"
- test "$_dfb_version" -ge `dfb_version 0 9 15` && _dfbmga=yes
+ test "$_dfb_version" -ge $(dfb_version 0 9 15) && _dfbmga=yes
else
def_directfb_version='#undef DIRECTFBVERSION'
_directfb=no
@@ -4174,7 +4174,7 @@ fi
echocheck "X11 headers presence"
_x11_headers="no"
_res_comment="check if the dev(el) packages are installed"
- for I in `echo $extra_cflags | sed s/-I//g` /usr/include ; do
+ for I in $(echo $extra_cflags | sed s/-I//g) /usr/include ; do
if test -f "$I/X11/Xlib.h" ; then
_x11_headers="yes"
_res_comment=""
@@ -4206,7 +4206,7 @@ EOF
-L/usr/X11/lib -L/usr/lib32 -L/usr/openwin/lib -L/usr/X11R6/lib64 \
-L/usr/lib ; do
if netbsd; then
- _ld_tmp="$I -lXext -lX11 $_ld_pthread -Wl,-R`echo $I | sed s/^-L//`"
+ _ld_tmp="$I -lXext -lX11 $_ld_pthread -Wl,-R$(echo $I | sed s/^-L//)"
else
_ld_tmp="$I -lXext -lX11 $_ld_pthread"
fi
@@ -4329,7 +4329,7 @@ if test "$_xvmc" = yes ; then
else
def_xvmc='#define CONFIG_XVMC 0'
_novomodules="xvmc $_novomodules"
- _libavdecoders=`echo $_libavdecoders | sed -e s/MPEG_XVMC_DECODER// `
+ _libavdecoders=$(echo $_libavdecoders | sed -e s/MPEG_XVMC_DECODER//)
fi
echores "$_xvmc"
@@ -4351,7 +4351,7 @@ if test "$_vdpau" = yes ; then
else
def_vdpau='#define CONFIG_VDPAU 0'
_novomodules="vdpau $_novomodules"
- _libavdecoders=`echo $_libavdecoders | sed -e s/MPEG_VDPAU_DECODER// -e s/MPEG1_VDPAU_DECODER// -e s/H264_VDPAU_DECODER// -e s/WMV3_VDPAU_DECODER// -e s/VC1_VDPAU_DECODER//`
+ _libavdecoders=$(echo $_libavdecoders | sed -e s/MPEG_VDPAU_DECODER// -e s/MPEG1_VDPAU_DECODER// -e s/H264_VDPAU_DECODER// -e s/WMV3_VDPAU_DECODER// -e s/VC1_VDPAU_DECODER//)
fi
echores "$_vdpau"
@@ -4571,14 +4571,14 @@ if test "$_vidix" = yes ; then
def_vidix='#define CONFIG_VIDIX 1'
_vomodules="cvidix $_vomodules"
test "$_vidix_drivers" || _vidix_drivers="cyberblade ivtv mach64 mga mga_crtc2 nvidia pm2 pm3 radeon rage128 s3 sh_veu sis unichrome"
- test $_ivtv = "yes" || _vidix_drivers=`echo $_vidix_drivers | sed s/ivtv//`
+ test $_ivtv = "yes" || _vidix_drivers=$(echo $_vidix_drivers | sed s/ivtv//)
# some vidix drivers are architecture and os specific, discard them elsewhere
- x86 || _vidix_drivers=`echo $_vidix_drivers | sed -e s/cyberblade// -e s/sis// -e s/unichrome// -e s/s3//`
- (test $host_arch = "sh" && linux) || _vidix_drivers=`echo $_vidix_drivers | sed s/sh_veu//`
+ x86 || _vidix_drivers=$(echo $_vidix_drivers | sed -e s/cyberblade// -e s/sis// -e s/unichrome// -e s/s3//)
+ (test $host_arch = "sh" && linux) || _vidix_drivers=$(echo $_vidix_drivers | sed s/sh_veu//)
for driver in $_vidix_drivers ; do
- uc_driver=`echo $driver | tr '[a-z]' '[A-Z]'`
+ uc_driver=$(echo $driver | tr '[a-z]' '[A-Z]')
eval _vidix_drv_${driver}=yes
eval def_vidix_drv_${driver}=\"\#define CONFIG_VIDIX_DRV_${uc_driver} 1\"
done
@@ -4711,7 +4711,7 @@ fi
if test "$_aa" = yes ; then
def_aa='#define CONFIG_AA 1'
if cygwin ; then
- libs_mplayer="$libs_mplayer `aalib-config --libs | cut -d " " -f 2,5,6`"
+ libs_mplayer="$libs_mplayer $(aalib-config --libs | cut -d " " -f 2,5,6)"
fi
_vomodules="aa $_vomodules"
else
@@ -4732,13 +4732,13 @@ if test "$_caca" = auto ; then
#endif
int main(void) { (void) caca_init(); return 0; }
EOF
- cc_check `caca-config --libs` && _caca=yes
+ cc_check $(caca-config --libs) && _caca=yes
fi
fi
if test "$_caca" = yes ; then
def_caca='#define CONFIG_CACA 1'
- extra_cflags="$extra_cflags `caca-config --cflags`"
- libs_mplayer="$libs_mplayer `caca-config --libs`"
+ extra_cflags="$extra_cflags $(caca-config --cflags)"
+ libs_mplayer="$libs_mplayer $(caca-config --libs)"
_vomodules="caca $_vomodules"
else
def_caca='#undef CONFIG_CACA'
@@ -5093,8 +5093,8 @@ int main(void) {
EOF
_sdl=no
if "$_sdlconfig" --version >>"$TMPLOG" 2>&1 ; then
- if cc_check `$_sdlconfig --cflags` `$_sdlconfig --libs` >>"$TMPLOG" 2>&1 ; then
- _sdlversion=`$_sdlconfig --version | sed 's/[^0-9]//g'`
+ if cc_check $($_sdlconfig --cflags) $($_sdlconfig --libs) >>"$TMPLOG" 2>&1 ; then
+ _sdlversion=$($_sdlconfig --version | sed 's/[^0-9]//g')
if test "$_sdlversion" -gt 116 ; then
if test "$_sdlversion" -lt 121 ; then
def_sdlbuggy='#define BUGGY_SDL'
@@ -5109,14 +5109,14 @@ fi
if test "$_sdl" = yes ; then
def_sdl='#define CONFIG_SDL 1'
if cygwin ; then
- libs_mplayer="$libs_mplayer `$_sdlconfig --libs | cut -d " " -f 1,4,6 | sed s/no-cygwin/cygwin/`"
- extra_cflags="$extra_cflags `$_sdlconfig --cflags | cut -d " " -f 1,5,6 | sed s/no-cygwin/cygwin/`"
+ libs_mplayer="$libs_mplayer $($_sdlconfig --libs | cut -d " " -f 1,4,6 | sed s/no-cygwin/cygwin/)"
+ extra_cflags="$extra_cflags $($_sdlconfig --cflags | cut -d " " -f 1,5,6 | sed s/no-cygwin/cygwin/)"
elif mingw32 ; then
- libs_mplayer="$libs_mplayer `$_sdlconfig --libs | sed -e s/-mwindows// -e s/-lmingw32//`"
- extra_cflags="$extra_cflags `$_sdlconfig --cflags | sed s/-Dmain=SDL_main//`"
+ libs_mplayer="$libs_mplayer $($_sdlconfig --libs | sed -e s/-mwindows// -e s/-lmingw32//)"
+ extra_cflags="$extra_cflags $($_sdlconfig --cflags | sed s/-Dmain=SDL_main//)"
else
- libs_mplayer="$libs_mplayer `$_sdlconfig --libs`"
- extra_cflags="$extra_cflags `$_sdlconfig --cflags | sed s/-D_GNU_SOURCE=1//`"
+ libs_mplayer="$libs_mplayer $($_sdlconfig --libs)"
+ extra_cflags="$extra_cflags $($_sdlconfig --cflags | sed s/-D_GNU_SOURCE=1//)"
fi
_vomodules="sdl $_vomodules"
_aomodules="sdl $_aomodules"
@@ -5388,7 +5388,7 @@ cat > $TMPC << EOF
#include <artsc.h>
int main(void) { return 0; }
EOF
-cc_check `artsc-config --libs` `artsc-config --cflags` && tmp_run && _arts=yes
+cc_check $(artsc-config --libs) $(artsc-config --cflags) && tmp_run && _arts=yes
fi
fi
@@ -5396,8 +5396,8 @@ fi
if test "$_arts" = yes ; then
def_arts='#define CONFIG_ARTS 1'
_aomodules="arts $_aomodules"
- libs_mplayer="$libs_mplayer `artsc-config --libs`"
- extra_cflags="$extra_cflags `artsc-config --cflags`"
+ libs_mplayer="$libs_mplayer $(artsc-config --libs)"
+ extra_cflags="$extra_cflags $(artsc-config --cflags)"
else
_noaomodules="arts $_noaomodules"
fi
@@ -5413,7 +5413,7 @@ cat > $TMPC << EOF
#include <esd.h>
int main(void) { int fd = esd_open_sound("test"); return fd; }
EOF
-cc_check `esd-config --libs` `esd-config --cflags` && _esd=yes
+cc_check $(esd-config --libs) $(esd-config --cflags) && _esd=yes
fi
fi
@@ -5422,15 +5422,15 @@ echores "$_esd"
if test "$_esd" = yes ; then
def_esd='#define CONFIG_ESD 1'
_aomodules="esd $_aomodules"
- libs_mplayer="$libs_mplayer `esd-config --libs`"
- extra_cflags="$extra_cflags `esd-config --cflags`"
+ libs_mplayer="$libs_mplayer $(esd-config --libs)"
+ extra_cflags="$extra_cflags $(esd-config --cflags)"
echocheck "esd_get_latency()"
cat > $TMPC << EOF
#include <esd.h>
int main(void) { return esd_get_latency(0); }
EOF
- cc_check `esd-config --libs` `esd-config --cflags` && _esd_latency=yes && def_esd_latency='#define CONFIG_ESD_LATENCY'
+ cc_check $(esd-config --libs) $(esd-config --cflags) && _esd_latency=yes && def_esd_latency='#define CONFIG_ESD_LATENCY'
echores "$_esd_latency"
else
def_esd='#undef CONFIG_ESD'
@@ -5468,7 +5468,7 @@ cat > $TMPC << EOF
#include <pulse/pulseaudio.h>
int main(void) { return 0; }
EOF
-cc_check `$_pkg_config --libs --cflags libpulse` && tmp_run && _pulse=yes
+cc_check $($_pkg_config --libs --cflags libpulse) && tmp_run && _pulse=yes
fi
fi
@@ -5477,8 +5477,8 @@ echores "$_pulse"
if test "$_pulse" = yes ; then
def_pulse='#define CONFIG_PULSE 1'
_aomodules="pulse $_aomodules"
- libs_mplayer="$libs_mplayer `$_pkg_config --libs libpulse`"
- extra_cflags="$extra_cflags `$_pkg_config --cflags libpulse`"
+ libs_mplayer="$libs_mplayer $($_pkg_config --libs libpulse)"
+ extra_cflags="$extra_cflags $($_pkg_config --cflags libpulse)"
else
def_pulse='#undef CONFIG_PULSE'
_noaomodules="pulse $_noaomodules"
@@ -5495,9 +5495,9 @@ int main(void) { jack_client_open("test"
EOF
if cc_check -ljack ; then
libs_mplayer="$libs_mplayer -ljack"
- elif cc_check `$_pkg_config --libs --cflags --silence-errors jack` ; then
- libs_mplayer="$libs_mplayer `$_pkg_config --libs jack`"
- extra_cflags="$extra_cflags "`$_pkg_config --cflags jack`""
+ elif cc_check $($_pkg_config --libs --cflags --silence-errors jack) ; then
+ libs_mplayer="$libs_mplayer $($_pkg_config --libs jack)"
+ extra_cflags="$extra_cflags "$($_pkg_config --cflags jack)""
else
_jack=no
fi
@@ -5804,8 +5804,8 @@ elif test "$_dvdread" = auto ; then
int main(void) { return 0; }
EOF
fi
- _dvdreadcflags=`$_dvdreadconfig --cflags`
- _dvdreadlibs=`$_dvdreadconfig --libs`
+ _dvdreadcflags=$($_dvdreadconfig --cflags)
+ _dvdreadlibs=$($_dvdreadconfig --libs)
if cc_check -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE \
$_dvdreadcflags $_dvdreadlibs $_ld_dl ; then
_dvdread=yes
@@ -5906,8 +5906,8 @@ EOF
&& _libcdio=yes && extra_ldflags="$extra_ldflags $_ld_tmp" && break
done
if test "$_libcdio" = no && $_pkg_config --exists libcdio_paranoia ; then
- _inc_tmp=`$_pkg_config --cflags libcdio_paranoia`
- _ld_tmp=`$_pkg_config --libs libcdio_paranoia`
+ _inc_tmp=$($_pkg_config --cflags libcdio_paranoia)
+ _ld_tmp=$($_pkg_config --libs libcdio_paranoia)
cc_check $_inc_tmp $_ld_tmp $_ld_lm && _libcdio=yes \
&& extra_ldflags="$extra_ldflags $_ld_tmp" && extra_cflags="$extra_cflags $_inc_tmp"
fi
@@ -5989,15 +5989,15 @@ int main(void) {
}
EOF
_freetype=no
- cc_check `$_freetypeconfig --cflags` `$_freetypeconfig --libs` && tmp_run && _freetype=yes
+ cc_check $($_freetypeconfig --cflags) $($_freetypeconfig --libs) && tmp_run && _freetype=yes
else
_freetype=no
fi
fi
if test "$_freetype" = yes ; then
def_freetype='#define CONFIG_FREETYPE'
- extra_cflags="$extra_cflags `$_freetypeconfig --cflags`"
- extra_ldflags="$extra_ldflags `$_freetypeconfig --libs`"
+ extra_cflags="$extra_cflags $($_freetypeconfig --cflags)"
+ extra_ldflags="$extra_ldflags $($_freetypeconfig --libs)"
else
def_freetype='#undef CONFIG_FREETYPE'
fi
@@ -6028,8 +6028,8 @@ EOF
cc_check $_ld_tmp && _fontconfig=yes && extra_ldflags="$extra_ldflags $_ld_tmp" && break
done
if test "$_fontconfig" = no && $_pkg_config --exists fontconfig ; then
- _inc_tmp=`$_pkg_config --cflags fontconfig`
- _ld_tmp=`$_pkg_config --libs fontconfig`
+ _inc_tmp=$($_pkg_config --cflags fontconfig)
+ _ld_tmp=$($_pkg_config --libs fontconfig)
cc_check $_inc_tmp $_ld_tmp && _fontconfig=yes \
&& extra_ldflags="$extra_ldflags $_ld_tmp" && extra_cflags="$extra_cflags $_inc_tmp"
fi
@@ -6059,7 +6059,7 @@ if test "$_ass" = auto ; then
int main(void) { return 0; }
EOF
_ass=no
- cc_check `$_freetypeconfig --cflags` `$_freetypeconfig --libs` && tmp_run && _ass=yes
+ cc_check $($_freetypeconfig --cflags) $($_freetypeconfig --libs) && tmp_run && _ass=yes
if test "$_ass" = no ; then
_res_comment="FreeType >= 2.1.8 needed"
fi
@@ -6089,15 +6089,15 @@ int main(void) {
}
EOF
_fribidi=no
- cc_check `$_fribidiconfig --cflags` `$_fribidiconfig --libs` && tmp_run && _fribidi=yes
+ cc_check $($_fribidiconfig --cflags) $($_fribidiconfig --libs) && tmp_run && _fribidi=yes
else
_fribidi=no
fi
fi
if test "$_fribidi" = yes ; then
def_fribidi='#define CONFIG_FRIBIDI'
- extra_cflags="$extra_cflags `$_fribidiconfig --cflags`"
- extra_ldflags="$extra_ldflags `$_fribidiconfig --libs`"
+ extra_cflags="$extra_cflags $($_fribidiconfig --cflags)"
+ extra_ldflags="$extra_ldflags $($_fribidiconfig --libs)"
else
def_fribidi='#undef CONFIG_FRIBIDI'
fi
@@ -6140,8 +6140,8 @@ if test "$_zlib" = yes ; then
extra_ldflags="$extra_ldflags -lz"
else
def_zlib='#define CONFIG_ZLIB 0'
- _libavdecoders=`echo $_libavdecoders | sed -e s/FLASHSV_DECODER// -e s/PNG_DECODER// -e s/ZMBV_DECODER// -e s/DXA_DECODER// -e s/TSCC_DECODER// `
- _libavencoders=`echo $_libavencoders | sed -e s/FLASHSV_ENCODER// -e s/PNG_ENCODER// -e s/ZMBV_ENCODER// `
+ _libavdecoders=$(echo $_libavdecoders | sed -e s/FLASHSV_DECODER// -e s/PNG_DECODER// -e s/ZMBV_DECODER// -e s/DXA_DECODER// -e s/TSCC_DECODER//)
+ _libavencoders=$(echo $_libavencoders | sed -e s/FLASHSV_ENCODER// -e s/PNG_ENCODER// -e s/ZMBV_ENCODER//)
fi
echores "$_zlib"
@@ -6772,8 +6772,8 @@ echocheck "Nemesi Streaming Media librar
if test "$_nemesi" = auto && test "$_network" = yes ; then
_nemesi=no
if $_pkg_config libnemesi --atleast-version=0.6.3 ; then
- extra_cflags="$extra_cflags `$_pkg_config --cflags libnemesi`"
- extra_ldflags="$extra_ldflags `$_pkg_config --libs libnemesi`"
+ extra_cflags="$extra_cflags $($_pkg_config --cflags libnemesi)"
+ extra_ldflags="$extra_ldflags $($_pkg_config --libs libnemesi)"
_nemesi=yes
fi
fi
@@ -6802,7 +6802,7 @@ EOF
_live=no
for I in $extra_cflags "-I$_libdir/live" "-I/usr/lib/live" "-I/usr/lib64/live" "-I/usr/local/live" "-I/usr/local/lib/live" ; do
cxx_check $I/liveMedia/include $I/UsageEnvironment/include \
- $I/groupsock/include && _livelibdir=`echo $I| sed s/-I//` && \
+ $I/groupsock/include && _livelibdir=$(echo $I| sed s/-I//) && \
extra_ldflags="$_livelibdir/liveMedia/libliveMedia.a \
$_livelibdir/groupsock/libgroupsock.a \
$_livelibdir/UsageEnvironment/libUsageEnvironment.a \
@@ -6855,8 +6855,8 @@ elif test "$_libavutil_so" = auto ; then
int main(void) { av_gcd(1,1); return 0; }
EOF
if $_pkg_config --exists libavutil ; then
- _inc_libavutil=`$_pkg_config --cflags libavutil`
- _ld_tmp=`$_pkg_config --libs libavutil`
+ _inc_libavutil=$($_pkg_config --cflags libavutil)
+ _ld_tmp=$($_pkg_config --libs libavutil)
cc_check $_inc_libavutil $_ld_tmp && extra_ldflags="$extra_ldflags $_ld_tmp" \
&& _libavutil_so=yes
elif cc_check -lavutil $_ld_lm ; then
@@ -6894,8 +6894,8 @@ elif test "$_libavcodec_so" = auto ; the
int main(void) { avcodec_find_encoder_by_name(""); return 0; }
EOF
if $_pkg_config --exists libavcodec ; then
- _inc_libavcodec=`$_pkg_config --cflags libavcodec`
- _ld_tmp=`$_pkg_config --libs libavcodec`
+ _inc_libavcodec=$($_pkg_config --cflags libavcodec)
+ _ld_tmp=$($_pkg_config --libs libavcodec)
cc_check $_inc_libavcodec $_ld_tmp && extra_ldflags="$extra_ldflags $_ld_tmp" \
&& _libavcodec_so=yes
elif cc_check -lavcodec $_ld_lm ; then
@@ -6938,8 +6938,8 @@ elif test "$_libavformat_so" = auto ; th
int main(void) { av_alloc_format_context(); return 0; }
EOF
if $_pkg_config --exists libavformat ; then
- _inc_libavformat=`$_pkg_config --cflags libavformat`
- _ld_tmp=`$_pkg_config --libs libavformat`
+ _inc_libavformat=$($_pkg_config --cflags libavformat)
+ _ld_tmp=$($_pkg_config --libs libavformat)
cc_check $_inc_libavformat $_ld_tmp && extra_ldflags="$extra_ldflags $_ld_tmp" \
&& _libavformat_so=yes
elif cc_check $_ld_lm -lavformat ; then
@@ -7005,8 +7005,8 @@ elif test "$_libswscale_so" = auto ; the
int main(void) { sws_scale(0, 0, 0, 0, 0, 0, 0); return 0; }
EOF
if $_pkg_config --exists libswscale ; then
- _inc_libswscale=`$_pkg_config --cflags libswscale`
- _ld_tmp=`$_pkg_config --libs libswscale`
+ _inc_libswscale=$($_pkg_config --cflags libswscale)
+ _ld_tmp=$($_pkg_config --libs libswscale)
cc_check $_inc_libswscale $_ld_tmp && extra_ldflags="$extra_ldflags $_ld_tmp" \
&& _libswscale_so=yes
elif cc_check -lswscale ; then
@@ -7195,8 +7195,8 @@ int main(void)
}
EOF
if $_pkg_config --exists dirac ; then
- _inc_dirac=`$_pkg_config --silence-errors --cflags dirac`
- _ld_dirac=`$_pkg_config --silence-errors --libs dirac`
+ _inc_dirac=$($_pkg_config --silence-errors --cflags dirac)
+ _ld_dirac=$($_pkg_config --silence-errors --libs dirac)
cc_check $_inc_dirac $_ld_dirac &&
_libdirac_lavc=yes &&
extra_cflags="$extra_cflags $_inc_dirac" &&
@@ -7227,8 +7227,8 @@ if test "$_libschroedinger_lavc" = auto
int main(void) { schro_init(); return 0; }
EOF
if $_pkg_config --exists schroedinger-1.0 ; then
- _inc_schroedinger=`$_pkg_config --silence-errors --cflags schroedinger-1.0`
- _ld_schroedinger=`$_pkg_config --silence-errors --libs schroedinger-1.0`
+ _inc_schroedinger=$($_pkg_config --silence-errors --cflags schroedinger-1.0)
+ _ld_schroedinger=$($_pkg_config --silence-errors --libs schroedinger-1.0)
cc_check $_inc_schroedinger $_ld_schroedinger &&
_libschroedinger_lavc=yes &&
extra_cflags="$extra_cflags $_inc_schroedinger" &&
@@ -7723,8 +7723,8 @@ echores "$_sortsub"
echocheck "XMMS inputplugin support"
if test "$_xmms" = yes ; then
if ( xmms-config --version ) >/dev/null 2>&1 ; then
- _xmmsplugindir=`xmms-config --input-plugin-dir`
- _xmmslibdir=`xmms-config --exec-prefix`/lib
+ _xmmsplugindir=$(xmms-config --input-plugin-dir)
+ _xmmslibdir=$(xmms-config --exec-prefix)/lib
else
_xmmsplugindir=/usr/lib/xmms/Input
_xmmslibdir=/usr/lib
@@ -7796,16 +7796,16 @@ if test "$_gtk1" = no ; then
echocheck "GTK+ version"
if $_pkg_config gtk+-2.0 --exists ; then
- _gtk=`$_pkg_config gtk+-2.0 --modversion 2>/dev/null`
- extra_cflags="$extra_cflags `$_pkg_config gtk+-2.0 --cflags 2>/dev/null`"
- libs_mplayer="$libs_mplayer `$_pkg_config gtk+-2.0 --libs 2>/dev/null`"
+ _gtk=$($_pkg_config gtk+-2.0 --modversion 2>/dev/null)
+ extra_cflags="$extra_cflags $($_pkg_config gtk+-2.0 --cflags 2>/dev/null)"
+ libs_mplayer="$libs_mplayer $($_pkg_config gtk+-2.0 --libs 2>/dev/null)"
echores "$_gtk"
# Check for GLIB2
if $_pkg_config glib-2.0 --exists ; then
echocheck "glib version"
- _glib=`$_pkg_config glib-2.0 --modversion 2>/dev/null`
- libs_mplayer="$libs_mplayer `$_pkg_config glib-2.0 --libs 2>/dev/null`"
+ _glib=$($_pkg_config glib-2.0 --modversion 2>/dev/null)
+ libs_mplayer="$libs_mplayer $($_pkg_config glib-2.0 --libs 2>/dev/null)"
echores "$_glib"
def_gui='#define CONFIG_GUI 1'
@@ -7832,9 +7832,9 @@ if test "$_gtk1" = yes ; then
die "The GUI requires GTK devel packages (which were not found)."
fi
fi
- _gtk=`$_gtkconfig --version 2>&1`
- extra_cflags="$extra_cflags `$_gtkconfig --cflags 2>&1`"
- libs_mplayer="$libs_mplayer `$_gtkconfig --libs 2>&1`"
+ _gtk=$($_gtkconfig --version 2>&1)
+ extra_cflags="$extra_cflags $($_gtkconfig --cflags 2>&1)"
+ libs_mplayer="$libs_mplayer $($_gtkconfig --libs 2>&1)"
echores "$_gtk (using $_gtkconfig)"
# Check for GLIB
@@ -7848,8 +7848,8 @@ if test "$_gtk1" = yes ; then
die "The GUI requires GLIB devel packages (which were not found)"
fi
fi
- _glib=`$_glibconfig --version 2>&1`
- libs_mplayer="$libs_mplayer `$_glibconfig --libs 2>&1`"
+ _glib=$($_glibconfig --version 2>&1)
+ libs_mplayer="$libs_mplayer $($_glibconfig --libs 2>&1)"
echores "$_glib (using $_glibconfig)"
def_gui='#define CONFIG_GUI 1'
@@ -7988,12 +7988,12 @@ if test "$_maemo" = auto ; then
#include <libosso.h>
int main(void) { (void) osso_initialize("", "", 0, NULL); return 0; }
EOF
- cc_check `$_pkg_config --cflags --libs libosso 2>/dev/null` && _maemo=yes
+ cc_check $($_pkg_config --cflags --libs libosso 2>/dev/null) && _maemo=yes
fi
if test "$_maemo" = yes ; then
def_maemo='#define CONFIG_MAEMO 1'
- extra_cflags="$extra_cflags `$_pkg_config --cflags libosso`"
- extra_ldflags="$extra_ldflags `$_pkg_config --libs libosso` -lXsp"
+ extra_cflags="$extra_cflags $($_pkg_config --cflags libosso)"
+ extra_ldflags="$extra_ldflags $($_pkg_config --libs libosso) -lXsp"
else
def_maemo='#undef CONFIG_MAEMO'
fi
@@ -8012,7 +8012,7 @@ fi
# linker paths should be the same for mencoder and mplayer
_ld_tmp=""
for I in $libs_mplayer ; do
- _tmp=`echo $I | sed -e 's/^-L.*$//'`
+ _tmp=$(echo $I | sed -e 's/^-L.*$//')
if test -z "$_tmp" ; then
extra_ldflags="$extra_ldflags $I"
else
@@ -8057,8 +8057,8 @@ if test "$_dvdnav" = auto ; then
int main(void) { dvdnav_t *dvd=0; return 0; }
EOF
_dvdnav=no
- _dvdnavdir=`$_dvdnavconfig --cflags`
- _dvdnavlibs=`$_dvdnavconfig --libs`
+ _dvdnavdir=$($_dvdnavconfig --cflags)
+ _dvdnavlibs=$($_dvdnavconfig --libs)
cc_check $_dvdnavdir $_dvdnavlibs $_ld_dl $_ld_pthread && _dvdnav=yes
fi
if test "$_dvdnav" = yes ; then
@@ -8068,8 +8068,8 @@ if test "$_dvdnav" = yes ; then
cflags_libdvdnav="-Ilibdvdnav"
_inputmodules="dvdnav(internal) $_inputmodules"
else
- extra_cflags="$extra_cflags `$_dvdnavconfig --cflags`"
- extra_ldflags="$extra_ldflags `$_dvdnavconfig --minilibs`"
+ extra_cflags="$extra_cflags $($_dvdnavconfig --cflags)"
+ extra_ldflags="$extra_ldflags $($_dvdnavconfig --minilibs)"
_inputmodules="dvdnav $_inputmodules"
fi
else
@@ -8147,7 +8147,7 @@ EXESUFS_ALL = .exe
$_target_arch
$_target_arch_x86
-`echo $_cpuexts | tr '[a-z] ' '[A-Z]\n' | sed 's/^/HAVE_/;s/$/=yes/'`
+$(echo $_cpuexts | tr '[a-z] ' '[A-Z]\n' | sed 's/^/HAVE_/;s/$/=yes/')
MENCODER = $_mencoder
MPLAYER = $_mplayer
@@ -8376,12 +8376,12 @@ HAVE_PTHREADS = $_pthreads
HAVE_W32THREADS = $_w32threads
HAVE_YASM = $_have_yasm
-`echo $_libavdecoders | tr '[a-z] ' '[A-Z]\n' | sed 's/^/CONFIG_/;s/$/=yes/'`
-`echo $_libavencoders | tr '[a-z] ' '[A-Z]\n' | sed 's/^/CONFIG_/;s/$/=yes/'`
-`echo $_libavparsers | tr '[a-z] ' '[A-Z]\n' | sed 's/^/CONFIG_/;s/$/=yes/'`
-`echo $_libavdemuxers | tr '[a-z] ' '[A-Z]\n' | sed 's/^/CONFIG_/;s/$/=yes/'`
-`echo $_libavmuxers | tr '[a-z] ' '[A-Z]\n' | sed 's/^/CONFIG_/;s/$/=yes/'`
-`echo $_libavbsfs | tr '[a-z] ' '[A-Z]\n' | sed 's/^/CONFIG_/;s/$/=yes/'`
+$(echo $_libavdecoders | tr '[a-z] ' '[A-Z]\n' | sed 's/^/CONFIG_/;s/$/=yes/')
+$(echo $_libavencoders | tr '[a-z] ' '[A-Z]\n' | sed 's/^/CONFIG_/;s/$/=yes/')
+$(echo $_libavparsers | tr '[a-z] ' '[A-Z]\n' | sed 's/^/CONFIG_/;s/$/=yes/')
+$(echo $_libavdemuxers | tr '[a-z] ' '[A-Z]\n' | sed 's/^/CONFIG_/;s/$/=yes/')
+$(echo $_libavmuxers | tr '[a-z] ' '[A-Z]\n' | sed 's/^/CONFIG_/;s/$/=yes/')
+$(echo $_libavbsfs | tr '[a-z] ' '[A-Z]\n' | sed 's/^/CONFIG_/;s/$/=yes/')
EOF
#############################################################################
@@ -8390,7 +8390,7 @@ ff_config_enable () {
_nprefix=$3;
test -z "$_nprefix" && _nprefix='CONFIG'
for part in $1; do
- if ` echo $2 | grep -q -E "(^| )$part($| )" `; then
+ if $(echo $2 | grep -q -E "(^| )$part($| )"); then
echo "#define ${_nprefix}_$part 1"
else
echo "#define ${_nprefix}_$part 0"
@@ -8541,8 +8541,8 @@ $def_pthread_cache
/* CPU stuff */
#define __CPU__ $iproc
$def_words_endian
-`ff_config_enable "$_arch_all" "$_arch" "ARCH"`
-`ff_config_enable "$_cpuexts_all" "$_cpuexts" "HAVE"`
+$(ff_config_enable "$_arch_all" "$_arch" "ARCH")
+$(ff_config_enable "$_cpuexts_all" "$_cpuexts" "HAVE")
/* DVD/VCD/CD */
@@ -8847,13 +8847,13 @@ $def_mp3lame_lavc
$def_x264_lavc
$def_xvid_lavc
-`ff_config_enable "$_libavdecoders_all" "$_libavdecoders"`
-`ff_config_enable "$_libavencoders_all" "$_libavencoders"`
-`ff_config_enable "$_libavparsers_all" "$_libavparsers"`
-`ff_config_enable "$_libavdemuxers_all" "$_libavdemuxers"`
-`ff_config_enable "$_libavmuxers_all" "$_libavmuxers"`
-`ff_config_enable "$_libavprotocols_all" "$_libavprotocols"`
-`ff_config_enable "$_libavbsfs_all" "$_libavbsfs"`
+$(ff_config_enable "$_libavdecoders_all" "$_libavdecoders")
+$(ff_config_enable "$_libavencoders_all" "$_libavencoders")
+$(ff_config_enable "$_libavparsers_all" "$_libavparsers")
+$(ff_config_enable "$_libavdemuxers_all" "$_libavdemuxers")
+$(ff_config_enable "$_libavmuxers_all" "$_libavmuxers")
+$(ff_config_enable "$_libavprotocols_all" "$_libavprotocols")
+$(ff_config_enable "$_libavbsfs_all" "$_libavbsfs")
#define CONFIG_H263_VAAPI_HWACCEL 0
#define CONFIG_MPEG2_VAAPI_HWACCEL 0
More information about the MPlayer-cvslog
mailing list