Index: configure =================================================================== RCS file: /cvsroot/mplayer/main/configure,v retrieving revision 1.1021 diff -u -r1.1021 configure --- configure 9 Jun 2005 21:14:36 -0000 1.1021 +++ configure 10 Jun 2005 07:00:22 -0000 @@ -133,7 +133,7 @@ LANGUAGES=`echo help/help_mp-??.h help/help_mp-??_??.h | sed "s:help/help_mp-\(..\).h:\1:g" | sed "s:help/help_mp-\(.....\).h:\1:g"` for parm in "$@" ; do - if test "$parm" = "--help" || test "$parm" = "-help" || test "$parm" = "-h" ; then + if test "$parm" = "--help" -o "$parm" = "-help" -o "$parm" = "-h" ; then cat << EOF Usage: $0 [OPTIONS]... @@ -582,7 +582,7 @@ # Checking CC version... if test "$_skip_cc_check" != yes ; then # 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" -o "`basename $_cc`" = "ecc"; then echocheck "$_cc version" cc_vendor=intel cc_name=`( $_cc -V ) 2>&1 | _head 1 | cut -d ',' -f 1` @@ -635,7 +635,7 @@ ;; esac echores "$cc_version" - (test "$cc_verc_fail" = "no") && break + test "$cc_verc_fail" = "no" && break done fi # icc if test "$cc_verc_fail" = yes ; then @@ -686,9 +686,7 @@ fi echocheck "host cc" -if not test "$_host_cc" ; then - _host_cc=$_cc -fi +test "$_host_cc" || _host_cc=$_cc echores $_host_cc @@ -795,7 +793,7 @@ # but most of them are CPUID 666, so check if sse detected # btw. there is also athlon-mp opt, but we need extended # CPUID to detect if CPU is SMP capable -> athlon-mp ::atmos - if test "$_sse" = yes && test "$pstepping" -ge 2; then + if test "$_sse" = yes -a "$pstepping" -ge 2; then proc=athlon-xp else proc=athlon-4 @@ -820,7 +818,7 @@ 3) proc=i386 iproc=386 ;; 4) proc=i486 iproc=486 ;; 5) iproc=586 - if test "$pmodel" -eq 4 || test "$pmodel" -eq 8; then + if test "$pmodel" -eq 4 -o "$pmodel" -eq 8; then proc=pentium-mmx # 4 is desktop, 8 is mobile else proc=i586 @@ -856,7 +854,7 @@ # gcc >= 3.4.0 doesn't support -mcpu, we have to use -mtune instead - if [ "$cc_vendor" = "gnu" ] && ([ "$_cc_major" -gt 3 ] || ( [ "$_cc_major" = 3 ] && [ "$_cc_minor" -ge 4 ])) ; then + if test "$cc_vendor" = "gnu" && test "$_cc_major" -gt 3 -o "$_cc_major" -eq 3 -a "$_cc_minor" -ge 4 ; then cpuopt=-mtune else cpuopt=-mcpu @@ -870,10 +868,10 @@ if test "$proc" = "k8" -o "$proc" = "opteron" -o "$proc" = "athlon64" -o "$proc" = "athlon-fx" ; then cc_check -march=$proc $cpuopt=$proc || proc=athlon-xp fi - if test "$proc" = "athlon-xp" || test "$proc" = "athlon-4" || test "$proc" = "athlon-tbird"; then + if test "$proc" = "athlon-xp" -o "$proc" = "athlon-4" -o "$proc" = "athlon-tbird"; then cc_check -march=$proc $cpuopt=$proc || proc=athlon fi - if test "$proc" = "k6-3" || test "$proc" = "k6-2"; then + if test "$proc" = "k6-3" -o "$proc" = "k6-2"; then cc_check -march=$proc $cpuopt=$proc || proc=k6 fi if test "$proc" = "k6"; then @@ -885,10 +883,10 @@ fi fi fi - if test "$proc" = "pentium4" || test "$proc" = "pentium3" || test "$proc" = "pentium2" || test "$proc" = "athlon"; then + if test "$proc" = "pentium4" -o "$proc" = "pentium3" -o "$proc" = "pentium2" -o "$proc" = "athlon"; then cc_check -march=$proc $cpuopt=$proc || proc=i686 fi - if test "$proc" = "i686" || test "$proc" = "pentium-mmx"; then + if test "$proc" = "i686" -o "$proc" = "pentium-mmx"; then cc_check -march=$proc $cpuopt=$proc || proc=i586 fi if test "$proc" = "i586" ; then @@ -986,7 +984,7 @@ # This will fail if gcc version < 3.3, which is ok because earlier # versions don't really support 64-bit on amd64. # Is this a valid assumption? -Corey - if test "$proc" = "athlon-xp" || test "$proc" = "athlon-4" ; then + if test "$proc" = "athlon-xp" -o "$proc" = "athlon-4" ; then cc_check -march=$proc $cpuopt=$proc || proc=error fi if test "$proc" = "error" ; then @@ -1111,7 +1109,7 @@ *) ;; esac # gcc 3.1(.1) and up supports 7400 and 7450 - if test "$_cc_major" -ge "3" && test "$_cc_minor" -ge "1" || test "$_cc_major" -ge "4"; then + if test "$_cc_major" -ge "3" -a "$_cc_minor" -ge "1" -o "$_cc_major" -ge "4"; then case "$proc" in 7400*|7410*) _march='-mcpu=7400' _mcpu='-mtune=7400' ;; 7450*|7455*) _march='-mcpu=7450' _mcpu='-mtune=7450' ;; @@ -1119,7 +1117,7 @@ esac fi # gcc 3.2 and up supports 970 - if test "$_cc_major" -ge "3" && test "$_cc_minor" -ge "3" || test "$_cc_major" -ge "4"; then + if test "$_cc_major" -ge "3" -a "$_cc_minor" -ge "3" -o "$_cc_major" -ge "4"; then case "$proc" in 970*) _march='-mcpu=970' _mcpu='-mtune=970' _def_dcbzl='#undef NO_DCBZL' ;; @@ -1179,7 +1177,7 @@ _optimizing="$proc" echocheck "MVI instruction support in GCC" - if test "$_cc_major" -ge "3" && test "$cpu_understands_mvi" = "1" ; then + if test "$_cc_major" -ge "3" -a "$cpu_understands_mvi" = "1" ; then _def_gcc_mvi_support="#define CAN_COMPILE_ALPHA_MVI 1" echores "yes" else @@ -2121,7 +2119,7 @@ [0-1].[0-9].[0-9]*|2.[0-3].[0-9]*) _k_verc_problem=yes;; esac - if test "$_k_verc_problem" = yes && test "$_sse" = yes ; then + if test "$_k_verc_problem" = yes -a "$_sse" = yes ; then _k_verc_fail=yes fi if test "$_k_verc_fail" ; then @@ -3434,12 +3432,12 @@ echocheck "DirectFB headers presence" if test -z "$_inc_directfb" ; then for I in /usr/include /usr/local/include $_inc_extra; do - if test -d "$I/directfb" && test -f "$I/directfb/directfb.h" ; then + if test -d "$I/directfb" -a -f "$I/directfb/directfb.h" ; then _inc_directfb="-I$I/directfb" echores "yes (using $_inc_directfb)" break fi - if test -d "$I" && test -f "$I/directfb.h" ; then + if test -d "$I" -a -f "$I/directfb.h" ; then _inc_directfb="-I$I" echores "yes (using $_inc_directfb)" break @@ -3514,7 +3512,7 @@ echocheck "X11 headers presence" if test -z "$_inc_x11" ; then for I in /usr/X11/include /usr/X11R6/include /usr/include/X11R6 /usr/include /usr/openwin/include ; do - if test -d "$I/X11" && test -f "$I/X11/Xlib.h" ; then + if test -d "$I/X11" -a -f "$I/X11/Xlib.h" ; then _inc_x11="-I$I" echores "yes (using $I)" break @@ -3608,7 +3606,7 @@ echocheck "Xv" -if test "$_x11" = yes && test "$_xv" != no ; then +if test "$_x11" = yes -a "$_xv" != no ; then cat > $TMPC < #include @@ -3635,7 +3633,7 @@ echocheck "XvMC" -if test "$_x11" = yes && test "$_xv" = yes && test "$_xvmc" != no ; then +if test "$_x11" = yes -a "$_xv" = yes -a "$_xvmc" != no ; then _xvmc=no cat > $TMPC < @@ -3661,7 +3659,7 @@ echocheck "Xinerama" -if test "$_x11" = yes && test "$_xinerama" != no ; then +if test "$_x11" = yes -a "$_xinerama" != no ; then cat > $TMPC < #include @@ -3687,7 +3685,7 @@ # This check may be useful for future mplayer versions (to change resolution) # If you run into problems, remove '-lXxf86vm'. echocheck "Xxf86vm" -if test "$_x11" = yes && test "$_vm" = auto ; then +if test "$_x11" = yes -a "$_vm" = auto ; then cat > $TMPC < #include @@ -3842,7 +3840,7 @@ echocheck "xmga" if test "$_xmga" = auto ; then _xmga=no - test "$_x11" = yes && test "$_mga" = yes && _xmga=yes + test "$_x11" = yes -a "$_mga" = yes && _xmga=yes fi if test "$_xmga" = yes ; then _def_xmga='#define HAVE_XMGA 1' @@ -3887,7 +3885,7 @@ fi # needed to get right output on obscure combination # like --disable-ggi --enable-ggiwmh -if test "$_ggi" = yes && test "$_ggiwmh" = yes ; then +if test "$_ggi" = yes -a "$_ggiwmh" = yes ; then _def_ggiwmh='#define HAVE_GGIWMH 1' _ld_ggi="$_ld_ggi -lggiwmh" else @@ -4071,14 +4069,14 @@ _vomodules="mpegpes(dvb) $_vomodules" fi fi -if test "$_dvbhead" = no && test "$_dvb" = no ; then +if test "$_dvbhead" = no -a "$_dvb" = no ; then _def_dvb='#undef HAVE_DVB' _def_dvb_in='#undef HAS_DVBIN_SUPPORT ' _aomodules="mpegpes(file) $_aomodules" _vomodules="mpegpes(file) $_vomodules" fi -if test "$_dvb" = yes || test "$_dvbhead" = yes ; then +if test "$_dvb" = yes -o "$_dvbhead" = yes ; then _dvbin=yes _inputmodules="dvb $_inputmodules" else @@ -4231,7 +4229,7 @@ # have compiled x11 deps into libungif in the first place. ] ) # # --Joey -if test "$_force_gif" = yes && test "$_gif" = no ; then +if test "$_force_gif" = yes -a "$_gif" = no ; then _gif=yes _ld_gif="-lgif" fi @@ -4329,7 +4327,7 @@ _sdlconfig=false fi fi -if test "$_sdl" = auto || test "$_sdl" = yes ; then +if test "$_sdl" = auto -o "$_sdl" = yes ; then cat > $TMPC << EOF #include int main(int argc, char *argv[]) { return 0; } @@ -4422,7 +4420,7 @@ echores "$_directx" echocheck "NAS" -if test "$_nas" = auto || test "$_nas" = yes ; then +if test "$_nas" = auto -o "$_nas" = yes ; then cat > $TMPC << EOF #include